items transactions and merchant tests and files updated
Merge branch 'development' of github.com:tdoan87/sales_engine into development