NPC stuff
new database
fix in playaaah
Merge branch 'master' of http://github.com/senilica/LostVaults

Conflicts:
	lostvaults.db