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

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

 src/environments/environment.ts

@@ -9,5 +9,5 @@
    production: false,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL: `http://127.0.0.1:8080/screen_api_v2/`
    SERVER_BASH_URL: `http://47.96.171.62:8080/screen_api_v2/`
};