commit
Merge branch '1.4.0' of https://github.com/rustyswayne/Merchello into 1.4.0

Conflicts:
	Plugin/Taxation/Avalara/src/Merchello.Plugin.Taxation.Avalara/Properties/VersionInfo.cs