containers comments and FIXME in ShadowKnowledgeManagerRegistry
Merge pull request #115 from rima-alali/newgen

Please avoid committing .classpath unless really necessary. Also, check your autoclrf settings of GIT and the line endings of your files to avoid committing change sets involving whole files (all your changes cover the whole files, so each line of the files you committed appears as changed and may lead to significant conflicts, please check this every time before committing since it is really hard to revert it once you do that).

containers comments and FIXME in ShadowKnowledgeManagerRegistry
Merge pull request #114 from d3scomp/newgen-iliasg

Javadoc + Clean Up + some additions
Merge pull request #116 from d3scomp/newgen-iliasg

javadoc added in AnnotationProcessorException
comments on ShadowKnowledgeManagerRegistry
comments on ShaowKowledgeMnagerRegistry
comments on ShadowKnowledgeManagerRegistry
trying to use PMD
Update README.md
Merge pull request #118 from rima-alali/newgen
try to add changes on comments of containers and
ShadowKnowledgeManagerRegistery
Documentation added to classes.
package-info.java added to scheduler package
Documentation added to classes.
package-info.java added to scheduler package
new line added to package-info.java
Merge branch 'newgen-muradyan' of https://github.com/d3scomp/JDEECo.git
into newgen-muradyan

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/package-info.java
test
test2
sorry guys, I have to do this because of the line ending conflict
Final and hopefully automergable
resolving conflicts
Merge remote-tracking branch 'remotes/origin/newgen' into newgen-muradyan

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java