changes for freeshipping with zones
Merge branch 'feature/freeshipping' into develop