Fixed server crashing on startup.
Conflicts:
	build.gradle