funciona el sorlogger
Merge branch 'master' of https://github.com/franbn14/SORPAPETEAM

Conflicts:
	Core/dist/Core.jar
	Core/nbproject/private/private.properties
	SorLogger/dist/SorLogger.jar
	Sor_Servicios/nbproject/private/private.properties
Ficheros de SorLogger para que se pueda meter en netbeans