Modelo de Automatización/Funciones
Merge origin/master into visual-improvements

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
Merge origin/master into visual-improvements

Conflicts:
	app/AppKernel.php
	app/config/routing.yml