cameraViewController update
Merge branch 'master' of https://github.com/phurbu/market

Conflicts:
	Market/CameraViewController.xib