Closes Issue #1389. Also fixed options where a unique validation is done
on optionCode
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3