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

Conflicts:
	src/lostvaults/server/ConMan.scala