Merge origin/master

Conflicts:
	nbproject/private/private.xml
	src/Servicio/Servicio.java