camera now starts directly at upstart
fixed conflicts

Conflicts:
	Reach/CameraOverLayView.m
	Reach/CameraViewController.m