Merge branch 'master-qa' into jpatonni
Merge branch 'master-qa' into jpatonni
Merge branch 'master-qa' into jpatonni
Arreglos ortográficos y de redacción
Merge branch 'master-qa' into jpatonni

Conflicts:
	modules/compartido/menu.html
Corrección de errores ortográficos
Merge branch 'master-qa' into jpatonni

Conflicts:
	modules/compartido/menu.html
Merge branch 'jpatonni' into master-qa