Merge remote-tracking branch 'origin/master'

Conflicts:
	NewVision/bin/NewVision.dll
	NewVision/bin/NewVision.pdb
	NewVision/css/SoftwareUnion.css
	NewVision/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NewVision/obj/Debug/NewVision.dll
	NewVision/obj/Debug/NewVision.pdb
	SoftUnion.v12.suo