Merge branch 'master' of https://github.com/flaviusanderson/smartbox

Conflicts:
	SmartBoxWebService/SmartBoxWebService/bin/SmartBoxWebService.dll
	SmartBoxWebService/SmartBoxWebService/bin/SmartBoxWebService.pdb
	SmartBoxWebService/SmartBoxWebService/obj/Debug/SmartBoxWebService.csproj.FileListAbsolute.txt
	SmartBoxWebService/SmartBoxWebService/obj/Debug/SmartBoxWebService.dll
	SmartBoxWebService/SmartBoxWebService/obj/Debug/SmartBoxWebService.pdb
Merge branch 'master' of https://github.com/flaviusanderson/smartbox

Conflicts:
	SmartBoxWebService/SmartBoxWebService/DAO/PedidoDAO.cs
	SmartBoxWebService/SmartBoxWebService/Service1.asmx.cs
	SmartBoxWebService/SmartBoxWebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache