branch 1.0
Merge branch '1.0' of github.com:open-classifieds/open-eshop into 1.0