Web dir fix
Merge remote-tracking branch 'origin/master'
NGINX conf
Merge remote-tracking branch 'origin/master'