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

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