Checkstyled controller package combat controller through EncounterController excluding the Controller superclass.
Merge branch 'master' into jack/dev
Merge branch 'master' into jack/dev