Added Javadocs in and removed unused imports/methods from some of the controller classes.
Merge remote-tracking branch 'origin/master' into james/dev
Checkstyled controller package combat controller through EncounterController excluding the Controller superclass.
Merge branch 'master' into jack/dev
Added Javadocs in and removed unused imports/methods in more the controller classes.
Merge origin/master
Merge branch 'master' into jack/dev