Deprecated CGEntity format

CGEntity has been replaced by the formeta format
Removing CGEntity and CGText and refactoring test cases to make it
possible
Mysterious whitespace changes which should not occur any more :-(
Merge branch 'master' of ssh://github.com/culturegraph/metafacture-core

Conflicts:
	examples/marc21-to-edm/edm-namespaces.properties
	examples/sort/sort-gnd.flux
	src/main/java/org/culturegraph/mf/stream/converter/ObjectTemplate.java
	src/main/java/org/culturegraph/mf/stream/pipe/OreAggregationAdder.java
	src/main/java/org/culturegraph/mf/stream/sink/SimpleXmlWriter.java
	src/main/java/org/culturegraph/mf/types/CGEntity.java
	src/test/java/org/culturegraph/mf/stream/converter/CGEntityTest.java
	src/test/java/org/culturegraph/mf/stream/converter/CGTextDecoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/CGTextEncoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/JsonEncoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/xml/GenericXMLHandlerTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/StreamMergerTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/StringFilterTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/UniformSamplerTest.java
Reset JsonEncoder to last working version
Removed CGText from flux commands
Removed cgtext from flux commands
Normalise line endings (second attempt)

Configuration changed to always use line-feeds only.
Fixed gitattributes to always use newlines
Merge commit '5a29b5d' into mylocalwork

Conflicts:
	.gitattributes
	examples/marc21-to-edm/edm-namespaces.properties
	examples/sort/sort-gnd.flux
	src/main/java/org/culturegraph/mf/stream/converter/ObjectTemplate.java
	src/main/java/org/culturegraph/mf/stream/pipe/OreAggregationAdder.java
	src/main/java/org/culturegraph/mf/stream/sink/SimpleXmlWriter.java
	src/main/java/org/culturegraph/mf/types/CGEntity.java
	src/test/java/org/culturegraph/mf/stream/converter/CGEntityTest.java
	src/test/java/org/culturegraph/mf/stream/converter/CGTextDecoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/CGTextEncoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/JsonEncoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/xml/GenericXMLHandlerTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/StreamMergerTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/StringFilterTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/UniformSamplerTest.java
Normalise line endings
Merge branch 'master' into mylocalwork
Normalised whitespace manually
Configured Eclipse project to use new lines only