[Merge] lp:~uriboni/webbrowser-app/topsite-previews into lp:webbrowser-app

[Olivier Tilloy]

Review: Needs Fixing

Please revert the changes to po/webbrowser-app.pot.

Additionally, this branch has conflicts when merging into the latest trunk. Can you please resolve them?
-- 
https://code.launchpad.net/~uriboni/webbrowser-app/topsite-previews/+merge/269771
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.