2013-6-30 刘立堂
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	src/main/webapp/WEB-INF/views/alarm/bjxix.jsp
2013-7-18 刘立堂
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	src/main/webapp/WEB-INF/views/alarm/bjxix.jsp
	src/main/webapp/alarmpush.js
2013-7-19 刘立堂