Anadi un inicio de 2.5
Chars...
Merge branch 'dev' into diego

Conflicts:
	testing-gtk/guia/GuiaC++