change the controller to baseController
Merge branch 'Develop' of https://github.com/aipiJuancho/TDG_SICACI into Develop
Merge branch 'Develop' of https://github.com/aipiJuancho/TDG_SICACI into Nelson2
agregando las demas opciones de pregunta
Merge branch 'Develop' of https://github.com/aipiJuancho/TDG_SICACI into Nelson2

Conflicts:
	TDG_SICACI/TDG_SICACI.csproj