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

[Florian Boucault]

Depends on https://code.launchpad.net/~fboucault/qtubuntu-camera/resolution_fixes/+merge/274404
-- 
https://code.launchpad.net/~fboucault/camera-app/resolution_options/+merge/274402
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~fboucault/camera-app/resolution_options into lp:camera-app.