update nginx config
Merge branch 'develop'