use camera
Merge branch 'master' of github.com:teamfish/fish-app

Conflicts:
	www/templates/home.html