adds dbConfig to settings
mergin gaya with local
Merge pull request #2 from zacharym/master

importing dbsettings