README.md completed
Merge pull request #133 from d3scomp/newgen-muradyan

Newgen muradyan
Merge pull request #136 from d3scomp/newgen-keznikl

Cleaned-up evaluation used for ECSA
Merge pull request #137 from d3scomp/newgen-keznikl

fixing bugs in the MANET demo
architecture model and changes to support IRM-SA annotation and
reasoning mechanisms
architecture model and changes to support IRM-SA annotation and
reasoning mechanisms
Fixing launchers in projects other than core
Merge pull request #138 from d3scomp/newgen-iliasg

Merging iliasg's changes to newgen
Merge remote-tracking branch 'remotes/origin/sim-bures' into newgen

Conflicts resolved:
	jdeeco-core/META-INF/MANIFEST.MF
	jdeeco-core/model/RuntimeModel.ecore
	jdeeco-core/model/RuntimeModel.genmodel
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
making simulation demo compile
merging newgen to master
Merge pull request #139 from d3scomp/master

Getting updates from master