Merge branch 'master-qa' into jpatonni

Conflicts:
	modules/compartido/menu.html