Merge pull request #71 from sanctityQ/weblogic

Issue #70 fix
Issue #67  fixed
Issue #72  fixed
Issue #73  fixed
Merge remote-tracking branch 'origin/master'
no message
	modified:   src/main/java/com/fusionspy/beacon/site/Connect.java
	modified:   src/main/java/com/fusionspy/beacon/site/tux/TuxService.java
	modified:   src/main/java/com/sinosoft/one/monitor/controllers/threshold/ThresholdController.java
	modified:   src/main/java/com/sinosoft/one/monitor/threshold/model/Threshold.java
	modified:   src/main/resources/alarm_zh_CN.properties
	modified:   src/main/resources/sql/mysql/moitor.sql
	modified:   src/main/webapp/global/js/one.grid.js
	modified:   src/main/webapp/views/alarm/manager/alarmList.jsp
	modified:   src/main/java/com/fusionspy/beacon/site/tux/TuxService.java
	modified:   src/main/java/com/sinosoft/one/monitor/controllers/threshold/ThresholdController.java
	modified:   src/main/java/com/sinosoft/one/monitor/threshold/model/Threshold.java
	modified:   src/main/resources/alarm_zh_CN.properties
	modified:   src/main/resources/sql/mysql/moitor.sql
	modified:   src/main/webapp/global/js/one.grid.js
	modified:   src/main/webapp/views/alarm/manager/alarmList.jsp
delete workspace.xml
delete workspace.xml
Merge branch 'master' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/java/com/fusionspy/beacon/site/MonitorManage.java
	src/main/java/com/fusionspy/beacon/site/SitesHolder.java
	src/main/webapp/WEB-INF/layouts/menu.jsp
Merge branch 'master' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/java/com/fusionspy/beacon/site/MonitorManage.java
	src/main/java/com/fusionspy/beacon/site/SitesHolder.java
	src/main/webapp/WEB-INF/layouts/menu.jsp
Merge branch 'master' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/java/com/fusionspy/beacon/site/MonitorManage.java
	src/main/java/com/fusionspy/beacon/site/SitesHolder.java
	src/main/webapp/WEB-INF/layouts/menu.jsp
Merge branch 'master' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/java/com/fusionspy/beacon/site/MonitorManage.java
	src/main/java/com/fusionspy/beacon/site/SitesHolder.java
	src/main/webapp/WEB-INF/layouts/menu.jsp
Merge branch 'master' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/java/com/fusionspy/beacon/site/MonitorManage.java
	src/main/java/com/fusionspy/beacon/site/SitesHolder.java
	src/main/webapp/WEB-INF/layouts/menu.jsp
Merge branch 'master' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/java/com/fusionspy/beacon/site/MonitorManage.java
	src/main/java/com/fusionspy/beacon/site/SitesHolder.java
	src/main/webapp/WEB-INF/layouts/menu.jsp