Awesome contentPane switching in S6
Merge branch 'master' of https://github.com/xcabbage/trololus

Conflicts:
	src/game/core/states/SixthState.java