default environment fix
nginx config 404 fix
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  nginx config 404 fix
  default environment fix