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

沈斌

2017-12-20 b5ce833799753acd0944e6901b8101f03263e1fa

 src/environments/environment.ts

@@ -7,5 +7,6 @@
    SERVER_URL: `./`,
    production: false,
    hmr: false,
    useHash: true
    useHash: true,
    SERVER_BASH_URL: 'http://localhost:8001'
};