fixed database.cpp
Merge branch 'master' of https://github.com/EMacks/HCI

Conflicts:
	src/HCI/database.cpp