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

Conflicts:
	EToko.Web/Content/Site.css
	EToko.Web/Controllers/BenefitController.cs
	EToko.Web/Controllers/FeatureController.cs
	EToko.Web/Controllers/PackageAndPricingController.cs
	EToko.Web/Controllers/TestimonialController.cs
	EToko.Web/EToko.Web.csproj
	EToko.Web/Models/ETokoDBContext.cs
	EToko.Web/Views/Feature/Create.cshtml
	EToko.Web/Views/Feature/Index.cshtml
	EToko.Web/Views/PackageAndPricing/Index.cshtml
	EToko.Web/Views/Shared/_LayoutAdmin.cshtml
	EToko.Web/Views/Shared/_LoginPartial.cshtml
	EToko.Web/Views/Testimonial/Index.cshtml
	EToko.Web/bin/EToko.Web.dll
	EToko.Web/bin/EToko.Web.pdb
	EToko.Web/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	EToko.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EToko.Web/obj/Debug/EToko.Web.csprojResolveAssemblyReference.cache
	EToko.Web/obj/Debug/EToko.Web.dll
	EToko.Web/obj/Debug/EToko.Web.pdb
	EToko.v11.suo
Merge branch 'master' of https://github.com/dokuku/EToko