FIXED: bugs in database; ADDED: hotel transaction history
Merge branch 'zlk'

Conflicts:
	data/dbfile