Organize the webserver config files
Move some fixed strings to the locales and update the locales from Gengo
Merge remote-tracking branch 'upstream/master'