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