Update setup-server.rst
Merge branch 'master', remote-tracking branch 'origin' into file_browser_improvement