closes #304 closes #309
Merge branch '2.0.5' of github.com:open-classifieds/openclassifieds2 into 2.0.5