Merge branch 'dev' into JonM
Updated search algorithm for db recipes
Merge branch 'JonM' into dev, Updated search algorithms
Merge branch 'dev'