Merge branch 'v4-dev' into v4-feat/settings

Author: vbakke

angular.json

@@ -44,7 +44,7 @@
                 {
                   "type": "anyComponentStyle",
                   "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumError": "6kb"
                 }
               ],
               "fileReplacements": [

package-lock.json

@@ -5,7 +5,7 @@ import { UserdayComponent } from './pages/userday/userday.component';
 import { CircularHeatmapComponent } from './pages/circular-heatmap/circular-heatmap.component';
 import { MappingComponent } from './pages/mapping/mapping.component';
 import { MatrixComponent } from './pages/matrix/matrix.component';
-import { ActivityDescriptionComponent } from './component/activity-description/activity-description.component';
+import { ActivityDescriptionPageComponent } from './pages/activity-description/activity-description-page.component';
 import { UsageComponent } from './pages/usage/usage.component';
 import { TeamsComponent } from './pages/teams/teams.component';
 import { RoadmapComponent } from './pages/roadmap/roadmap.component';
@@ -15,7 +15,7 @@ const routes: Routes = [
   { path: '', component: CircularHeatmapComponent },
   { path: 'circular-heatmap', component: CircularHeatmapComponent },
   { path: 'matrix', component: MatrixComponent },
-  { path: 'activity-description', component: ActivityDescriptionComponent },
+  { path: 'activity-description', component: ActivityDescriptionPageComponent },
   { path: 'mapping', component: MappingComponent },
   { path: 'usage', redirectTo: 'usage/' },
   { path: 'usage/:page', component: UsageComponent },

src/app/app-routing.module.ts

@@ -19,6 +19,7 @@ import { LogoComponent } from './component/logo/logo.component';
 import { SidenavButtonsComponent } from './component/sidenav-buttons/sidenav-buttons.component';
 import { TopHeaderComponent } from './component/top-header/top-header.component';
 import { ActivityDescriptionComponent } from './component/activity-description/activity-description.component';
+import { ActivityDescriptionPageComponent } from './pages/activity-description/activity-description-page.component';
 import { LoaderService } from './service/loader/data-loader.service';
 import { HttpClientModule } from '@angular/common/http';
 import { ReadmeToHtmlComponent } from './component/readme-to-html/readme-to-html.component';
@@ -38,6 +39,7 @@ import { TeamsGroupsEditorModule } from './component/teams-groups-editor/teams-g
     SidenavButtonsComponent,
     TopHeaderComponent,
     ActivityDescriptionComponent,
+    ActivityDescriptionPageComponent,
     CircularHeatmapComponent,
     MappingComponent,
     ReadmeToHtmlComponent,