cleanup
Merge branch 'master' of https://github.com/peteroupc/HtmlParser

Conflicts:
	src/com/upokecenter/util/BEncodeObject.java

merging