Odin can expand to non-gas bases now
Merge branch 'defend' into develop
Changed the enemyUncertaintyFactor in StratMgr
Merge branch 'develop' of github.com:Plankton555/Odin into templars

Conflicts:
	UAlbertaBot/Source/StrategyManager.cpp
Merge branch 'templars' of github.com:Plankton555/Odin into templars

Conflicts:
	UAlbertaBot/Source/StrategyManager.cpp