NCG           CandidatoController
Merge branch 'master' of https://github.com/MijailStell/testvirtual

Conflicts:
	Source/Presentation Layer/Encuesta.Web/App_GlobalResources/Persona.designer.cs
	Source/Presentation Layer/Encuesta.Web/Views/Candidato/Edit.cshtml