提交新插件和弹框插件
Merge branch 'zhanglu' of github.com:AntShakeTree/VDI into zhanglu

Conflicts:
	vdi-core-server-lls-730/src/main/webapp/js/computingpool.js
	vdi-core-server-lls-730/src/main/webapp/view/computingpool/view.html