Merge branch 'Develop' of https://github.com/aipiJuancho/TDG_SICACI into Develop

Conflicts:
	TDG_SICACI/TDG_SICACI.csproj
Merge branch 'Develop' of https://aipiJuancho@github.com/aipiJuancho/TDG_SICACI.git