Signed-off-by: Martin <Martin@192.168.1.15>
Merge branch 'master' of https://github.com/m-lange/eclipse.git

Conflicts:
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/Plugin.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/model/GroupDefinition.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/model/PatternDefinition.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/model/StyleDefinition.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/preferences/DefaultLabelProvider.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/preferences/GroupEditingSupport.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/preferences/PatternDefinitionDialog.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/preferences/PatternPreferencePage.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/preferences/StylePreferencePage.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/console/preferences/StyleSelectionDialog.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/preferences/PreferenceStore.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/preferences/PreferencesInitializer.java