修改
2
Merge branch 'master' of https://github.com/xwinie/ducrm

Conflicts:
	src/cn/com/ducrm/common/utils/DateTools.java
	src/cn/com/ducrm/common/utils/FunctionTools.java
	src/cn/com/ducrm/common/utils/MyKeyGenerator.java
	src/cn/com/ducrm/common/utils/ObjectTools.java
	src/cn/com/ducrm/common/utils/ResourceManager.java
	src/cn/com/ducrm/common/utils/ResourceVO.java
	src/cn/com/ducrm/common/utils/StringTools.java