modified:   src/Crystal/AdminBundle/Controller/accessController.php
	modified:   src/Crystal/AdminBundle/Controller/adminViewsController.php
	modified:   src/Crystal/AdminBundle/Controller/categoriesController.php
	modified:   src/Crystal/AdminBundle/Controller/multimediaController.php
	modified:   src/Crystal/AdminBundle/Controller/newsController.php
	modified:   src/Crystal/AdminBundle/Controller/usersController.php
	modified:   src/Crystal/AdminBundle/Resources/config/routing.yml
HAciendo merge con los cambios de Marvin

Conflicts:
	src/Crystal/AdminBundle/Controller/usersController.php
	src/Crystal/NewsBundle/Controller/usersController.php

	modified:   app/AppKernel.php
	modified:   app/config/routing.yml
	deleted:    src/Crystal/NewsBundle/Controller/accessController.php
	deleted:    src/Crystal/NewsBundle/Controller/adminViewsController.php
	deleted:    src/Crystal/NewsBundle/Controller/categoriesController.php
	deleted:    src/Crystal/NewsBundle/Controller/multimediaController.php
	deleted:    src/Crystal/NewsBundle/Controller/newsController.php
	deleted:    src/Crystal/NewsBundle/Resources/classes/audio.php
	deleted:    src/Crystal/NewsBundle/Resources/classes/image.php
	deleted:    src/Crystal/NewsBundle/Resources/public/images/favicon.ico
	deleted:    src/Crystal/NewsBundle/Resources/views/Admin/admin.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Admin/login.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Categories/addCategories.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Categories/listCategories.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Categories/updateCategories.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Multimedia/addMultimedia.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Multimedia/listMultimedia.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/News/createNews.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/News/listNews.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/News/updateNews.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Users/addUsers.html.twig
	deleted:    src/Crystal/NewsBundle/Resources/views/Users/updateUsers.html.twig