Merge branch 'master' of https://github.com/M-S-H/hidtadb

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/M-S-H/hidtadb