Merge branch 'user-edit' into 'master'

Add the ability to set user password and email

Closes #69 (closed)

See merge request !92 (merged)

(cherry picked from commit 747dc65e)

9395cc78 Add the Security Settings modal for setting the user's email and password