Merge branch 'master' of /home/simon/Documents/3nmct/AppDevForAndroid/ProjectFOOD with conflicts.
camera dialog updated spacing ok transparent ok new icons
Merge remote-tracking branch 'origin/master'