cj
Merge branch 'master' of https://github.com/BlueDots/sms

Conflicts:
	sms/WebRoot/WEB-INF/classes/mybatis.xml
	sms/src/mybatis.xml
cj
cj