working on #162
Merge branch '1.3' of github.com:open-classifieds/open-eshop into 1.3