Afroman
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/platformer/core/model/gameobject/impl/ExampleGameObject.java