Merge pending pull-requests concerning sites.json

Hi, I merged most pull-requests changing sites.json into my branch pull-requests.

Pulling from this branch should close all issues related to the included patches, automatically.