2013-05-31 zhaowei
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	src/main/java/com/ht/scada/data/service/testimpl/AlarmServiceImpl.java
	src/main/java/com/ht/scada/data/service/testimpl/RealtimeDataServiceImpl.java