Merge branch 'master' into staging
config db
add customer as parent
Merge branch 'staging'