Update settings.php
Merge pull request #1 from julienmalik/patch-1

Update settings.php
Update nginx.conf
Update nginx.conf
Update nginx.conf
Merge pull request #2 from julienmalik/patch-2

Update nginx.conf