Organise source, fix pokemon center
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/jselby/pmd/ExplorersOfSpace.java
	src/main/java/net/jselby/pmd/Player.java
	src/main/java/net/jselby/pmd/TextureAliases.java
	src/main/java/net/jselby/pmd/entities/World.java
	src/main/java/net/jselby/pmd/props/WorldSwitcher.java
	src/main/resources/maps/world.json