Added "back" button to status screen
Merge master into alex/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/CharacterStatusController.java