Make fields editable in UserModel//BeforeSave
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2