Merge branches 'master' and 'dev'
Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'master' and 'dev'
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'master', remote-tracking branch 'origin/master' into dev
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Adds the displayname logic and changed the landing page for all usertypes