565
Merge branch 'master' of
git@github.com:zhkumsc/MoblicLearningCommunity.git

Conflicts:
	Juint4Test/com/xxx/DAO/Test.java
5435345