Änderungen an der API
Mistake Searching
Merge branch 'master' of https://github.com/chrizzTs/Who-U

Conflicts:
	app/scripts/serverAPI.js
	app/templates/login.html
Merge branch 'master' of https://github.com/chrizzTs/Who-U

Conflicts:
	app/scripts/serverAPI.js
	app/templates/login.html
Merge branch 'master' of https://github.com/chrizzTs/Who-U

Conflicts:
	app/scripts/app.js