nginx_conf and deploy
deploy nginx config  with script
Merge branch 'master' from server