Haciendo Merge con Marvin
	modified:   src/Crystal/NewsBundle/Controller/adminViewsController.php
	modified:   src/Crystal/NewsBundle/Resources/views/Admin/admin.html.twig
	modified:   src/Crystal/NewsBundle/Resources/views/Categories/listCategories.html.twig
	modified:   src/Crystal/NewsBundle/Resources/views/Multimedia/addMultimedia.html.twig
	modified:   src/Crystal/NewsBundle/Resources/views/Multimedia/listMultimedia.html.twig
Merge branch 'master' of https://github.com/CrystalSV/MGMAnime