Fixed social buttons
Merge branch 'develop' into staging