Working on persistent world support
Cleanup for the day
Merge branch 'master' into web

Conflicts:
	src/server/ServerBootstrap.java