fixes
merge, resolve #1
merge
Merge branch 'dev' into ht-db

Conflicts:
	controllers/database.js
Merge branch 'ht-db' into dev