修改部分BUG
Merge branch 'master' of https://github.com/huayuxi/semsweb.git

Conflicts:
	WebRoot/pages/front/news/news.jsp
	WebRoot/pages/front/news/news_detail.jsp