Resolve merge conflicts for upstream merge

tbl_select.php

@@ -14,7 +14,6 @@
  * Gets some core libraries
  */
 require_once './libraries/common.inc.php';
-require_once './libraries/relation.lib.php'; // foreign keys
 require_once './libraries/mysql_charsets.lib.php';
 
 $GLOBALS['js_include'][] = 'tbl_select.js';
@@ -326,7 +325,7 @@ $(function() {
 </form>
 <div id="searchresults"></div>
     <?php
-    require_once './libraries/footer.inc.php';
+    require './libraries/footer.inc.php';
 }