［修改］新闻增加
［修改］冲突处理

Conflicts:
	src/main/webapp/WEB-INF/jsp/front/waterMonitorStatistic.jsp
	src/main/webapp/assets/front/bootstrap.js
	src/main/webapp/assets/front/datatable/DT_bootstrap.css
	src/main/webapp/assets/front/datatable/datatable-bootstrap.css
	src/main/webapp/assets/front/datatable/datatables_bootstrap.js
	src/main/webapp/assets/front/docs.min.css
	src/main/webapp/assets/front/main.css