update shipments
remove underscore from urls
Merge branch 'master' of github.com:eduardolujan/Vildosola
changes
changes
changes