Delete project.xml
Delete project.xml
Delete project.xml
Se agrega modificación del archivo bienvenido.html.twig
Merge origin/master

Conflicts:
	src/Sage/GeneralBundle/Resources/views/Default/bienvenido.html.twig