Fixed loop redirections in user login bug
Merge branch 'master' of https://github.com/RWTH-i5-IDSG/BikeMan

Conflicts:
	src/main/webapp/scripts/services.js