end-of-line normalization(LF)
Merge branch 'master' of https://github.com/tthuem/FeatureIDE.git

Conflicts:
	plugins/de.ovgu.featureide.core.featurecpp/src/de/ovgu/featureide/featurecpp/wrapper/FeatureCppWrapper.java
	plugins/de.ovgu.featureide.core.mpl/src/de/ovgu/featureide/core/mpl/job/PrintStatisticsJob.java
	plugins/de.ovgu.featureide.core.mpl/src/de/ovgu/featureide/core/mpl/signature/abstr/AbstractSignature.java
	plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/internal/FeatureProject.java
	plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/propertypage/FeatureProjectPropertyPage.java
	plugins/de.ovgu.featureide.examples/featureide_examples/HelloWorld-DeltaJ/.classpath
	plugins/de.ovgu.featureide.examples/featureide_examples/HelloWorld-DeltaJ/.project
	plugins/de.ovgu.featureide.examples/featureide_examples/HelloWorld-DeltaJ/configs/BeautifulWorld.config
	plugins/de.ovgu.featureide.examples/featureide_examples/HelloWorld-DeltaJ/configs/HelloWorld.config
	plugins/de.ovgu.featureide.examples/featureide_examples/HelloWorld-DeltaJ/configs/WonderfulWorld.config
	plugins/de.ovgu.featureide.examples/featureide_examples/HelloWorld-DeltaJ/modules/HelloWorld_DeltaJ.java
	plugins/de.ovgu.featureide.fm.core/src/de/ovgu/featureide/fm/core/FeatureModelAnalyzer.java
	plugins/de.ovgu.featureide.fm.core/src/de/ovgu/featureide/fm/core/ModelMarkerHandler.java
	plugins/de.ovgu.featureide.fm.core/src/de/ovgu/featureide/fm/core/io/sxfm/SXFMWriter.java
	plugins/de.ovgu.featureide.fm.core/src/de/ovgu/featureide/fm/core/io/xml/XMLFeatureModelTags.java
	plugins/de.ovgu.featureide.fm.core/src/de/ovgu/featureide/fm/core/io/xml/XmlFeatureModelReader.java
	plugins/de.ovgu.featureide.fm.core/src/de/ovgu/featureide/fm/core/io/xml/XmlFeatureModelWriter.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/FeatureDiagramEditor.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/FeatureUIHelper.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/featuremodel/actions/calculations/ConstrainsCalculationsAction.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/featuremodel/actions/calculations/FeaturesOnlyCalculationAction.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/featuremodel/figures/ConstraintFigure.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/featuremodel/figures/LegendFigure.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/properties/language/English.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/properties/language/German.java
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/properties/language/ILanguage.java
	plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/actions/generator/ConfigurationBuilder.java
	tests/de.ovgu.featureide.fm.core-test/src/de/ovgu/featureide/fm/core/configuration/THiddenFeaturesConfiguration.java
	tests/de.ovgu.featureide.fm.core-test/src/de/ovgu/featureide/fm/core/configuration/TNumberOfConfigurations.java