Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	bin/StaBaseInfo/PaperInfo.class
	src/StaBaseInfo/PaperInfo.java

Signed-off-by: ColaLL <liuli0407@hotmail.com>