not sure
Merge remote-tracking branch 'origin/master'

Conflicts:

	MVCProject/MVCProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache