hasil desain
Merge branch 'master' of https://github.com/dokuku/EToko

Conflicts:
	EToko.Web/Views/Home/Index.cshtml
	EToko.Web/Views/Shared/_Layout.cshtml
	EToko.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EToko.Web/obj/Debug/EToko.Web.csprojResolveAssemblyReference.cache
	EToko.v11.suo