Merge remote-tracking branch 'origin/master'

Conflicts:
	ARCCProposal.Tests/bin/Debug/ARCCProposal.Tests.dll
	ARCCProposal.Tests/bin/Debug/ARCCProposal.Tests.pdb
	ARCCProposal.Tests/bin/Debug/ARCCProposal.dll
	ARCCProposal.Tests/bin/Debug/ARCCProposal.pdb

	ARCCProposal.Tests/obj/Debug/ARCCProposal.Tests.csproj.FileListAbsolute.txt

	ARCCProposal.Tests/obj/Debug/ARCCProposal.Tests.csprojResolveAssemblyReference.cache