working on shipment history
Merge commit 'fetch_head' into 1.1.0
UPS Shipping Provider Commit, unfinished
Merge pull request #576 from koswesley/ShippingProvider

UPS Shipping Provider Commit, unfinished
ups tweaks
Merge pull request #577 from protherj/ship-prov-fixes

UPS Ship provider fixes for nuget
initial version of shipping history on order view
Merge pull request #578 from bowserm/1.1.0M224

1.1.0 m224
tweaks and debug dialog directive attempt
Merge pull request #579 from protherj/demo-sprint-10

Demo sprint 10
finished debug directive
Merge pull request #580 from protherj/debug-directive

Debug directive
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Merge pull request #581 from rustyswayne/1.1.0

Resolver refactoring
Saving UPS Shipping settings works
Merge pull request #582 from koswesley/ShippingProvider

Shipping provider
Style updates
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0

Conflicts:
	Plugin/Shipping/UPS/src/Merchello.Plugin.Shipping.UPS/App_Plugins/Merchello.UPS/editor.html
	src/Merchello.Core/Properties/AssemblyInfo.cs
	src/Merchello.Web/Properties/AssemblyInfo.cs
Merge pull request #583 from naepalm/1.1.0

Style updates