Merge branch 'master' of ssh://bitbucket.org/liuzheng712/webterminal

.gitignore

@@ -42,4 +42,4 @@ yarn-error.log
 .DS_Store
 Thumbs.db
 
-src/assets/
+publish.sh

src/app/app-routing.module.ts

@@ -17,8 +17,6 @@ import {RdppageComponent} from "./rdppage/rdppage.component";
 import {TermpageComponent} from "./termpage/termpage.component";
 
 const appRoutes: Routes = [
-  // { path: 'crisis-center', component: CrisisListComponent },
-  // {path: 'welcome', component: IndexPageComponent}, // <-- delete this line
   {path: 'users/login', component: LoginComponent},
   {path: 'rdp/:token', component: RdppageComponent},
   {path: 'term/:token', component: TermpageComponent},