Partial implementation of Warehouse Catalog section of shipping page.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Finishing up shipping controller stuff.
Merge pull request #686 from cssquirrel/1.3.0

Shipping changes for catalogs.