Moved TestWorldGenerator over to client
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/specialattack/settling/common/world/gen/TestWorldGenerator.java