working on open-classifieds/openclassifieds2#773
working on open-classifieds/openclassifieds2#773
closes open-classifieds/openclassifieds2#773
Merge branch 'master' of github.com:oliverds/common

Conflicts:
	views/oc-panel/pages/content/list.php