deployed to nodjitsu
Merge branch 'master' of https://github.com/FilipStenbeck/node-demo

Conflicts:
	app/scripts/services/userService.js

merge