mrlee commit
s
Merge branch 'master' of https://github.com/mybao123/mybao123-web.git

Conflicts:
	src/main/java/com/mybao123/controller/IndexController.java
	src/main/java/com/mybao123/service/IndexService.java
Merge branch 'master' of https://github.com/mybao123/mybao123-web.git
s
Merge branch 'master' of https://github.com/mybao123/mybao123-web.git
mrls
Merge branch 'master' of https://github.com/mybao123/mybao123-web.git

Conflicts:
	src/main/java/com/mybao123/service/IndexService.java
	src/main/webapp/WEB-INF/applicationContext.xml