Correcciones #14 #18
+Ignores
Merge branch 'master' of https://github.com/Phesus/Omoikane

Conflicts:
	main/src/omoikane/sistema/Usuarios.groovy
	main/src/omoikane/sistema/seguridad/NipAuthProvider.java