Commited to hotfix
Merge branch 'hotfix'

Conflicts:
	src/hadoop/test/GitTesting.java