Merge branch 'master' into fix-spinner
fix spinner load
Merge pull request #34 from tobozo/fix-spinner

Fix spinner
Merge branch 'master' into fix-webcam-upload

Conflicts:
	app/views/application.js