Merge branch '508_password_reset' into 'master'

Implement password reset

Closes #508

See merge request !281
2 jobs for master in 16 minutes and 46 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Build
passed #160319
docker-build
build_linux_36

00:14:57

66.0%
 
  Deploy
passed #160320
docker
deploy_beta

00:01:49