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
none
none