RoomDesc Tests, and changed message passing in combat so that NPC will be included easier
Merge branch 'master' of http://github.com/senilica/LostVaults

Conflicts:
	client.jar
	lostvaults.db
	server.jar
	src/lostvaults/server/Dungeon.scala
	src/lostvaults/server/Player.scala