Merge branch 'hotfix/team'
responsive fix
Merge branch 'hotfix/rgsoc' into develop