revert
modify
Merge branch 'branch_1.2.0_tmp' into branch_1.2.0

Conflicts:
	designer/src/main/resources/public/silkroad/index.html
	designer/src/main/resources/public/silkroad/src/report/component-box/components/select-vm-template.js