Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index fdc67ffe86c6c393aa77c74abed0b0c3f319f24b,1c6336a4c8c23c303d47851361ebfe0e434158f4..40140056a1d99e9355ae1e9656bf70ee1523e782
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -114,7 -114,6 +114,6 @@@ if (BUILD_IMPORTER
         export.php
         query.php
         setup.php
-        specialphrases.php
         update.php
         warm.php
        )
@@@ -128,27 -127,6 +127,27 @@@
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Targets for running a development webserver from the build directory.
 +#-----------------------------------------------------------------------------
 +
 +if (BUILD_API)
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +endif()
 +
  #-----------------------------------------------------------------------------
  # Tests
  #-----------------------------------------------------------------------------
@@@ -280,7 -258,7 +279,7 @@@ endif(
  
  install(FILES settings/env.defaults
                settings/address-levels.json
-               settings/phrase_settings.php
+               settings/phrase-settings.json
                settings/import-admin.style
                settings/import-street.style
                settings/import-address.style