2014-11-14 15:58:48
Merge remote-tracking branch 'origin/master'

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