Fixed an order test
Merge branch 'master' of git://github.com/vespolina/commerce
Merge branch 'master' of github.com:inspiran/commerce