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 '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
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.
Merge remote-tracking branch 'merchello/1.1.1' into 1.1.1
Merge pull request #648 from rustyswayne/1.1.1

Prep to close 1.1.1
Merge branch '1.1.1' into 1.2.0

Conflicts:
	src/Merchello.Web.UI/App_Plugins/Merchello/Config/Merchello.config
	src/Merchello.Web.UI/App_Plugins/Merchello/Package.manifest
Merge pull request #649 from rustyswayne/1.2.0

Merge 1.1.1 into 1.2.0 - to discontinue 1.1.1