Mezclando cambios del repositorio
Merge branch 'master' of https://github.com/roadev/IPOO_masa

Conflicts:
	nbproject/private/private.xml
Retoques finales