Merge pull request #42 from CarlRapp/TENFIRE

Tenfire
Better collision
Merge branch 'master' of https://github.com/CarlRapp/CodenameGamma
New sound
Early build of Unit
Added support for Unit in collision
Added State and Team to GameObject
Minor adds
Merge branch 'newmaster' into pr/n43_TENFIRE

Conflicts:
	CodenameGamma/Screen/PlayScreen/Level/Level.cpp
Merge pull request #44 from CarlRapp/master

Update