qqqqq
Merge remote-tracking branch 'daiyu/master'

Conflicts:
	src/main/resources/applicationContext-shiro.xml