冲突前
Merge branch 'master' of git@github.com:fwchun/mmcc.git

Conflicts:
	ccmm/src/com/tdrz/util/DBUtils.java