cambio.
Merge branch 'dev' into gustavoBranch
drag and drop en eje X
Merge remote-tracking branch 'origin/gustavoBranch' into rodrigoBranch

Conflicts:
	prototipo 1/prototipo1-war/web/mixPaso1.xhtml