[Merge] lp:~uriboni/webbrowser-app/media-access into lp:webbrowser-app

[Olivier Tilloy]

Also note that after merging the latest trunk QmlTests::tst_SettingsPage will need to be updated, it fails with the following error:

2: QWARN  : QmlTests::UnknownTestFunc() file:///home/osomon/dev/phablet/browser/webbrowser-app/tests/unittests/qml/tst_SettingsPage.qml:45:27: HistoryModelMock is not a type 
2:                  historyModel: HistoryModelMock { 
2:                                ^

-- 
https://code.launchpad.net/~uriboni/webbrowser-app/media-access/+merge/272919
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.