fixed #160, #159, #158
Merge branch '2.0.RC1' of github.com:open-classifieds/openclassifieds2 into 2.0.RC1