db tmp/ => db/
Merge branch 'master' into openshift

Conflicts:
	app.rb