hotfix 88A
Merge branch 'hotfix88'

Conflicts:
	GitExample/src/GitExample.java