change 4
Merge branch 'master' into changes

Conflicts:
	egit-learning/src/main/java/de/dbo/samples/egit0/Version.java
after merge