towncenter and wheat and stuff
Merge branch 'master' of https://github.com/MegaR/ARiseofWar

Conflicts:
	ARiseofWar.vcxproj.filters
	src/Barracks.cpp
Merge branch 'master' of https://github.com/MegaR/ARiseofWar