adding default config
adding default config
dev merged
db mod