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

Conflicts:
	KendoDP2/Areas/Organizacion/Models/Colaborador.cs
	KendoDP2/Areas/Organizacion/Views/Intranet/Index.cshtml
Merge branch 'master' of https://github.com/a20012251/KendoDP2
Funciones sin peso y mas seeds
Eliminando la Clase FUNCIONXPUESTO ya que no sirve
Merge branch 'master' of https://github.com/a20012251/KendoDP2

Conflicts:
	KendoDP2/Areas/Organizacion/Models/DP2Context.cs
Merge branch 'master' of https://github.com/a20012251/KendoDP2