Merge branch 'master' of github.com:lerv22/MonitorBases

Conflicts:
	MonitorBases/nbproject/build-impl.xml
	MonitorBases/nbproject/project.properties
	MonitorBases/src/java/Beans/QueryManager.java
	MonitorBases/src/java/Services/Login.java
	MonitorBases/web/js/scripts.js
Merge branch 'master' of github.com:lerv22/MonitorBases