Preparing for database integration.
Merge branch 'master' of https://github.com/senilica/LostVaults

Conflicts:
	client.jar
	server.jar
	src/lostvaults/client/GUI.java
	src/lostvaults/server/Player.scala
Further preparation for database integration.