Full screen photo view, navigation bar, camera button, and view photos button
Merge remote-tracking branch 'origin/master' into master1