Dashboard Activity changes
Merge branch 'BossingHard' of https://github.com/Tankbox/SocProxPreAlpha into BossingHard