Started work on an inventory system, game objects and grenades.
First working version of game objects
fixup! First working version of game objects
Some tinkering
Merge branch 'gameobject' into develop

Conflicts:
	src/Client.cpp
	src/Client.h
	src/Controller.h
	src/Game.h
	src/GameState.cpp
	src/GameState.h
	src/Map.cpp
	src/Map.h
	src/Player.cpp
	src/Player.h
	src/Shot.cpp
	src/Shot.h
	src/Team.cpp
	src/Team.h
	src/Weapon.cpp
	src/Weapon.h
fixup! Merge branch 'gameobject' into develop