Merge pull request #616 from rustyswayne/master

Cleanup
PatternReplaceFormatter
Updated IPatternReplaceFormatter interface
Formatter
Merge pull request #638 from rustyswayne/1.1.1

More work on the PatternReplaceFormatter
Unsaved file
Merge pull request #639 from rustyswayne/1.1.1

Unsaved file
Updated Umbraco Dependencies to 7.1.4 release
Merge pull request #640 from rustyswayne/1.1.1

Updated Umbraco Dependencies to 7.1.4 release
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 commit 'fetch_head' into RosettaSTone
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