U3A3
Merge branch 'U3'

Conflicts:
	nivel2/U3A3/imgs/salad/line.png
	nivel2/U3A3/imgs/sandwich/line.png
	nivel2/U3A3/js/main.coffee
	nivel2/U3A3/js/main.js
	nivel2/U5A1/js/class/main_cs.js
	nivel2/U5A3/js/app.js
	nivel2/U5A3/js/class/draggable_.js
	nivel2/U5A4/index.html