Change-Id: Ibb7e5c69e0a83d511e5c87747e2c512a6836a1ea
day
day
Merge remote-tracking branch 'origin/merge' into develop

Conflicts:
	src/main/java/com/xwinter/study/activiti/web/index/LoginController.java
	src/main/java/com/xwinter/study/activiti/web/leave/LeaveAction.java
	src/main/java/com/xwinter/study/activiti/web/system/MenuController.java
	src/main/java/com/xwinter/study/activiti/web/test/TestController.java
	src/main/webapp/WEB-INF/spring-mvc.xml