Changed social ids to correct ones
Merge branch 'master' into beta