Avance con 3.5 y 3.7
Merge branch 'ken' of https://github.com/degva/GKD-client-side into ken

Conflicts:
	testing-gtk/guia/GuiaC++