Cambios de convencion
Merge branch 'Solfamidas'

Conflicts:
	src/main/resources/messages/messages_es.properties
	src/main/resources/messages/messages_eu_ES.properties
Merge branch 'master'