Fixed the google account activation interface for users who have opted out in the past, or attempted to opt-in, and creation failed.
Merge branch 'develop' of https://github.com/EntradaProject/entrada-1x into develop

# By Matt Simpson (3) and others
# Via Ryan Warner
* 'develop' of https://github.com/EntradaProject/entrada-1x:
  Updates file browser to use move_uploaded_file, removes mime type check, updates styling of browser
  #525 Added the ability to manage Assessment Characteristics from within the System Settings module on a per-organization basis.
  Minor css change to table heading cell padding.
  #524 Fixed spelling of Assessment.
  Fixes CKEditor default toolbar
  Ref #522, fixes truncated mime types in community shares file versions.