substituindo projeto do visualstudio pelo modificado por mim em outra pasta
Merge branch 'master' of https://github.com/flaviusanderson/smartbox
Merge branch 'master' of https://github.com/flaviusanderson/smartbox
comitando projeto android
Merge
Merge branch 'master' of https://github.com/flaviusanderson/smartbox

Conflicts:
	SmartBoxWeb/MvcAdminTemplate/Models/Cliente.cs
	SmartBoxWeb/MvcAdminTemplate/SmartBoxWeb.csproj
	SmartBoxWeb/MvcAdminTemplate/bin/SmartBoxWeb.dll
	SmartBoxWeb/MvcAdminTemplate/bin/SmartBoxWeb.pdb
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/SmartBoxWeb.dll
	SmartBoxWeb/MvcAdminTemplate/obj/Debug/SmartBoxWeb.pdb