more refactoring
Merge branch 'master' of https://github.com/kraftman/Empires.git
massive refactor for dependancy injection.