closes #394
Merge branch '2.0.8' of github.com:open-classifieds/openclassifieds2 into 2.0.8