Suo
Resolved

Conflicts:
	EduShop-Unsecure/EduShop-Unsecure.v12.suo
Test Web.Config
Suo