Cambios en el frontend
Merge origin/master
Merge origin/master

Conflicts:
	src/DBOJ/BackendBundle/Controller/DashboardController.php