jsut merging
Merge branch 'master' of https://github.com/kbo4sho/Swarm

Conflicts:
	XNASwarms.W8/SwarmAnalysisEngine.W8/SwarmAnalysisEngine.W8.csproj
working edit for brush and world