update
Merge remote-tracking branch 'origin/master' into hansel-html-utility

Conflicts:
	src/com/tail/util/HTMLUtil.java
Merge pull request #15 from FairyTail/hansel-html-utility

update