Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
index 7c5763fd47b678f03f7ac7f998c04c6b394c8023,7d401ade35a5427ad38a06adc98dc0d75c46a17b..8f9de5ec711b1a0c2d5cbf1058858d49415e9801
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -103,15 -102,9 +102,20 @@@ set(WEBSITESCRIPT
      website/reverse.php
      website/search.php
      website/status.php
-     website/403.html
-     website/509.html
-     website/crossdomain.xml
-     website/favicon.ico
-     website/last_update.php
-     website/nominatim.xml
-     website/robots.txt
-     website/taginfo.json
-     utils/blocks.php
+ )
+ 
++set(WEBSITEFILES
++    403.html
++    509.html
++    crossdomain.xml
++    favicon.ico
++    last_update.php
++    nominatim.xml
++    robots.txt
++    taginfo.json
++)
++
+ set(CUSTOMSCRIPTS
      utils/country_languages.php
      utils/importWikipedia.php
      utils/export.php
@@@ -123,11 -115,18 +126,23 @@@
      utils/warm.php
     )
  
- foreach (cfile ${CUSTOMFILES})
-     configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+ foreach (script_source ${CUSTOMSCRIPTS})
+     configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
+                    ${PROJECT_BINARY_DIR}/${script_source})
  endforeach()
  
- configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+ foreach (script_source ${WEBSITESCRIPTS})
+     configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
+                    ${PROJECT_BINARY_DIR}/${script_source})
+ endforeach()
+ 
++foreach (webfile ${WEBSITEFILES})
++    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
++                   ${PROJECT_BINARY_DIR}/website/${webfile})
++endforeach()
++
+ configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+                ${PROJECT_BINARY_DIR}/settings/settings.php)
  
  set(WEBPATHS css images js)
  

diff --cc lib/lib.php
Simple merge

diff --cc utils/update.php
index a5170ae590dd9f3cc20606021237cc0a314600b4,24095ef48f3855590d3e5cd3748d14746901df36..05c43946e2d1282c48c1613fe67390399fb7874e
mode 100755,100644..100644
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php

diff --cc website/reverse.php
index 075d4cf032c7678e8b643935b14c95293db67a27,0ba1771474512b7255a2e0cc1e640421786552ec..6864d65e84340b71e2451793f4bca81764a2014d
mode 100755,100644..100644
--- 1/website/reverse.php
--- 2/website/reverse.php
+++ b/website/reverse.php