camera fix
Merge remote-tracking branch 'origin/master'
camera and gallery working
Merge remote-tracking branch 'origin/master'