Fix merge conflicts. run grunt dev and grunt.

www/src/jsonextractor.js

@@ -104,4 +104,4 @@ JsonExtractor.prototype.getResourceType = function (data) {
         }
     }
     return null;
-};
\ No newline at end of file
+};

www/src/metadataTableHelper.js

@@ -11,9 +11,9 @@ function proposalBeamLineTable(chunk, context, bodies, params) {
   chunk.write('</thead>');
   chunk.write('<tbody>');
 
-  for (let index = 0; index < proposals.length; index++) {
-    const proposal = proposals[index];
-    const beamline = beamlines[index];
+  for (var index = 0; index < proposals.length; index++) {
+    var proposal = proposals[index];
+    var beamline = beamlines[index];
 
     chunk.write('<tr>');
     chunk.write('<td>' + proposals[index] + '</td>');