added database config
Merge branch 'master' into development

Conflicts:
	config/database.yml