algunas pruebas de seguridad
Merge origin/master

Conflicts:
	src/main/java/com/hbv/ciea/WebSecurityConfig.java
	src/main/java/com/hbv/ciea/service/SecurityService.java