Merge branch 'password_reset_email_change' into 'develop'

Added mail related env vars to docker-compose.yml

See merge request !80
3 jobs for develop in 1 minute and 16 seconds (queued for 4 seconds)