Merge pull request #892 from oliverds/master

Edit advertisement categories #888
Social auth menu item on sidebar duplicated #894
Merge remote-tracking branch 'upstream/master'