首页广告与资讯
Merge branch 'master' of https://github.com/huangchiwei/yikang.git

Conflicts:
	YiKangWeb/src/com/yuankang/yk/controller/front/IndexController.java