Merge branch 'master' into flat-ui
Change branding to WeTeam text
Merge branch 'flat-ui'