Merged develop and fixed conflicts

apps/dafa-web/src/app/app.module.ts

@@ -2,6 +2,7 @@ import { DigiNgNavigationBreadcrumbsModule } from '@af/digi-ng/_navigation/navig
 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
+import { RouterModule } from '@angular/router';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { NavigationModule } from './components/navigation/navigation.module';
@@ -14,6 +15,7 @@ import { SkipToContentModule } from './components/skip-to-content/skip-to-conten
     BrowserModule,
     HttpClientModule,
     AppRoutingModule,
+    RouterModule,
     SkipToContentModule,
     NavigationModule,
     SidebarModule,