update for git in eclipse
Merge branch 'TestBranch'

Conflicts:
	gitAndroidTestProject/bin/classes/.gitignore
	gitAndroidTestProject/gen/.gitignore