No big changes, only a fix to make battle non-buggy hopefully
Little fixes
Merge branch 'master' of http://github.com/senilica/LostVaults

Conflicts:
	client.jar
	server.jar