merge from upstream
Revert "Se agrega logica de backend"

This reverts commit 9727e2d32f820fffdc5b7c5369f6a906b2a83bd4.
Revert "Revert "Se agrega logica de backend""

This reverts commit 34baef9200005a9ecb5197ad127fa74540aa5d5c.
Merge remote-tracking branch 'upstream/master'
Merge origin/master
Merge origin/shoppingcart2revenge
multitenant
Corrige errores en parte de multitenant
Merge pull request #58 from rolandoamarillo/master

Correcciones