style changes
Merge branch 'master' into develop
social buttons