test
合并完成Merge branch 'master' of
ssh://git@github.com/zhkumsc/MoblicLearningCommunity.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	Juint4Test/com/mlcss/dao/TestDBConnection.java
	src/com/mlcss/dao/impl/UserDAOImpl.java
	src/com/mlcss/util/DBUtil.java