ios project
Merge branch 'master' of https://github.com/bopang/FaceMe

Conflicts:
	FaceMe_iOS/FaceMe_iOS/CameraViewController.h