fix nginx conf
Merge remote-tracking branch 'origin/bulgaria' into bulgaria