updated proxy_read_timeout for nginx
Merge branch 'dev' into production