closes #830
Merge branch 'master' of github.com:open-classifieds/openclassifieds2