store dan merk
Merge branch 'master' of https://github.com/rahardiandj/ECommerce

Conflicts:
	Store/tests/ecommerce.store.unittest/StoreUnitTest.cs
	ecommerce.web/ecommerce.suo

Bismillahirrahmanirrahim
Merge branch 'master' of https://github.com/rahardiandj/ECommerce

Conflicts:
	ecommerce.web/ecommerce.suo

Bismillah