[Merge] lp:~phablet-team/camera-app/photo-editor into lp:camera-app

[Florian Boucault]

Review: Needs Fixing

Another semantical conflict in SlideshowView.qml:

SharePopover from Ubuntu UI Extras is picked up instead of the local one causing the photo roll to not load at all.
-- 
https://code.launchpad.net/~phablet-team/camera-app/photo-editor/+merge/242696
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.