Fixing nginx issues
I am a pedantic, petty person; but I prefer web to public
Merge branch 'refs/heads/master' into develop