Code comments
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Housekeeping
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge pull request #686 from cssquirrel/1.3.0

Shipping changes for catalogs.
Code comments.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Code cleanup and documentation
More code comments
Merge pull request #687 from rustyswayne/1.3.0

Lots of code comments and file formatting
Attempted to fix localization issue #M-281.
Added new views for product edit, product variant edit, product variant create.  Renamed ProductEdit to ProductEditWithOptions.  This completes the refactor to directives and the simplification of the product / variant edit / create process
Merge pull request #688 from protherj/variant-create

Added new views for product edit, product variant edit, product variant ...
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
initial version of the product editor for content.  Works on save, not create.
Merge pull request #689 from protherj/content-prop-editor

initial version of the product editor for content.  Works on save, not c...
Commenting .Web code
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge pull request #690 from rustyswayne/1.3.0

Commenting .Web code
fixed issue with property picker not saving after selecting product