baaaaaaaaaaaaaaaaaaa
Merge branch 'master' of https://github.com/GamesAndStuff/SpaceHordes

Conflicts:
	SpaceHordes/SpaceHordes/Entities/Components/AI.cs
	SpaceHordes/SpaceHordes/Entities/Components/Inventory.cs
	SpaceHordes/SpaceHordes/Entities/Systems/Update/AISystem.cs
	SpaceHordes/SpaceHordes/Entities/Systems/Update/DirectorSystem.cs
	SpaceHordes/SpaceHordes/Entities/Systems/Update/GunSystem.cs
	SpaceHordes/SpaceHordes/Entities/Templates/Enemies/GunnerTemplate.cs
	SpaceHordes/SpaceHordes/Entities/Templates/PlayerTemplate.cs