[Merge] lp:~rpadovani/webbrowser-app/settings-page into lp:webbrowser-app

[Olivier Tilloy]

Note: a bunch of branches were merged earlier today, and now there are minor conflicts in Browser.qml when merging this branch into trunk. Can you please address them?
-- 
https://code.launchpad.net/~rpadovani/webbrowser-app/settings-page/+merge/253975
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.