1111
Merge branch 'master' of https://github.com/Foboy/Ecommerce

Conflicts:
	RuiCui/Presentation/Nop.Web/Content/Images/Thumbs/0000001_book_100.jpeg