First push in forever.
Merge remote-tracking branch 'origin/disposal' into disposal

Conflicts:
	core/src/com/missionbit/snailassalt/BackButton.java