Debug commit
Merge branch 'master' into Debug

Conflicts:
	GitJava/src/com/lac/hao/HiGit.java