Merge branch 'develop' into feature/thumbnail_upload

# Conflicts:
#	package-lock.json
#	projects/common/src/fm/common.module.ts

projects/common/src/fm/common.module.ts

@@ -61,6 +61,8 @@ import { NotificationMenuComponent} from './components/notification-menu/notific
 import { HelpMenuComponent} from './components/help-menu/help-menu.component';
 import { BackButtonComponent } from './components/back-button/back-button.component';
 import { ThumbnailUploadModalComponent } from './components/thumbnail-upload-modal/thumbnail-upload-modal.component';
+import { AvatarComponent } from './components/avatar/avatar.component';
+import { AvatarModule } from 'ngx-avatar';
 
 export {
   SafePipe,
@@ -103,7 +105,8 @@ export {
   IDataLayer,
   IColor,
   IGradientstop,
-  BackButtonComponent
+  BackButtonComponent,
+  AvatarComponent
 };
 
 @NgModule({
@@ -116,7 +119,8 @@ export {
     OAuthModule.forRoot(),
     NgbModule,
     FormsModule,
-    UploadxModule
+    UploadxModule,
+    AvatarModule
   ],
   declarations: [
     AppComponent,
@@ -140,7 +144,8 @@ export {
     HelpMenuComponent,
     BackButtonComponent,
     ThumbnailComponent,
-    ThumbnailUploadModalComponent
+    ThumbnailUploadModalComponent,
+    AvatarComponent
   ],
   exports: [
     NgbModule,
@@ -164,7 +169,8 @@ export {
     GradientComponent,
     GradientSelectComponent,
     BackButtonComponent,
-    ThumbnailComponent
+    ThumbnailComponent,
+    AvatarComponent
   ]
 })
 export class AppCommonModule {