AppAdmin
App
Merge branch 'master' of https://github.com/IsidroAguilar/AplicacionEmpresarialFinal

Conflicts:
	AdministracionForms/AdministracionForms.csproj
	Cliente/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	FinalAppEmpresarial.v12.suo
	packages/Microsoft.AspNet.WebApi.HelpPage.5.0.0/content/Areas/HelpPage/ApiDescriptionExtensions.cs.pp
	packages/Microsoft.AspNet.WebApi.HelpPage.5.0.0/content/Areas/HelpPage/SampleGeneration/SampleDirection.cs.pp
	packages/Microsoft.AspNet.WebApi.HelpPage.5.0.0/content/Areas/HelpPage/SampleGeneration/TextSample.cs.pp
	packages/Microsoft.AspNet.WebApi.HelpPage.5.0.0/content/Areas/HelpPage/Views/Help/DisplayTemplates/ApiGroup.cshtml.pp
	packages/Microsoft.AspNet.WebApi.HelpPage.5.0.0/content/Areas/HelpPage/Views/Help/DisplayTemplates/InvalidSample.cshtml.pp