Merge origin/master

Conflicts:
	src/main/webapp/redirect.jsp
Merge origin/master

Conflicts:
	src/main/webapp/redirect.jsp
Merge origin/master
Merge origin/master

Conflicts:
	src/main/webapp/redirect.jsp
Merge origin/master

Conflicts:
	src/main/java/com/qs/aop/AspectJAop.java
	src/main/resources/mybatis_sql_config/mybatis_config.xml
	src/main/webapp/WEB-INF/applicationContext.xml
	src/main/webapp/WEB-INF/dispatcher-servlet.xml
	src/main/webapp/WEB-INF/jsp/homePage.jsp
	src/main/webapp/WEB-INF/jsp/index.jsp
	src/main/webapp/static/js/modernizr.custom.js