licencex
Merge branch 'master' of https://github.com/cadore/SysGrupo

Conflicts:
	SysNorteGrupo/Properties/licenses.licx