Settings 95%
Merge origin/master

Conflicts:
	MonitorAuditoria/src/java/Beans/DBConnector.java
SWAG (no olvide cambiar a ORCL)