T0012 - Ajustes solicitados
Ajustes solicitados
Merge branch 'dev' of https://github.com/DavoHiper/Intranet into roberta-dev

Conflicts:
	template/js/interno/T0117/T0117.js