bugfixing database creation
Merge branch 'foo'

Conflicts:
	recipes/default.rb