Merge branch 'master' of https://github.com/ITBox/GaoRenZhiLu

Conflicts:
	code/ITBoxFramework/src/com/itbox/fx/util/Utils.java