Merge remote-tracking branch 'origin/master'

Conflicts:
	resource/Gstdialog.rc
Recursos
Grid
Grid
Merge branch 'master' of https://github.com/manuelcalerosolis/Gestool