Fixes controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/kilobolt/balldrop/gameobjects/Jak.java