fix merge

10 files changed, 11 insertions, 11 deletions

diff --git a/site/public/test/chart/index.html b/site/public/test/chart/index.html
index 33fafb48..e3134df9 100644
--- a/site/public/test/chart/index.html
+++ b/site/public/test/chart/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/citations/index.html b/site/public/test/citations/index.html
index a5fbcc76..3c630adc 100644
--- a/site/public/test/citations/index.html
+++ b/site/public/test/citations/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html
index d3ca0953..f1204c90 100644
--- a/site/public/test/csv/index.html
+++ b/site/public/test/csv/index.html
@@ -50,14 +50,14 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
     
   <section><h1>CSV Test</h1>
 <h3><a href="/test/">&larr; Back to test index</a></h3>
-</section><section class='applet_container'><div class='applet' data-payload='{"command": "load_file /site/test/assets/test.csv", "fields": ["Name, Images, Year, Gender, Description, URL"]}'></div></section>
+</section><section class='applet_container'><div class='applet' data-payload='{"command": "load_file /site/test/assets/test.csv", "fields": ["Headings: Name, Images, Year, Gender, Description, URL"]}'></div></section>
 
   </div>
   <footer>
diff --git a/site/public/test/datasets/index.html b/site/public/test/datasets/index.html
index 136fbd60..fccc5367 100644
--- a/site/public/test/datasets/index.html
+++ b/site/public/test/datasets/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/face_search/index.html b/site/public/test/face_search/index.html
index 3545bb00..52279498 100644
--- a/site/public/test/face_search/index.html
+++ b/site/public/test/face_search/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/gallery/index.html b/site/public/test/gallery/index.html
index b1061867..79adb78e 100644
--- a/site/public/test/gallery/index.html
+++ b/site/public/test/gallery/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/index.html b/site/public/test/index.html
index 626f1f0f..81e805ef 100644
--- a/site/public/test/index.html
+++ b/site/public/test/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/map/index.html b/site/public/test/map/index.html
index 6cba3b6f..4b4f2a4b 100644
--- a/site/public/test/map/index.html
+++ b/site/public/test/map/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/name_search/index.html b/site/public/test/name_search/index.html
index 1be553a5..50fc4a1b 100644
--- a/site/public/test/name_search/index.html
+++ b/site/public/test/name_search/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">
diff --git a/site/public/test/pie_chart/index.html b/site/public/test/pie_chart/index.html
index 6b13aad6..4ba67b78 100644
--- a/site/public/test/pie_chart/index.html
+++ b/site/public/test/pie_chart/index.html
@@ -50,7 +50,7 @@
     <div class='links'>
       <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/news">News</a>
+      <a href="/research">Research</a>
     </div>
   </header>
   <div class="content content-">