merge
manage.py
Revert "merge"

This reverts commit 76a5a6ec491f357b873c76c7d25bdbc5e0abf33a.
Revert "reset"

This reverts commit d200a53addd385873c0cf871953ab632e6b440dd.
manage
manage
merge
merge orign
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
debug
mas margin en allProduct