Added Javadocs, cleaned up code.
Fixed all javadoc errors and all warnings except @throw descriptions.
Merge branch 'sam/dev', fixed all javadoc errors

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/EncounterController.java
Merge remote-tracking branch 'origin/master' into james/dev