Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	.classpath
	WebContent/settings/customblock/index.jsp
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	.classpath
	WebContent/settings/customblock/index.jsp

Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	WebContent/resources/style/reset.css
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	WebContent/resources/style/reset.css

Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'zhangjun' of git@github.com:App-coder/Optimize.git into junz

Conflicts:
	WebContent/settings/controlpanel/index.jsp
Merge branch 'zhangjun' of git@github.com:App-coder/Optimize.git into junz

Conflicts:
	WebContent/settings/controlpanel/index.jsp

Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>