Auf dem Weg zur Map
Merge branch 'master' of https://github.com/chrizzTs/Who-U

Conflicts:
	app/templates/play-screen.html