Merge origin/master

Conflicts:
	Sistema/public_html/index.html
	Sistema/public_html/session/Pagos.html
	Sistema/public_html/session/cancelacionCitaEsp.html
	Sistema/public_html/session/confirmacionCitaEsp.html
	Sistema/public_html/session/creacionOrientador.html
	Sistema/public_html/session/principal.html
	Sistema/public_html/session/registrarCursos.html
lastEvents
Merge branch 'master' of github.com:lerv22/Security-Manager

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