added permissions for camera to AndroidManifest
Merge remote-tracking branch 'origin/master'