Prueba final gitHub
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Proyectos/DepartamentoBundle/Controller/DefaultController.php
	src/Proyectos/DepartamentoBundle/Resources/views/Default/index.html.twig
Merge branch 'master' of https://github.com/Code14/Symfony

Conflicts:
	app/config/routing.yml