2014-11-14 15:42:29  add2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cn/Stone/test/Main.java