Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs


 Conflicts:

	src/main/webapp/static/css/console.css

	src/main/webapp/static/css/index.css

	src/main/webapp/views/console.html