Signed-off-by: Francisco Sarmiento <fsarmiento@pucp.pe>
Merge branch 'master' of https://github.com/a20012251/KendoDP2.git

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

Signed-off-by: Francisco Sarmiento <fsarmiento@pucp.pe>