Merge branch 'murielm' of /Users/dbudor/AndroidStudioProjects/zipato-android-v2 with conflicts.
(cherry picked from commit 14dbc4e)
Cameras... work in progress