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

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