Merge branch 'master' into spencer/linting

# Conflicts:
#	package-lock.json
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/shared.module.ts

src/app/app.module.ts

@@ -14,6 +14,7 @@ import { LoggerModule } from 'ngx-logger';
 import { environment } from '@src/environments/environment';
 import { ErrorInterceptor, HttpConfigInterceptor, LoggingInterceptor } from '@app/_interceptors';
 import { MutablePgpKeyStore } from '@app/_pgp';
+import { ServiceWorkerModule } from '@angular/service-worker';
 
 @NgModule({
   declarations: [AppComponent],
@@ -31,6 +32,7 @@ import { MutablePgpKeyStore } from '@app/_pgp';
       serverLoggingUrl: `${environment.loggingUrl}/api/logs/`,
       disableConsoleLogging: false,
     }),
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })
   ],
   providers: [
     AuthGuard,