Misc. Changes
Merge branch 'master' of https://github.com/elefse/JADITO

Conflicts:
	src/MinigameState.as
Merge branch 'master' of https://github.com/elefse/JADITO

Conflicts:
	src/MinigameState.as