merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/cheese/squeeze/gameworld/GameRenderer.java