fixed enabled button in camera view controller
Merge remote-tracking branch 'origin/newMaster' into newMaster