Comienzo asyncProc
MDB y procesador
proc
MDB Client 
Envio de mensaje Object
ultimo antes de mergeo dev
levanto los params de el params.properties
Elimine metodo al pedo
Merge branch 'dev' into brunoBranch

Conflicts:
	.gitignore
	prototipo3/prototipo3-ejb/nbproject/private/private.properties
	prototipo3/prototipo3-ejb/src/java/uy/edu/ort/mixit/batchProcessor/FFmpegProcesador.java
	prototipo3/prototipo3-ejb/src/java/uy/edu/ort/mixit/batchProcessor/exceptions/MixitBatchProcessorException.java
	prototipo3/prototipo3-ejb/src/java/uy/edu/ort/mixit/businessLogic/IProyectosService.java
	prototipo3/prototipo3-ejb/src/java/uy/edu/ort/mixit/businessLogic/ProyectosService.java
mergeo 1
Integracion Web Services y el procesador OK
merge2
Merge branch 'dev' of https://github.com/mixitProyecto/mixit into dev

Conflicts:
	prototipo3/async_Processor/nbproject/genfiles.properties
	prototipo3/mediaProcessor/nbproject/build-impl.xml
	prototipo3/nbproject/project.properties
	prototipo3/nbproject/project.xml
	prototipo3/prototipo3-ejb/build/generated-sources/ap-source-output/uy/edu/ort/mixit/businessLogic/entities/Usuario_.java
	prototipo3/prototipo3-ejb/nbproject/project.xml