hopefully this fixes upload encoding stuff for shipments
Fixed merge conflicts
Merge pull request #163 from unepwcmc/shipments_upload

hopefully this fixes upload encoding stuff for shipments