Merge branch 'master' of github.com:lerv22/Security-Manager

Conflicts:
	MonitorAuditoria/src/java/Services/SensibilityService.java
Merge origin/master

Conflicts:
	MonitorAuditoria/src/java/Beans/ReadJSON.java