首页内容
Merge branch 'master' of https://github.com/lishaoquan/road

Conflicts:
	contact/WebContent/pages/index.jsp
LoginOutController
Merge branch 'master' of https://github.com/lishaoquan/road

Conflicts:
	contact/WebContent/pages/index.jsp