[Merge] lp:~uriboni/webbrowser-app/bookmark-folders-from-contextual-menu into lp:webbrowser-app

[Olivier Tilloy]

Review: Needs Fixing

There are now a bunch of conflicts when merging this branch into the latest trunk, would you mind addressing them? Thanks!
-- 
https://code.launchpad.net/~uriboni/webbrowser-app/bookmark-folders-from-contextual-menu/+merge/267934
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.