Asignar UT a Trabajadores - Vista Drag and Drop
Merge origin/develop into develop

Conflicts:
	src/main/webapp/phaseplan/iterationDistribution.xhtml
Merge origin/develop into develop

Conflicts:
	src/main/webapp/phaseplan/iterationDistribution.xhtml
Integración parcial - iterationDistribution.xhtml
Integración IterationDistribution
Merge origin/develop into develop

Conflicts:
	src/main/java/eui/miw/pfm/controllers/beans/ActivitiesBean.java
	src/main/java/eui/miw/pfm/models/entities/ActivityEntity.java
	src/main/resources/eui/miw/pfm/i18n/messages_en.properties
	src/main/resources/eui/miw/pfm/i18n/messages_es.properties
	src/main/webapp/phaseplan/iterationDistribution.xhtml
	src/main/webapp/resources/css/stylePhasePlan.css
	src/test/java/eui/miw/pfm/controllers/ejb/TestCalendarProject.java
Merge origin/develop into develop

Conflicts:
	src/main/java/eui/miw/pfm/controllers/beans/WorkUnitBean.java
	src/main/webapp/phaseplan/iterationDistribution.xhtml
Integration UT To Worker Part2