Rollback and working on the old thing again :D
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mengine/Camera.java
	src/mengine/Player.java
Better than before, but still not good.