csproj, .cache rubbish
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lynicon.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache