Add 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentation/Nop.Web/App_Data/Nop.Db.sdf