Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	core/src/com/mandatoryfun/components/PositionComponent.java
	core/src/com/mandatoryfun/systems/ControllerSystem.java