Testi commit
testi
Merge remote-tracking branch 'origin/dev' into dev-local

Conflicts:
	AbstraktiShooter-desktop/src/com/abstrakti/shooter/Main.java
	AbstraktiShooter/src/com/abstrakti/shooter/Game.java
box2d: put the player and collision into the world.