BI #favorite merchant working and tested
Merge branch 'master' of https://github.com/JessicaG/sales_engine-1