database
Merge branch 'master' of https://github.com/nduvaldev/ditools

Conflicts:
	config/deploy.rb