Moved Equipment to Inventory.h.
Fixed Errors
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/Server/Source/Game.cpp
	Server/Server/Source/Game.h
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Design/GameMode.classdiagram.layout