Minor bug fix in rules ui
Merge branch 'master' of https://github.com/Kooboo/Ecommerce
Add the new conditions engine to promotion; fix for payment rest apis