Creación de vista activitiesTheoricalAssignment
Merge 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