Acciones de sala
Merge origin/master

Conflicts:
	src/MINSAL/IndicadoresBundle/Resources/translations/messages.en.yml
	src/MINSAL/IndicadoresBundle/Resources/translations/messages.es.yml
Merge origin/master

Conflicts:
	src/MINSAL/IndicadoresBundle/Resources/translations/messages.en.yml
	src/MINSAL/IndicadoresBundle/Resources/translations/messages.es.yml