Merge branch 'dev' into 'prod'

.gitignore

.idea/magento-uafrica-shipping-extension.iml

.idea/php.xml

Block/System/Config/Form/Field/Version.php

Helper/Data.php

Model/Carrier/AdditionalInfo.php

Model/Carrier/BobGo.php

Model/Carrier/Company.php

Model/Carrier/uData.php

Model/Carrier/uSub.php

Model/Carrier/uSubs.php

Model/Source/Dropoff.php

Model/Source/Freemethod.php

Model/Source/Generic.php

Model/Source/Method.php

Model/Source/Packaging.php

Model/Source/Unitofmeasure.php

Observer/SaveOrderBeforeSalesModelQuote.php

Plugin/Block/DataProviders/Tracking/ChangeTitle.php

Plugin/Block/Tracking/PopUpDeliveryDate.php