Maquetacio cabecera
Creando el Bundle Contabilidad
Merge origin/Develop into Develop

Conflicts:
	app/Resources/views/base.html.twig
menu
Merge branch 'Develop' of git+ssh://192.168.1.71/var/www/html/Dropbox/Prog_Repositorios/Admin_SIS into Develop

Conflicts:
	src/SIS/AdminBundle/Resources/views/layout.html.twig
Merge origin/Develop into Develop

Conflicts:
	app/Resources/views/base.html.twig
Merge branch 'origin/Develop'

Conflicts:
	src/SIS/AdminBundle/Resources/views/layout.html.twig