merge
Merge branch 'master' of https://github.com/senilica/LostVaults

Conflicts:
	lostvaults.db
	server.jar
	src/lostvaults/server/ItemRepo.scala
Merge branch 'master' of https://github.com/senilica/LostVaults

Conflicts:
	lostvaults.db
	server.jar
Preparing for final report, updated build.xml to reflect new doc
directory structure, added draft.tex latex file for report draft.