camera+udate
Merge branch 'master' of https://github.com/mthita/my_apps

Conflicts:
	camera.html