Revert "11"

This reverts commit a93e6f320fc93936d5a07688fb6bb563bebd841d.

Conflicts:
	RuiCui/Presentation/Nop.Web/Administration/sitemap.config
12
11
Merge branch 'master' of https://github.com/Foboy/RCEcommerce

Conflicts:
	RuiCui/NopCommerce.v12.suo
	RuiCui/Presentation/Nop.Web/Nop.Web.csproj.user