2014-11-14 16:03:44
Merge remote-tracking branch 'origin/master - fan' into Fan

Conflicts:
	src/cn/Stone/test/Main.java
2014-11-14 16:07:49
Merge pull request #1 from Jichuang/Fan

Fan