various changes related to JPF
Merge branch 'master' of https://github.com/d3scomp/JDEECo

Conflicts:
	jdeeco-core/pom.xml
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedSchedulerJPF.java
	jdeeco-demo/pom.xml
	jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
	jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/RobotFollowerComponent.java
	jdeeco-parent/pom.xml