hotfix 10
Merge branch 'hotfix10'

Conflicts:
	GitExample/src/GitExample.java