修改页面样式等
Merge branch 'master' of https://github.com/lifang/FudanAppManage.git

Conflicts:
	src/main/webapp/WEB-INF/view/layout.ftl