7
Merge branch 'master' of https://github.com/botischroeder/testgit

Conflicts:
	testgit2/src/de/testgit2/test.java
neu