no message
Merge branch 'branch-1' of https://github.com/vikasmangal/git-test-project into branch-1

Conflicts:
	SiteGenesis_Core/cartridge/forms/default/billing.xml