Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/com/ladinc/core/screens/GameScreen.java