2 commit
3 merge
Merge remote-tracking branch 'origin/master' into old

Conflicts:
	Presentation/Nop.Web/license.txt