from merger brnach- 13.25PM
13.36PM
Merge remote-tracking branch 'origin/new-branch-git' into new-branch-git

Conflicts:
	test-git/src/com/test/git/java/Test.java