asd
Merge branch 'master' of github.com:SpaceTeam/SpaceHordes

Conflicts:
	SpaceHordes/SpaceHordes/Entities/Templates/Structures/BarrierTemplate.cs
	SpaceHordes/SpaceHordes/Xbox 360 Copy of SpaceHordes.csproj.Debug.cachefile