Merged contour tracing tests
Updated for new name generator
Moved swing code to tests
Merge branch 'master' of github.com:Terasology/Cities

Conflicts:
	src/main/java/org/terasology/cities/WorldFacade.java