Merge remote-tracking branch 'origin/master' into feature/viplist

code/moya-angular/src/app/app-routing.module.ts

 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { Routes, RouterModule } from '@angular/router';
+import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
 import { LoginComponent } from './pages/login/login.component';
 import { InfoComponent } from './pages/info/info.component';
 
@@ -16,7 +16,8 @@ const APP_ROUTES: Routes = [
 @NgModule({
   imports: [
     RouterModule.forRoot(
-      APP_ROUTES
+      APP_ROUTES,
+      { preloadingStrategy: PreloadAllModules }
     )
   ],
   exports: [

code/moya-angular/src/app/pages/login/login.module.ts

@@ -2,12 +2,13 @@ import { LoginRoutingModule } from './login-routing.module';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { LoginComponent } from './login.component';
+import { TopMenuComponent } from '../../menu/top-menu/top-menu.component';
 
 @NgModule({
   imports: [
     CommonModule,
     LoginRoutingModule
   ],
-  declarations: [ LoginComponent]
+  declarations: []
 })
 export class LoginModule { }