Test QA 01
Arreglos en notificaciones
Merge branch 'master-qa' into cdominguez
Merge branch 'cdominguez' into master-qa