updated #6
Merge branch '2.0.7' of https://github.com/open-classifieds/openclassifieds2 into 2.0.7