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