optimized camera view
resolved minor conflict

Conflicts:
	Reach/CameraViewController.m