Changes the way that the slatwall sync works.
Updated Version 3.1.20
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' of https://github.com/ten24/Slatwall.git into
develop

Conflicts:
	version.txt