close #471, close #471, close #469, close #468
Merge branch '2.1' of github.com:open-classifieds/openclassifieds2 into 2.1