Fixes bug with custom file attributes
Updated Version 3.5.021
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature
Updated Version 3.5.021.022
Changed UI for "Related Object Select" custom attribute
Clean Up
Fixes task customURL bug
Updated Version 3.5.022
Merge branch 'master' into develop

Conflicts:
	model/entity/Attribute.cfc
	model/entity/Task.cfc
	org/Hibachi/HibachiTags/HibachiFieldDisplay.cfm
	version.txt
Merge branch 'feature' of https://github.com/ten24/Slatwall.git into feature
Merge branch 'develop' into feature