changes from ec2
Merge branch 'master' of github.com:guardianproject/InformaCam-Server

Conflicts:
	src/main/webapp/js/handlers.js