mini sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/core/src/com/rectoverso/controllers/GameRenderer.java