[DEECo] [d3scomp/JDEECo] 9c3d4f: Merge remote-tracking branch 'remotes/origin/newge...

[GitHub]

  Branch: refs/heads/newgen-keznikl
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 9c3d4f98d75e0f46d664d77d63409f22d3bd0c95
      https://github.com/d3scomp/JDEECo/commit/9c3d4f98d75e0f46d664d77d63409f22d3bd0c95
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-06-15 (Sun, 15 Jun 2014)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-simulation-demo/evaluate.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/origin/newgen-kit' into newgen-keznikl
Some updates

Conflicts:
	jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java