Merge from master
Merge branch 'Eclipse-Vaadin-project' of https://github.com/krajj7/pikater into Eclipse-Vaadin-project

Conflicts:

src/org/pikater/core/ontology/subtrees/batchdescription/CARecSearchCompl
ex.java

src/org/pikater/core/ontology/subtrees/batchdescription/ComputationDescr
iption.java

src/org/pikater/core/ontology/subtrees/batchdescription/ComputingAgent.j
ava

src/org/pikater/core/ontology/subtrees/batchdescription/DataProcessing.j
ava

src/org/pikater/core/ontology/subtrees/batchdescription/DataSourceDescri
ption.java

src/org/pikater/core/ontology/subtrees/batchdescription/DataSourceDescri
ptions.java

src/org/pikater/core/ontology/subtrees/batchdescription/ErrorDescription
s.java

src/org/pikater/core/ontology/subtrees/batchdescription/ErrorSourceDescr
iption.java

src/org/pikater/core/ontology/subtrees/batchdescription/EvaluationMethod
.java

src/org/pikater/core/ontology/subtrees/batchdescription/FileDataProvider
.java

src/org/pikater/core/ontology/subtrees/batchdescription/FileDataSaver.ja
va

src/org/pikater/core/ontology/subtrees/batchdescription/IComputationElem
ent.java

src/org/pikater/core/ontology/subtrees/batchdescription/IComputingAgent.
java

src/org/pikater/core/ontology/subtrees/batchdescription/IDataProvider.ja
va
	src/org/pikater/core/ontology/subtrees/batchdescription/IDataSaver.java

src/org/pikater/core/ontology/subtrees/batchdescription/IErrorProvider.j
ava

src/org/pikater/core/ontology/subtrees/batchdescription/ISourceDescripti
on.java
	src/org/pikater/core/ontology/subtrees/batchdescription/Recommend.java
	src/org/pikater/core/ontology/subtrees/batchdescription/Search.java

src/org/pikater/core/ontology/subtrees/batchdescription/durarion/Expecte
dDuration.java

src/org/pikater/core/ontology/subtrees/batchdescription/duration/Expecte
dDuration.java

src/org/pikater/core/ontology/subtrees/batchdescription/examples/SearchO
nly.java

src/org/pikater/core/ontology/subtrees/batchdescription/examples/SimpleT
raining.java