Backend intermediate 2
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/SigmaCR/sigma-cr
Backend intermediate 3 ontology added
Backend intermediate 3 ontology added
Merge remote-tracking branch 'upstream/master'

Conflicts:
	SigmaCRCommons/src/test/java/com/sigmacr/commons/MetaDataHandlerTest.java
Backend intermediate 3 ontology added
Merge branch 'master' of https://github.com/SigmaCR/sigma-cr
fixed references and encoding issue