My account edit updates
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
Closes #1628 & #1635
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3