update config
Merge commit '2ae7b61466e83e1b7fac32768775271b4d6abe4f'

Conflicts:
	pvparena.jar