Merge remote-tracking branch 'origin/master'

Conflicts:
	NewVision/bin/NewVision.dll
	NewVision/bin/NewVision.pdb
	NewVision/css/SoftwareUnion.css
	NewVision/index.html
	NewVision/obj/Debug/NewVision.dll
	NewVision/obj/Debug/NewVision.pdb
	SoftUnion.v12.suo
	SoftUnionApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SoftUnionApp/obj/Debug/SoftUnionApp.csproj.FileListAbsolute.txt

	SoftUnionApp/obj/Debug/SoftUnionApp.csprojResolveAssemblyReference.cache