Merge branch 'master' of github.com:twain47/Nominatim

diff --cc sql/functions.sql
Simple merge

diff --cc sql/tables.sql
index fd01663eda1f096a0bce7879347d8e94d4c8722b,ff9c1c50fa515a0b7ee5ad76f9dc1555a0de070b..48740f232963b03da072233e75e29fefd01ca8e1
--- 1/sql/tables.sql
--- 2/sql/tables.sql
+++ b/sql/tables.sql
@@@ -210,10 -199,8 +199,9 @@@ CREATE TABLE placex 
    importance FLOAT,
    indexed_status INTEGER,
    indexed_date TIMESTAMP,
 +  wikipedia TEXT, -- calculated wikipedia article name (language:title)
    geometry_sector INTEGER
    );
- SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2);
  SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
  CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);
  CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id);

diff --cc utils/setup.php
Simple merge