no message
Merge branch 'dev' into brunoBranch

Conflicts:
	prototipo 2/prototipo2-war/web/grabacion.xhtml
	prototipo 2/prototipo2-war/web/index.xhtml
	prototipo 2/prototipo2-war/web/mixPaso1.xhtml
	prototipo 2/prototipo2-war/web/resources/js/lightbox.js
	prototipo 2/prototipo2-war/web/resources/js/main.js
	prototipo2/prototipo2-war/src/java/uy/com/mixit/controllers/FileBean.java
	prototipo2/prototipo2-war/src/java/uy/com/mixit/controllers/MixBean.java
	prototipo2/prototipo2-war/src/java/uy/com/mixit/objetos/BD.java
arreglo archivos con conflicto