Adding change to Branch 1
branch 1 - change 2 - commit from eclipse
Branch 1 - change 3 from eclipse
Merge remote-tracking branch 'origin/Branch1'

Conflicts:
	res/values/strings.xml