add new files
bug: add missing answer
style: minor style changes to trigger heroku push
style: we dont need to surround data-ng-* attrs with quotes
chore: move stuff back to devdep
bug: since we dont have time to investigate this, just leave the deps
merge back all fixes from master to deploy to heroku

Conflicts:
	package.json
	src/server/views/ngtemplates/question.jade
	src/server/views/ngtemplates/results.jade
get unit tests up and running
fix all testing bugs caused my models now being in a factory
add more tests to slides controllers
finish up on SlideCtrl tests
chore: add ResultsCtrl tests
add service and directive unit tests
tests: add unit tests for notificationsctrl and make the code simpler
tests: addtl tests for notifications ctrl

Merge branch 'develop'

* develop:
  tests: add unit tests for notificationsctrl and make the code simpler
  add service and directive unit tests
  chore: add ResultsCtrl tests
  finish up on SlideCtrl tests
  add more tests to slides controllers
  fix all testing bugs caused my models now being in a factory
  get unit tests up and running
  merge back all fixes from master to deploy to heroku
  bug: since we dont have time to investigate this, just leave the deps
  chore: move stuff back to devdep
  style: we dont need to surround data-ng-* attrs with quotes
  style: minor style changes to trigger heroku push
  bug: add missing answer
  add new files

Conflicts:
	Gruntfile.coffee
	specs/client/controllerSpec.coffee
	specs/client/js/client/controllerSpec.js