20140603
Merge branch 'master' of https://github.com/steven28zhang/ITTechlife

Conflicts:
	itlCore/src/main/java/com/sxw/itl/utils/db/json/JsonUtil.java