-
Merge branch 'master' of https://github.com/foulo005/viamarket

Conflicts:
	viamarket/ViaMarket.Tests/bin/Debug/ViaMarket.Tests.dll
	viamarket/ViaMarket.Tests/bin/Debug/ViaMarket.Tests.pdb
	viamarket/ViaMarket.Tests/bin/Debug/ViaMarket.dll
	viamarket/ViaMarket.Tests/bin/Debug/ViaMarket.pdb
	viamarket/ViaMarket.Tests/obj/Debug/ViaMarket.Tests.csproj.FileListAbsolute.txt
	viamarket/ViaMarket.Tests/obj/Debug/ViaMarket.Tests.csprojResolveAssemblyReference.cache
	viamarket/ViaMarket.Tests/obj/Debug/ViaMarket.Tests.dll
	viamarket/ViaMarket.Tests/obj/Debug/ViaMarket.Tests.pdb
	viamarket/viamarket.v12.suo
	viamarket/viamarket/bin/viamarket.dll
	viamarket/viamarket/bin/viamarket.pdb
	viamarket/viamarket/obj/Debug/ViaMarket.csprojResolveAssemblyReference.cache
	viamarket/viamarket/obj/Debug/ViaMarket.dll
	viamarket/viamarket/obj/Debug/ViaMarket.pdb
	viamarket/viamarket/obj/Debug/viamarket.csproj.FileListAbsolute.txt