CH
Merge branch 'master' of https://github.com/TENFIRE/StarCraft_AI

Conflicts:
	BTHAIModule/Source/MarineAgent.cpp
	BTHAIModule/Source/TerranStrategy.cpp
	BTHAIModule/Source/TerranStrategy.h