[Merge] lp:~abreu-alexandre/webbrowser-app/remove-container-webkit into lp:webbrowser-app

[Olivier Tilloy]

Review: Needs Fixing

With the latest changes in trunk, this doesn’t merge cleanly any longer. Can you please fix the conflicts?
-- 
https://code.launchpad.net/~abreu-alexandre/webbrowser-app/remove-container-webkit/+merge/236956
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.