Bug fixes + key for exiting camera view
Merge remote-tracking branch 'origin/master'