Make sure a person document is not created if e-mail is already in use. Fixes #320
Fixed infinite scroll. It seems there was a bad merge. Fixes #326
Merge branch 'master' into new-annotations-editor