Small location fix in web.config
Theme Inheritance (initial)
Merge branch '2.x' into feature/themeinheritance
Merge branch '2.x' into feature/themeinheritance
Theme inheritance (part 2)
Merge branch '2.x' into feature/themeinheritance

Conflicts:
	src/Presentation/SmartStore.Web.Framework/Controllers/PluginControllerBase.cs
	src/Presentation/SmartStore.Web/Themes/Alpha/Content/theme.less
	src/Presentation/SmartStore.Web/Web.config
Theme inheritcance (part 3)