u
Merge branch 'master' of https://github.com/yangyangduo/ios_projects

Conflicts:
	SmartHome/CameraViewController.m