commit
Merge branch 'master' of https://github.com/JanvenZhao/AVCapture

Conflicts:
	InterFace/AVCaptureManager.m
	InterFace/RootViewController.m