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

Conflicts:
	SmartBoxWeb/MvcAdminTemplate/bin/SmartBoxWeb.dll
	SmartBoxWeb/MvcAdminTemplate/bin/SmartBoxWeb.pdb
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/SmartBoxWeb.csprojResolveAssemblyReference.cache
	SmartBoxWeb/WebService/WebService.csproj
	SmartBoxWeb/WebService/WebService.csproj.user
	SmartBoxWeb/WebService/bin/SmartBoxWeb.dll
	SmartBoxWeb/WebService/bin/SmartBoxWeb.pdb
	SmartBoxWeb/WebService/bin/WebService.dll
	SmartBoxWeb/WebService/bin/WebService.pdb
	SmartBoxWeb/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SmartBoxWeb/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt
	SmartBoxWeb/WebService/obj/Debug/WebService.csprojResolveAssemblyReference.cache
	SmartBoxWeb/WebService/obj/Debug/WebService.dll
	SmartBoxWeb/WebService/obj/Debug/WebService.pdb
comit assemblyReference
Merge branch 'master' of https://github.com/flaviusanderson/smartbox

Conflicts:
	SmartBoxWeb/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Listagem de

Supermercao - Categoria - SubCategoria - Produto