improved nginx config.
Merge branch 'test' into dev
build.