Änderung von Michi
Merge von Martin
Merge branch 'develop' of github.com:zhn185202395/maven-director into develop

Conflicts:
	pom.xml
	presentation/presentation1.pptx
	src/main/java/com/cedarsoft/maven/clashinspector/visualize/util/ConsoleVisualizeHelper.java
	src/site/apt/index.apt.vm
	src/site/apt/usage.apt.vm
	src/site/apt/version_clash_details.apt
	src/test/java/com/cedarsoft/maven/clashinspector/DependencyServiceTest.java