added BI methods to Merchant class
Merge branch 'master' of https://github.com/gschorkopf/sales_engine