Ensure that the location is in the correct world in Port#contains(Location) (fixes #29)
Merge branch '0.3'

Conflicts:
	pom.xml