.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
.
.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Several fixed rate API-related functions removed from shipping.controller.js, modifications made to the addeditmethod dialog to unify fixed & non-fixed shipping providers.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Major refactor of Shipping page. Removed most (possibly all) fixed rate specific api calls. Add/Edit shipping method dialog now working (mostly) with new combined API.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Settings > Shipping. Removed the old dual-track fixed/non-fixed rate regional rate adjustment dialog/controller and fixed up with the new, unified methods.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Removed more old functions referring to the fixed shipping vs non-fixed shipping in Shipping controller.
Fixed up saving rate tables. Problems saving methods when editing existing methods.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Fixed $scope.removeMethodFromProvider() function in shipping.controller.js to permit Settings >Shipping page's Delete Method function to work properly with the new unified fixed/not-fixed shipping API methods.
Merge pull request #713 from cssquirrel/1.3.0

Setting > Shipping Page Refactor, combined fixed/non-fixed methods into single calls
Merchello Issue M-295 broken drop down list bug
#M-298 {In Testing}
Merge pull request #718 from rustyswayne/1.3.0

#M-298 {In Testing}