jar
Merge remote-tracking branch 'origin/master'

Conflicts:
	jar/StoneTool-1.7.10-1.0.1.jar
	jar/StoneTool-1.7.10-1.0.2.jar
	jar/StoneTool-1.7.10-1.0.3.jar
	jar/StoneTool-1.7.10-1.1.0.jar