fix social golfer
Merge branch 'develop' into feature-fixSG
Merge branch 'feature-fixSG' into develop