提交。
123
123
1
Merge branch 'master' of https://github.com/nazavoya/bora-backstage.git

Conflicts:
	WebRoot/backstage/ui/instance.jsp
	WebRoot/backstage/ui/js/instance.js
	WebRoot/commons/resources/js/global.js
	src/main/java/com/zxcxco/bora/backstage/commons/domain/fileupload/FileMeta.java
	src/main/java/com/zxcxco/bora/backstage/commons/domain/fileupload/FileUploadManager.java
	src/main/java/com/zxcxco/bora/backstage/ui/service/UiService.java
	src/main/java/com/zxcxco/bora/backstage/ui/web/UiController.java

Change-Id: I23ae9cfd1f487d45cd3e5e65f853b2c2e0494a41
Signed-off-by: nazavoya <nazavoya@qq.com>