commmit to branch1
Merge remote-tracking branch 'origin/branch1' into branch2

Conflicts:
	GitWeb/WebContent/index.html