将frameset进行调整
Merge branch 'wls' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/java/com/fusionspy/beacon/site/MonitorData.java