add nginx config
merge master