Merge branch 'master' into develop
Fix authentication graphics
Merge branch 'develop'