customer favorite merchant biz logic
fixing merge conflict
cleaning up
Merge pull request #65 from bmrsny/customer_biz

customer favorite merchant biz logic