Merge branch 'master' of https://github.com/kblyumkin/ATG_SK_TEST

Conflicts:
	Storefront/META-INF/MANIFEST.MF~
	griddynamicscustomPricing/META-INF/MANIFEST.MF
	griddynamicscustomPricing/META-INF/MANIFEST.MF~
Merge branch 'master' of https://github.com/kblyumkin/ATG_SK_TEST

Conflicts:
	Storefront/META-INF/MANIFEST.MF~