confirmed get wip
Merge branch 'dev' of https://github.com/ecjs/Concierge into dev
removed drop db
Merge remote-tracking branch 'upstream/dev' into dev