More fixes

This time I fixed up the game class and updated unitManager
Merge remote-tracking branch 'origin/master' into Alex---Fix