camera button links to camera
Merge remote-tracking branch 'origin/master'

Conflicts:
	Google_Cloud_Endpoints/Google_Cloud_Endpoints.iml
camera button links to camera