change prototype
Merge branch 'master' of https://github.com/phthhieu/LightSwitchRepo

Conflicts:
	SmartTranslator/SmartTranslator/ViewController.mm