[Merge] lp:~fboucault/camera-app/resolution_options into lp:camera-app

[Bill Filler]

Review: Needs Fixing

Framework version needs to be 15.04.3 as the required qtubuntu-camera change is not in the current 15.04.2 version that is in ota8
-- 
https://code.launchpad.net/~fboucault/camera-app/resolution_options/+merge/274402
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.