Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

 Conflicts:
	src/main/java/com/gic/plug/web/controller/UploadImgController.java