Merge branch 'master' into develop

diff --cc client/src/app/menu/menu.component.scss
index fa9a006af1ddc1ba01f269fb3c6f314eb57acea1,69704674aa5a9a9a90c1787417f86eb5da250631..2f23fa5f8546540c092f85c95838eac5d445b4b6
--- 1/client/src/app/menu/menu.component.scss
--- 2/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@@ -47,12 -37,13 +47,15 @@@ menu 
      display: flex;
      align-items: center;
      justify-content: center;
 -    margin-bottom: 35px;
 +    margin-bottom: 20px;
  
      .logged-in-info {
 +      @include ellipsis;
 +
        flex-grow: 1;
+       white-space: nowrap;
+       overflow: hidden;
+       text-overflow: ellipsis;
  
        .logged-in-display-name {
          font-size: 16px;