Improved recipe database handling
Added sample data
Merge remote-tracking branch 'origin/master' into andreas