k upload photo should be fine
Merge branch 'master' of https://github.com/brett9897/s2h_cake

Conflicts:
	Controller/SurveyInstancesController.php