Agregando roles
Merge branch 'master' of github.com:afvasque/chanapp

Conflicts:
	src/chanpp/EvImBundle/Controller/FichaProyectoController.php