Merged out conflicts

diff --cc root/js/relationship.js
index 8e9bed7,89ca5e8..c84b954
--- 1/root/js/relationship.js
--- 2/root/js/relationship.js
+++ b/root/js/relationship.js
@@@ -949,6 -925,11 +965,9 @@@ $(document).ready(function () 
    });
    
    
+   // Set up the relationship creation dialog. This also functions as the reading
+   // merge dialog where appropriate.
 -  var relation_buttonset = {
 -  };
+                         
    if( editable ) {
        $( "#dialog-form" ).dialog({
        autoOpen: false,