- updating some db default values
Merge remote-tracking branch 'origin/master'