Don't throw errors if we can't find the current or original user
Support for linking user accounts when the email addresses don't directly match
Force choosing a school if a user uses oauth, has an account, but not a school
Fixed "investigations" typo
minor improvement to handle naming conflicts
Merge branch 'itsisu-dev' into itsisu-staging