Initial Version
Update db settings.
Merge remote branch 'origin/master'