update finished, ready for deep test.
Merge branch '2.0.7' of github.com:open-classifieds/openclassifieds2 into 2.0.7