#M-291 Fixed.
Obsoletes CatalogFixedRateShippingApiController and replaces it with simpler FixedRateShippingApiController
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0

Conflicts:
	src/Merchello.Web/Editors/ShippingGatewayApiController.cs
Merge pull request #707 from rustyswayne/1.3.0

Obsoletes CatalogFixedRateShippingApiController and replaces it with simpler FixedRateShippingApiController