start working
Merge remote-tracking branch 'origin/master'

Conflicts:

	ProductShop/ProductShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache