1.10.26.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/boyi/po/Paper.java