Elimino archivos innecesarios del repo
no message
Merge branch 'dev' of https://github.com/mixitProyecto/mixit into dev

Conflicts:
	prototipo3/RESTServices/nbproject/project.properties
	prototipo3/RESTServices/nbproject/project.xml
	prototipo3/prototipo3-ejb/nbproject/project.xml