Adding merge ability for orders
Merge branch 'master' of github.com:jasonknight/salor-retail
Merging change calc from Cigar