Merge branch 'feature/proxy-basic-auth' into 'master'

Basic auth for nginx proxy

See merge request !8