Merge pull request #28 from priyankarani/develop

Integration with trytond_shipping
Explicitly specify uom for weight calculation
Merge pull request #31 from tarunbhardwaj/develop

Explicitly specify uom for weight calculation
Release version 3.2.1.0
Merge branch 'release/3.2.1.0' into develop
Provision to restrict allowed ups services for a sale #6104
Fix for travis secure keys
Merge pull request #35 from tarunbhardwaj/develop

Provision to restrict allowed ups services for a sale #6104
Release 3.2.1.1
Merge branch 'release/3.2.1.1' into develop
Move label generation to trytond shipping #6059