closes open-classifieds/openclassifieds2#787
Merge remote-tracking branch 'upstream/master'
working on #792
working on #786 just categories done
Merge pull request #793 from neo22s/master

Huge publish new refactor