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