1.改进spring配置方式
2.增加报警信息推送功能
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	src/main/resources/application.development.properties
	src/main/resources/applicationContext.xml