settingview
Merge branch 'on_off_merge' of https://github.com/phthhieu/LightSwitchRepo into on_off_merge

Conflicts:
	SmartTranslator/SmartTranslator.xcodeproj/project.pbxproj
	SmartTranslator/SmartTranslator/ViewController.h
	SmartTranslator/SmartTranslator/ViewController.mm
	SmartTranslator/SmartTranslator/en.lproj/MainStoryboard.storyboard