sss

sss
Merge remote-tracking branch 'origin/master'

Conflicts:
	StoreOnLine.v11.suo
	StoreOnLine/Areas/Management/Controllers/AdminProductBaseController.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	StoreOnLine.v11.suo
	StoreOnLine/Areas/Management/Controllers/AdminProductBaseController.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	StoreOnLine.v11.suo
	StoreOnLine/Areas/Management/Controllers/AdminProductBaseController.cs