删除添加页面
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/jsp/background/news/newsadd.jsp