增加sitemesh，作为页面布局
Merge branch 'sm827'

Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp