added db functionality
Merge remote-tracking branch 'origin/fredrikj'

Conflicts:
	Gemfile.lock