evaluaciones
Merge branch 'master' of https://github.com/a20012251/KendoDP2

Conflicts:
	KendoDP2/Areas/Evaluacion360/Views/ProcesoEvaluacion/Index.cshtml
	KendoDP2/Models/Helpers/SidebarNavigator.cs
Merge branch 'master' of https://github.com/a20012251/KendoDP2