Some commits
Merge remote-tracking branch 'origin'

Conflicts:
	src/com/octagami/simpleworlds/config/WorldsConfig.java