Merge commit 'dd1d472b1f8dec4bee382fcd01839be535be71a0'

Conflicts:
	BlockWars/BlockWars/Builder.cs
	BlockWars/BlockWarsContent/BlockWarsContent.contentproj
Fixed bug with last merge.
Merge branch 'master' of https://github.com/ASOIU/BlockWars

Conflicts:
	BlockWars/BlockWars/Builder.cs
	BlockWars/BlockWarsContent/BlockWarsContent.contentproj