overlords can now be decent detectors
Merge branch 'master' of https://github.com/curopium/Marvin

Conflicts:
	UAlbertaBot/Source/StrategyManager.cpp