Edit advertisement categories #888
Merge remote-tracking branch 'upstream/master'
Merge pull request #892 from oliverds/master

Edit advertisement categories #888