database configs
Merge branch 'master' of github.com:CMEP/webng

Conflicts:
	config/database.yml