finalisation feature camera
Merge pull request #6 from welcoMattic/feature/camera

finalisation feature camera
resolve conflicts