refactored authetication, delete key added and code indention
Merge branch 'philipp' into testing

Conflicts:
	server/spec/api/helpers.js