Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index d4c16126f63680f2ea86ed9735f102d08e1304aa,f151b312e61ff7c5df62823c59022ab97c573cdd..c8a5752178cbdba0dd03e4d1d7f7c0053bb1270d
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -124,27 -124,6 +124,27 @@@ if (BUILD_IMPORTER
                    ${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
  #-----------------------------------------------------------------------------
@@@ -292,11 -271,12 +292,12 @@@ endif(
  install(FILES settings/env.defaults
                settings/address-levels.json
                settings/phrase-settings.json
-               settings/import-admin.style
-               settings/import-street.style
-               settings/import-address.style
-               settings/import-full.style
-               settings/import-extratags.style
+               settings/import-admin.lua
+               settings/import-street.lua
+               settings/import-address.lua
+               settings/import-full.lua
+               settings/import-extratags.lua
+               settings/flex-base.lua
                settings/icu_tokenizer.yaml
                settings/country_settings.yaml
          DESTINATION ${NOMINATIM_CONFIGDIR})