camera fix
Merge branch 'master' of https://github.com/phthhieu/LightSwitchRepo

Conflicts:
	SmartTranslator/SmartTranslator.xcodeproj/project.pbxproj
	SmartTranslator/SmartTranslator/ViewController.mm