2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/joyce/webtool/component/Graphic.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/joyce/webtool/component/Graphic.java