Desarrollo de la vista progressEstimation
Merge origin/develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/eui/miw/pfm/i18n/messages_en.properties
	src/main/resources/eui/miw/pfm/i18n/messages_es.properties