working on #701
Merge branch 'master' of github.com:open-classifieds/openclassifieds2