Fix bug in logout system
Refactor login to use a salt stored in database
Merge branch 'master' of https://github.com/JaWSnl/swoc2014

Conflicts:
	player/app/controllers/users.server.controller.js