。
Merge branch 'master' of https://github.com/chainton/dankeshare

Conflicts:
	src/com/chainton/dankeshare/impl/HttpFileServer.java