closes #596
closes #602
closes #596
Merge branch '2.1.4' of github.com:open-classifieds/openclassifieds2 into 2.1.4