2013-10-28 系统中文字显示不全的BUG修改
2013-10-29
1.完善报警曲线显示
2.修整页面显示样式
3.修改页面错别字
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	src/main/webapp/WEB-INF/views/main/ssjc.jsp
	src/main/webapp/WEB-INF/views/manage/wltp.jsp
	src/main/webapp/static/dhtmlx/dhtmlx-zz.css