merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/FOS/Pixel/screens/GameScreen.java