static files and settings updateD
correct site_root in settings merge