Updated ingredient Search and merge

merged latest version and updated ingredient search.
Josiah