Fixed bug with adding fixed rate shipping provider on Shipping page.
Merge pull request #745 from cssquirrel/1.3.0

Fixed bug with adding fixed rate shipping provider on Shipping page.
Merge pull request #743 from koswesley/UPS-1.3.0

UPS Provider updated with caching and returns values from the provider
Merge pull request #747 from koswesley/ManualOrders-1.3.0

Manual orders 1.3.0
More work on warehouse catalog.
Merge pull request #748 from rustyswayne/1.3.0

More work on warehouse catalog.
Updated address functionality for the Customer section to account for the addressTypeIdKeys.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Extends WarehouseApiController to include Warehouse Catalog Operations.
Merge pull request #749 from rustyswayne/1.3.0

Extends WarehouseApiController to include Warehouse Catalog Operations.
Delete customer functionality on Customer View page, address edit and display functionality improved for customers, ability to load invoices on a customer's page.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Moves the CustomerAddress to constructor to public.
Merge pull request #751 from rustyswayne/1.3.0

Moves the CustomerAddress to constructor to public.
And so that it works - made CustomerAddress public too =)
Merge pull request #752 from rustyswayne/1.3.0

And so that it works - made CustomerAddress public too =)
initial template switching for content editing
Merge pull request #753 from protherj/template-switch

initial template switching for content editing
Merge pull request #750 from cssquirrel/1.3.0

Better addresses and customer delete functionality for Customer section.
Working on manual orders