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
Updated Merchello to patch version 1.3.5
Updates FedEx Shipping Package with latest version of Merchello
AvaTax provider patches.
Maintenance routines
Bumps Merchello Dev. Version to 1.3.6
Merge pull request #794 from rustyswayne/1.4.0

Bumps Merchello Dev. Version to 1.3.6