closes #159
Merge branch '1.2' of github.com:open-classifieds/open-eshop into 1.2