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

Conflicts:
	src/main/java/com/chainton/forest/core/CoreFileInfo.java
	src/main/java/com/chainton/forest/core/FileReceivingEventHandler.java
	src/main/java/com/chainton/forest/core/util/GlobalUtil.java
	src/main/java/com/chainton/forest/core/wrapper/ForestFileReceiver.java
	src/main/java/com/chainton/forest/core/wrapper/ForestFileSender.java