Merge branch 'master' of https://github.com/garyodonoghue/GlitchPerfect

Conflicts:
	test/core/src/com/ladinc/glitchperfect/screens/GameScreen.java