123
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/mingdao/api/htf/RequestHTF.java