Merge branch 'JonM' into dev
Feature: basic editing of user recipes.
Merge branch 'dev' into JonM