hotfix 100A
Merge branch 'hotfix100'

Conflicts:
	GitExample/src/GitExample.java