Fixed cyclic dependencies
Merge branch 'master' of github.com:jo5ch/sc2_simulation