Manager v rozvrtanym stavu
merge
Task new (probably not final version)
manager - rozvrtano
manager - rozvrtano
Reworked parser
Updated inputs
Manager - CA behaviour
Manager - CA behaviour
manager rozvrtanej
Parser
posledni klidny commit pred velkym mergem
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/pikater/shared/database/jpa/JPARole.java
	src/org/pikater/shared/utilities/pikaterDatabase/initialisation/DatabaseInitialisation.java
computationCollectionItem
Merge branch 'KJ1' of https://github.com/krajj7/pikater

Conflicts:
	core/inputs/inputsKlara/input1/xmlGenerator/Input1.java
	core/inputs/inputsKlara/input2/xmlGenerator/Input2.java
	core/inputs/inputsKlara/input3/xmlGenerator/Input3.java
	src/org/pikater/core/agents/system/Agent_Manager.java
	src/org/pikater/core/agents/system/computationDescriptionParser/Parser.java
	src/org/pikater/core/agents/system/computationDescriptionParser/dependencyGraph/ComputationNode.java
	src/org/pikater/core/agents/system/management/ManagerAgentCommunicator.java
	src/org/pikater/core/ontology/messages/Task.java
	src/org/pikater/core/ontology/subtrees/option/Option.java
	src/org/pikater/core/ontology/subtrees/task/Execute.java
Merge branch 'KJ1' of https://github.com/krajj7/pikater

Conflicts:
	core/inputs/inputsKlara/input1/xmlGenerator/Input1.java
	core/inputs/inputsKlara/input2/xmlGenerator/Input2.java
	core/inputs/inputsKlara/input3/xmlGenerator/Input3.java
	src/org/pikater/core/agents/system/Agent_Manager.java
	src/org/pikater/core/agents/system/computationDescriptionParser/Parser.java
	src/org/pikater/core/agents/system/computationDescriptionParser/dependencyGraph/ComputationNode.java
	src/org/pikater/core/agents/system/management/ManagerAgentCommunicator.java
	src/org/pikater/core/ontology/messages/Task.java
	src/org/pikater/core/ontology/subtrees/option/Option.java
	src/org/pikater/core/ontology/subtrees/task/Execute.java
Merge branch 'KJ1' of https://github.com/krajj7/pikater
dalsi soubory
Merge branch 'KJ1' of https://github.com/krajj7/pikater
Merge, big one