Merge remote-tracking branch 'origin/develop' into BETTERZON-31

# Conflicts:
#	Frontend/src/app/app.module.ts

Frontend/src/app/app.module.ts

@@ -17,6 +17,8 @@ import {FormsModule} from '@angular/forms';
 import {PageNotFoundPageComponent} from './pages/page-not-found-page/page-not-found-page.component';
 import {MatMenuModule} from '@angular/material/menu';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { ImprintComponent } from './pages/imprint/imprint.component';
+import { PrivacyComponent } from './pages/privacy/privacy.component';
 
 @NgModule({
     declarations: [
@@ -29,7 +31,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
         ProductSearchPageComponent,
         HeaderComponent,
         NewestPricesListComponent,
-        PageNotFoundPageComponent
+        PageNotFoundPageComponent,
+        ImprintComponent,
+        PrivacyComponent
     ],
     imports: [
         BrowserModule,