trying to get ajax to work
fix ajax
remove q
move service stuff into controller
changes
promises :)
more fixes
change key
Merge pull request #1 from shirlenec/Joelle

Joelle
Merge branch 'master' into userinterface

Conflicts:
	web/index.html
	web/js/app.js
	web/js/controllers.js
	web/js/services.js