fix
Merge branch 'jeesite-master'

Conflicts:
	src/main/resources/applicationContext.xml
	src/main/webapp/WEB-INF/web.xml