db stuff
db config
merge
Merge branch 'master' into bootstrap
generate scaffold for generator