Merge remote-tracking branch 'upstream/master'

Conflicts:
	website/search.php

diff --cc lib/lib.php
Simple merge

diff --cc sql/functions.sql
Simple merge

diff --cc utils/setup.php
Simple merge

diff --cc utils/update.php
Simple merge

diff --cc website/reverse.php
index 134b5e4e84d76cdb8ba6d12243b62993d6e71027,ee6a6100c8a4da0e4c6addd6058b0c951f66ecf3..ed877899faa672aa0160539840bf3b9fc6afbda3
--- 1/website/reverse.php
--- 2/website/reverse.php
+++ b/website/reverse.php
@@@ -3,7 -3,21 +3,9 @@@
  
        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
+       require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+       require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
  
 -      if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
 -      {
 -              $fLoadAvg = getLoadAverage();
 -              if ($fLoadAvg > 2) sleep(60);
 -              if ($fLoadAvg > 4) sleep(120);
 -              if ($fLoadAvg > 6)
 -              {
 -                      echo "Bulk User: Temporary block due to high server load\n";
 -                      exit;
 -              }
 -      }
 -
        $oDB =& getDB();
        ini_set('memory_limit', '200M');