Modified the Add/Edit Method functionality to occur inside the dialog's controller, instead of inside the Shipping page's controller.
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
Going home
missed file
Merge branch '1.3.0' of https://github.com/rustyswayne/Merchello into 1.3.0
commiting attempts to block the events
Merge pull request #703 from protherj/prop-editor-templates

commiting attempts to block the events
Continues to refactor Customer / AnonymousCustomer with the ultimate aim of getting both to sub class a single CustomerBase class off ICustomerBase.  The entity key on Customer is still a bit buggy.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge pull request #704 from rustyswayne/1.3.0

Adds internals to AnonymousCustomerService and continues persisted customer implementaion
Fixed minor Angular bug on having the Shipping Country comment outside of the div in the include view.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Refactors AnonymousCustomer and Customer to use the same base class (CustomerBase) and gets rid of the EntityKey field on both objects.
Merge pull request #705 from rustyswayne/1.3.0

Refactors AnonymousCustomer and Customer to use the same base class (CustomerBase) and gets rid of the EntityKey field on both objects.
API controller change for shipping.
#M-291 Fixed.
Obsoletes CatalogFixedRateShippingApiController and replaces it with simpler FixedRateShippingApiController