Merge remote-tracking branch 'remotes/origin/master' into notifications

# Conflicts:
#	src/app/app.component.ts
#	src/app/core/core.module.ts

src/config/global-config.interface.ts

@@ -11,6 +11,7 @@ export interface GlobalConfig extends Config {
   cache: CacheConfig;
   notifications: INotificationBoardOptions;
   universal: UniversalConfig;
+  gaTrackingId: string;
   logDirectory: string;
   debug: boolean;
 }