changing db conf
Merge branch 'master', remote-tracking branch 'origin/master'
kk
Conflicts:
	config/config.yml