forzando conflicto

Signed-off-by: Manuel Solorzano <manuel.solorzanoc@gmail.com>
Merge branch 'master' of https://github.com/a20012251/KendoDP2

Conflicts:
	KendoDP2/Areas/Organizacion/Controllers/PuestoController.cs