Merge branch '571_two_factors_auth' into 'master'

Two factor authentication

Closes #571

See merge request !396
2 jobs for master in 17 minutes and 56 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #213865
docker-build
build_linux_36

00:16:05

69.0%
 
  Deploy
passed #213866
docker
deploy_beta

00:01:50