added database
Merge branch 'master' of github.com:wasappliserver/ValuePicker

Conflicts:
	config/database.yml