temas menores
Merge branch 'master' of https://github.com/jesinor/SISNOB-XE4

Conflicts:
	Unidades/Conf/coneccion.ini
	Unidades/Conf/gridatos.ini