Integration Progress Estimation  Part1
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/eui/miw/pfm/controllers/ejb/TargetEjb.java
Progres Estimation Integration fix with last merge
Integration Progress Estimation  Part2
Integration Progress Estimation  Part3
Merge branch 'origin/develop' into develop