Merging
Merge branch 'master' of https://github.com/Fannon/IA6.Medienprojekt

Conflicts:
	client/obacht/Player.js
	client/obacht/options.js
Fixed ObserverPattern Problem with the PlayerController