Bonus: Bugfix
Inventory: Bugfix
Bonus, Inventory Bugfixing
Merging
Merge branch 'master' of https://github.com/Fannon/IA6.Medienprojekt

Conflicts:
	client/obacht/Game.js