final
Merge branch 'dev' of https://github.com/PunctualEmoticon/Helium-3 into dev

Conflicts:
	Helium3/src/gui/GameActions.java