update
Merge https://github.com/tkminh/hottestreader

Conflicts:
	.classpath
	src/com/hotteststudio/model/GenBookHTML.java
	src/com/hotteststudio/util/XCommon.java