test
Merge branch 'master' of https://github.com/zearoz/SC2Unit

Conflicts:
	Assets/Data/building.xml
	ViewModels/Race.cs