Merge branch 'master' of https://github.com/FortPinnsvin/fallingman.git

Conflicts:
	core/src/com/FortPinnsvin/fallingman/AndroidRun.java
	core/src/com/FortPinnsvin/fallingman/GameInputListener.java
Merge branch 'master' of git@github.com:FortPinnsvin/fallingman.git