working on #510, and some other small fixes
Merge branch '2.1.2' of github.com:open-classifieds/openclassifieds2 into 2.1.2