内容管理店铺活动
Merge branch 'master' of https://github.com/lifang/FudanAppManage

Conflicts:
	src/main/webapp/WEB-INF/view/layout.ftl
Merge branch 'master' of https://github.com/lifang/FudanAppManage