Merge pull request #582 from koswesley/ShippingProvider

Shipping provider
Reorders Settings tree.
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
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Started Notification Provider list in Back Office UI.
Notifications pane & other styles
Merge pull request #584 from naepalm/1.1.0

Notifications pane & other styles
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Merge branch '1.1.0' of https://github.com/rustyswayne/Merchello into 1.1.0
Merge commit 'fetch_head' into ShippingProvider
Initial work on Migrations for upgrades.
Merge pull request #586 from rustyswayne/1.1.0

Initial work on Migrations and starts to Notifications Settings Tree
Merge commit 'fetch_head' into ShippingProvider
Shipping Methods