Project files
Merge remote-tracking branch 'origin/master'

Conflicts:
	CALVRI/CALVRI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache