增加fastjson支持
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	src/main/java/com/ht/scada/web/mvc/AlarmPushWndController.java