User config
Gestionando usuarios
Merge branch 'master' of github.com:koxder/agregador

Conflicts:
	app/config/parameters.yml