Regenerated server config file
Merge branch 'master' of https://github.com/DeathJockey/INDS

Conflicts:
	server_data/config.xml