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