cambios mantis 157

Remover cajas de beneficios
Merged and fixed conflict with 157 branch
Merge branch 'master' into production