Merge branch 'CapioDevolopment' of https://github.com/HannesSandberg/Capio into CapioDevolopment

Conflicts:
	bin/character/Player.class
	bin/physics/Physics.class
oklart igen
balah