Merge pull request #616 from rustyswayne/master

Cleanup
Updated merchello.config in package directory
Removed shipping address constraint on ReadyToInvoice()
Merge branch '1.1.1' of https://github.com/rustyswayne/Merchello into 1.1.1
Merge remote-tracking branch 'upstream/1.1.1' into pre-cg-fixes
Merge pull request #642 from koswesley/Localization

Localization
fixed issue with deleting options on ProductList page
Merge pull request #643 from protherj/pre-cg-fixes

Pre cg fixes
Merge remote-tracking branch 'merchello/master' into 1.1.1
Merge branch '1.1.1' of https://github.com/rustyswayne/Merchello into 1.1.1
Adds email to shipment
ProductRepository patch and added method to save PaymentMethod to SalePreparation
Merge branch '1.1.1' of https://github.com/rustyswayne/Merchello into 1.1.1
product fixes
Merge pull request #645 from protherj/pre-cg-fixes

Fixed catalog issues
Updates to Monitor and PatterReplaceFormatter
Merge pull request #646 from rustyswayne/1.1.1

Added some API methods
fix to bad url for gateway providers page for notification editors.
PatternReplaceFormatter tests
Merge pull request #647 from cssquirrel/1.1.1

Fix for a bad url for gateway providers page for notification editors.