finaizado cropping
Merge branch 'crop' into develop