VATTNA
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/org/gaem/core/input/InputManager.java