Nova Atualização
Merge https://github.com/flaviusanderson/smartbox

Conflicts:
	SmartBoxWeb/MvcAdminTemplate/Models/Produto.cs
	SmartBoxWeb/MvcAdminTemplate/bin/SmartBoxWeb.dll
	SmartBoxWeb/MvcAdminTemplate/bin/SmartBoxWeb.pdb
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/SmartBoxWeb.csproj.FileListAbsolute.txt
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/SmartBoxWeb.csprojResolveAssemblyReference.cache
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/SmartBoxWeb.dll
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/SmartBoxWeb.pdb
	SmartBoxWeb/SmartBoxWeb.v11.suo
Resolvendo problema de merge!

model>produto