Added a test for recipe
Added more sample data
Merge branch 'andreas' into oskar
Recipe stuff
Merge branch 'master' into oskar