Merge pull request #265 from oliverds/master

Market wont open modal open-classifieds/openclassifieds2#886
closes open-classifieds/openclassifieds2#891
Edit advertisement categories open-classifieds/openclassifieds2#888
Merge remote-tracking branch 'upstream/master'