pantallas abiertas
Merge branch 'master' of https://github.com/pablo28jg/Adj

Conflicts:
	src/Pablo/AdjWebBundle/Resources/views/Atributo/menu.htm.twig
	src/Pablo/AdjWebBundle/Resources/views/Default/index.html.twig
	src/Pablo/AdjWebBundle/Resources/views/Opcion/menu.htm.twig
	web/js/pantalla.js