Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-05-15 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2

 src/environments/environment.hmr.ts

@@ -3,5 +3,6 @@
    SERVER_URL: `./`,
    production: false,
    hmr: true,
    useHash: true
    useHash: true,
    SERVER_BASH_URL: `http://47.96.171.62:8080/screen_api_v2/`
};