From c37a46537d6a5c83e83c3623033d140bf0310ffb Mon Sep 17 00:00:00 2001
From: Andrew Woods <awoods@duraspace.org>
Date: Tue, 18 Sep 2018 17:13:56 -0400
Subject: [PATCH 01/24] Remove embedded Solr

Related to: https://jira.duraspace.org/browse/VIVO-1592
---
 .gitignore                                    |   3 +-
 installer/pom.xml                             |   7 -
 installer/solr/pom.xml                        | 140 ------------------
 .../main/webResources/META-INF/context.xml    |   9 --
 .../WEB-INF/classes/log4j.properties          |  13 --
 5 files changed, 2 insertions(+), 170 deletions(-)
 delete mode 100644 installer/solr/pom.xml
 delete mode 100644 installer/solr/src/main/webResources/META-INF/context.xml
 delete mode 100644 installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties

diff --git a/.gitignore b/.gitignore
index 08b9a4b199..425a6cfbcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /build.properties
 /runtime.properties
 /ontology/public/catalog-v0001.xml
+settings.xml
 
 rdf/auth/firsttime/test-user-model.owl
 utilities/solrtester/.work
@@ -11,8 +12,8 @@ utilities/rdbmigration/.work
 **/.idea
 **/*.iml
 **/target
-
 **/overlays
+*~
 
 # Eclipse artifacts
 **/.settings
diff --git a/installer/pom.xml b/installer/pom.xml
index 2279970483..24e4226985 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -105,18 +105,11 @@
 
     <modules>
         <module>home</module>
-        <module>solr</module>
         <module>webapp</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.vivoweb</groupId>
-                <artifactId>vitro-solr</artifactId>
-                <version>${vitro-version}</version>
-                <type>war</type>
-            </dependency>
             <dependency>
                 <groupId>org.vivoweb</groupId>
                 <artifactId>vivo-home</artifactId>
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
deleted file mode 100644
index 061768e4e5..0000000000
--- a/installer/solr/pom.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.vivoweb</groupId>
-    <artifactId>vivo-installer-solr</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
-    <packaging>war</packaging>
-
-    <parent>
-        <groupId>org.vivoweb</groupId>
-        <artifactId>vivo-installer</artifactId>
-        <version>1.11.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <name>VIVO Install Solr App</name>
-
-    <profiles>
-        <profile>
-            <id>package</id>
-            <activation>
-                <property><name>app-name</name></property>
-            </activation>
-            <build>
-                <finalName>${app-name}solr</finalName>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <addClasspath>true</addClasspath>
-                                </manifest>
-                            </archive>
-                            <archiveClasses>false</archiveClasses>
-                            <overlays>
-                                <overlay>
-                                    <groupId>org.vivoweb</groupId>
-                                    <artifactId>vitro-solr</artifactId>
-                                    <type>war</type>
-                                </overlay>
-                            </overlays>
-                            <webResources>
-                                <resource>
-                                    <directory>src/main/webResources</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </webResources>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>pinstall</id>
-            <activation>
-                <property><name>tomcat-dir</name></property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>remove-webapp</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <tasks>
-                                        <delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
-                                    </tasks>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>${project.artifactId}</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>war</type>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${tomcat-dir}/webapps/${project.build.finalName}</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>overlays</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.vivoweb</groupId>
-            <artifactId>vitro-solr</artifactId>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml
deleted file mode 100644
index 51e4c1b846..0000000000
--- a/installer/solr/src/main/webResources/META-INF/context.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Context crossContext="true" override="true">
-   <Environment
-        type="java.lang.String" 
-        name="solr/home"  
-        value="${vivo-dir}/solr" override="true"/>
-
-   <!-- Disable persist sessions on shut down.-->
-   <Manager pathname="" />
-</Context>
diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
deleted file mode 100644
index 89f1b4378f..0000000000
--- a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
-log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log
-log4j.appender.AllAppender.MaxFileSize=10MB 
-log4j.appender.AllAppender.MaxBackupIndex=10 
-log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout 
-log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
-
-log4j.rootLogger=INFO, AllAppender 
-
-# Make all of the Solr classes quieter...
-log4j.logger.org.apache.solr.level = WARNING
-# ...except for this one.
-log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO

From c332e3eacf144589650f0529e17d482ab76213ba Mon Sep 17 00:00:00 2001
From: Andrew Woods <awoods@duraspace.org>
Date: Wed, 26 Sep 2018 16:38:32 -0400
Subject: [PATCH 02/24] Update default startup_listeners.txt for ElasticSearch

Related to: https://jira.duraspace.org/browse/VIVO-1600
---
 .gitignore                                                    | 1 +
 .../src/main/webapp/WEB-INF/resources/startup_listeners.txt   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 08b9a4b199..bcbfb1b7de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ utilities/rdbmigration/.work
 **/target
 
 **/overlays
+*~
 
 # Eclipse artifacts
 **/.settings
diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
index e7bdfa8864..47dd56595d 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -86,7 +86,7 @@ edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
 
 edu.cornell.mannlib.vivo.orcid.OrcidContextSetup
 
-# This should be near the end, because it will issue a warning if the connection to Solr times out.
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
+# This should be near the end, because it will issue a warning if the connection to Solr or ElasticSearch times out.
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest
 
 org.vivoweb.webapp.startup.i18nSetup

From 87c98fd6fb6830fbae127c849c19aaff0dd7d2f6 Mon Sep 17 00:00:00 2001
From: Don Elsborg <delsborg@users.noreply.github.com>
Date: Tue, 8 Jan 2019 07:48:32 -0700
Subject: [PATCH 03/24] [VIVO-1619] Create weblinks for data properties that
 have a range of  anyURI and begin with http (#94)

Related to: https://jira.duraspace.org/browse/VIVO-1619

* weblinks for dataprops of range URI
* addressed issues identified by Benjamin and Graham
* dependent on Vitro Pull 101
---
 .../individual/propStatement-dataDefault.ftl  | 108 ------------------
 1 file changed, 108 deletions(-)
 delete mode 100644 webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl

diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl
deleted file mode 100644
index 9806cb2865..0000000000
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl
+++ /dev/null
@@ -1,108 +0,0 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#-- VIVO-specific default data property statement template. 
-    
-     This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
- -->
-<#import "lib-datetime.ftl" as dt>
-<#import "lib-meta-tags.ftl" as lmt>
-<#if property.rangeDatatypeURI?? && property.rangeDatatypeURI?contains("#")>
-	<#assign datatype = property.rangeDatatypeURI?substring(property.rangeDatatypeURI?last_index_of("#")+1) />
-<#else>
-	<#assign datatype = "none" />
-</#if>
-<@showStatement statement property datatype />
-
-<#macro showStatement statement property datatype>
-    <#assign theValue = statement.value />
-	
-    <#if theValue?contains("<ul>") >
-        <#assign theValue = theValue?replace("<ul>","<ul class='tinyMCEDisc'>") />
-    </#if>
-    <#if theValue?contains("<ol>") >
-        <#assign theValue = theValue?replace("<ol>","<ol class='tinyMCENumeric'>") />
-    </#if>
-    <#if theValue?contains("<p>") >
-        <#assign theValue = theValue?replace("<p>","<p style='margin-bottom:.6em'>") />
-    </#if>
-	<#if theValue?matches("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})") >
-		<#assign theValue = theValue + "T00:00:00" />
-		${dt.formatXsdDateTimeLong(theValue, "yearMonthDayPrecision")}
-	<#elseif theValue?matches("^([0-9]{4})-((0[1-9])|(1[0-2]))-((0[1-9])|([1-2][0-9])|(3[0-1]))(T|\\s)(([0-1][0-9])|(2[0-3])):([0-5][0-9]):([0-5][0-9])")>
-		<#if theValue?contains("T00:00:00") >
-			${dt.formatXsdDateTimeLong(theValue, "yearMonthDayPrecision")}
-		<#else>
-			${dt.formatXsdDateTimeLong(theValue, "yearMonthDayTimePrecision")}
-		</#if>
-	<#elseif theValue?matches("^([0-9]{4})-(0[1-9]|1[012])")>
-		<#assign theValue = theValue + "-01T00:00:00" />
-		${dt.formatXsdDateTimeLong(theValue, "yearMonthPrecision")}
-	<#elseif theValue?matches("^--(0[1-9]|1[012])")>
-		<#assign theValue = "2000" + theValue?substring(1) + "-01T00:00:00" />
-		${dt.formatXsdDateTimeLong(theValue, "monthPrecision")}
-	<#else>
-    	${theValue} <#if !datatype?contains("none")> <@validateFormat theValue datatype/> </#if>
-	</#if>
-	<@lmt.addCitationMetaTag uri=(property.uri!) content=(theValue!) />
-</#macro>
-<#macro validateFormat value datatype >
-	<#if datatype?? >
-		<#switch datatype>
-			<#case "date">
-				<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt="${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
-		     	<span class="invalidFormatText">invalid format</span>
-				<#break>
-		    <#case "dateTime">
-				<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
-		     	<span class="invalidFormatText">invalid format</span>
-				<#break>
-		  	<#case "time">
-		     	<#if !value?matches("(([0-1][0-9])|(2[0-3])):([0-5][0-9]):([0-5][0-9])") >
-					<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
-					<span class="invalidFormatText">invalid format</span>
-			 	</#if>
-		     	<#break>
-		  	<#case "gYear">
-		     	<#if !value?matches("^\\d{4}") >
-					<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
-					<span class="invalidFormatText">invalid format</span>
-			 	</#if>
-		     	<#break>
-		    <#case "gMonth">
-		     	<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
-		     	<span class="invalidFormatText">invalid format</span>
-				<#break>
-		    <#case "gYearMonth">
-		     	<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <#-- validated above -->
-		     	<span class="invalidFormatText">invalid format</span>
-				<#break>
-		  	<#case "float">
-				<#if !value?matches("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?.") >
-		     		<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
-			     	<span class="invalidFormatText">invalid format</span>
-				</#if>
-				<#break>
-		  	<#case "integer">
-				<#if !value?matches("^-?\\d+$") >
-		     		<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
-			     	<span class="invalidFormatText">invalid format</span>
-				</#if>
-				<#break>
-		  	<#case "int">
-				<#if !value?matches("^-?\\d+$") >
-	     			<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
-			     	<span class="invalidFormatText">invalid format</span>
-				</#if>
-				<#break>
-		  	<#case "boolean">
-				<#if !value?matches("false") && !value?matches("true") >
-		     		<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
-			     	<span class="invalidFormatText">invalid format</span>
-				</#if>
-				<#break>
-		  	<#default>
-		</#switch>
-	</#if>
-</#macro>
-

From 3da53e27fe1020ffd3157d288f6fe39ec15f87b2 Mon Sep 17 00:00:00 2001
From: gneissone <mbgross@wustl.edu>
Date: Fri, 7 Dec 2018 18:26:35 -0700
Subject: [PATCH 04/24] Replace antrun-plugin <tasks> with <target> in pom.xml
 files

---
 installer/home/pom.xml   | 4 ++--
 installer/solr/pom.xml   | 4 ++--
 installer/webapp/pom.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/installer/home/pom.xml b/installer/home/pom.xml
index 86ca2270f2..ed362430e9 100644
--- a/installer/home/pom.xml
+++ b/installer/home/pom.xml
@@ -58,9 +58,9 @@
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
-                                    <tasks>
+                                    <target>
                                         <delete dir="${vivo-dir}/rdf" />
-                                    </tasks>
+                                    </target>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
index 061768e4e5..63fb2130d4 100644
--- a/installer/solr/pom.xml
+++ b/installer/solr/pom.xml
@@ -72,9 +72,9 @@
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
-                                    <tasks>
+                                    <target>
                                         <delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
-                                    </tasks>
+                                    </target>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml
index 82f1f54b14..3e9ea3a606 100644
--- a/installer/webapp/pom.xml
+++ b/installer/webapp/pom.xml
@@ -84,9 +84,9 @@
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
-                                    <tasks>
+                                    <target>
                                         <delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
-                                    </tasks>
+                                    </target>
                                 </configuration>
                             </execution>
                         </executions>

From ba2ee238ada199593236702b659dc645b8a180f0 Mon Sep 17 00:00:00 2001
From: Ben <mbgross@wustl.edu>
Date: Fri, 25 Jan 2019 07:45:27 -0700
Subject: [PATCH 05/24] [VIVO-1671] Restrict context node labels added to
 search index to relationships (#117)

Resolves: https://jira.duraspace.org/browse/VIVO-1671

* Restrict context node labels added to search index to relationships
---
 .../rdf/display/everytime/searchIndexerConfigurationVivo.n3     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
index b295cf53a1..90d360bdeb 100644
--- a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
+++ b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
@@ -23,6 +23,7 @@
         searchIndex:documentBuilding.DocumentModifier ,
         searchIndex:extensions.LabelsAcrossContextNodes ;
     rdfs:label "Labels across relatedBy/relates" ;
+    :hasTypeRestriction "http://vivoweb.org/ontology/core#Relationship" ;
     :hasIncomingProperty "http://vivoweb.org/ontology/core#relatedBy" ;
     :hasOutgoingProperty "http://vivoweb.org/ontology/core#relates" .
 
@@ -150,4 +151,3 @@
 			?emailHolder vcard:email ?email .
 		}
         """ .
-

From 490ddad8ba151f3eb013e0aae6c9aab490d235e6 Mon Sep 17 00:00:00 2001
From: Graham Triggs <graham.triggs@tib.eu>
Date: Fri, 8 Feb 2019 10:08:41 +0000
Subject: [PATCH 06/24] Fix for Plum Analytics badge on wrong publications

---
 .../partials/individual/propStatement-authorInAuthorship.ftl  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
index 516a95669b..73a7b1bf98 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
@@ -137,8 +137,10 @@
                 <#assign plumIdParam = "isbn=${statement.isbn13}">
             <#elseif statement.oclc??>
                 <#assign plumIdParam = "oclc=${statement.oclc}">
+            <#else>
+                <#assign plumIdParam = "">
             </#if>
-            <#if plumIdParam??>
+            <#if plumIdParam?has_content>
                 <div class="plum-print-wrapper" style="display: inline-block; vertical-align: top">
                     <a class="plumx-plum-print-popup"
                        href="https://plu.mx/plum/a/?${plumIdParam}"

From 8c7986d7bd500f4cd2b5f58106db9931a755186d Mon Sep 17 00:00:00 2001
From: Graham Triggs <grahamtriggs@gmail.com>
Date: Tue, 12 Feb 2019 19:20:09 +0000
Subject: [PATCH 07/24] [VIVO-1672] Fix NullPointer in visualisations (#118)

---
 .../PersonLevelRequestHandler.java            | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
index c59d355b9d..d9d3920109 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
@@ -8,6 +8,7 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData;
 import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 
 import org.apache.jena.query.Dataset;
@@ -73,23 +74,40 @@ public ResponseValues generateStandardVisualization(
 
         String visMode = vitroRequest.getParameter(
         							VisualizationFrameworkConstants.VIS_MODE_KEY);
-        
-        return generateStandardVisualizationForPersonLevelVis(vitroRequest,
-				log, dataset, egoURI, visMode);
-        
+
+        if (!StringUtils.isEmpty(egoURI)) {
+			return generateStandardVisualizationForPersonLevelVis(vitroRequest,
+					log, dataset, egoURI, visMode);
+		} else {
+			return UtilityFunctions.handleMalformedParameters(
+					"Visualization Query Error",
+					"Inappropriate query parameters were submitted.",
+					vitroRequest);
+		}
+
 	}
 
 	@Override
 	public ResponseValues generateVisualizationForShortURLRequests(
 			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
 			Dataset dataset) throws MalformedQueryParametersException {
-        
-        return generateStandardVisualizationForPersonLevelVis(
-        				vitroRequest,
-        				log, 
-        				dataset, 
-        				parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY), 
-        				parameters.get(VisualizationFrameworkConstants.VIS_MODE_KEY));
+
+		String egoURI = parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+		String visMode = parameters.get(VisualizationFrameworkConstants.VIS_MODE_KEY);
+
+		if (!StringUtils.isEmpty(egoURI)) {
+			return generateStandardVisualizationForPersonLevelVis(
+							vitroRequest,
+							log,
+							dataset,
+							egoURI,
+							visMode);
+		} else {
+			return UtilityFunctions.handleMalformedParameters(
+					"Visualization Query Error",
+					"Inappropriate query parameters were submitted.",
+					vitroRequest);
+		}
 	}
 
 	private ResponseValues generateStandardVisualizationForPersonLevelVis(

From c827f65def96b33d8c8a53a62109ec9dfdb5aa7e Mon Sep 17 00:00:00 2001
From: gneissone <mbgross@wustl.edu>
Date: Thu, 21 Feb 2019 16:12:12 -0700
Subject: [PATCH 08/24] Change legacy Google Maps link to use https

---
 .../freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
index 9272b687eb..bfeeedeec9 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
@@ -110,7 +110,7 @@ var i18nStrings = {
 <#if googleMapsKey??>
     ${scripts.add('<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=${googleMapsKey}"></script>')}
 <#else>
-    ${scripts.add('<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>')}
+    ${scripts.add('<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>')}
 </#if>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.blockUI.js"></script>',

From 8511073240657108c4ce243f1a4c32e5fb74a78e Mon Sep 17 00:00:00 2001
From: alessandroGalasso <45561775+alessandroGalasso@users.noreply.github.com>
Date: Wed, 20 Mar 2019 18:22:35 +0100
Subject: [PATCH 09/24] [VIVO-1641] Replace afn:localname / afn:namespace with
 cross-platform equivalent (#96)

* Update listViewConfig-default.xml
* 1641 repalce localname
* [VIVO-1641] REPLACE jena afn with cross-platform regex

Resolves https://jira.duraspace.org/browse/VIVO-1641
---
 .../webapp/controller/ajax/GeoFocusMapLocations.java   |  3 +--
 .../ManageGrantsForIndividualController.java           |  1 -
 .../ManagePeopleForOrganizationController.java         |  1 -
 .../ManagePublicationsForIndividualController.java     |  1 -
 .../AddAuthorsToInformationResourceGenerator.java      |  4 +---
 .../AddEditorsToInformationResourceGenerator.java      |  4 +---
 .../webapp/visualization/constants/QueryConstants.java |  1 -
 .../main/webapp/config/listViewConfig-adviseeIn.xml    |  4 ++--
 .../main/webapp/config/listViewConfig-advisorIn.xml    |  3 +--
 .../webapp/config/listViewConfig-dateTimeInterval.xml  | 10 +++++-----
 .../webapp/config/listViewConfig-dateTimeValue.xml     |  4 ++--
 .../src/main/webapp/config/listViewConfig-default.xml  |  6 +++---
 .../config/listViewConfig-fauxPropertyDefault.xml      |  6 +++---
 .../config/listViewConfig-hasAssociatedConcept.xml     |  4 ++--
 .../webapp/config/listViewConfig-hasAttendeeRole.xml   |  4 ++--
 .../listViewConfig-hasCoPrincipalInvestigatorRole.xml  |  6 +++---
 .../webapp/config/listViewConfig-hasEditorRole.xml     |  4 ++--
 .../config/listViewConfig-hasInvestigatorRole.xml      |  6 +++---
 .../webapp/config/listViewConfig-hasPresenterRole.xml  |  4 ++--
 .../listViewConfig-hasPrincipalInvestigatorRole.xml    |  6 +++---
 .../webapp/config/listViewConfig-hasReviewerRole.xml   |  4 ++--
 .../webapp/config/listViewConfig-issuedCredential.xml  |  6 +++---
 .../main/webapp/config/listViewConfig-rangeUnion.xml   |  6 +++---
 .../main/webapp/config/listViewConfig-relatedRole.xml  |  4 ++--
 .../src/main/webapp/config/listViewConfig-webpage.xml  |  4 ++--
 25 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
index 7b9f6c3620..ea5d56dd49 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
@@ -31,8 +31,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
         + "PREFIX core: <http://vivoweb.org/ontology/core#>  \n"
         + "PREFIX foaf: <http://xmlns.com/foaf/0.1/>  \n"
         + "PREFIX vivoc: <http://vivo.library.cornell.edu/ns/0.1#>  \n"
-        + "PREFIX afn:  <http://jena.apache.org/ARQ/function#> "
-        + "SELECT DISTINCT ?label ?location (afn:localname(?location) AS ?localName) (COUNT(DISTINCT ?person) AS ?count)  \n"
+        + "SELECT DISTINCT ?label ?location (REPLACE(STR(?location),\"^.*(#)(.*)$\", \"$2\") AS ?localName) (COUNT(DISTINCT ?person) AS ?count)  \n"
         + "WHERE { { \n"
         + "    ?location rdf:type core:GeographicRegion .  \n"
         + "    ?location rdfs:label ?label .   \n"
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
index 37da3f2b6c..6a5024b06e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
@@ -69,7 +69,6 @@ protected ResponseValues processRequest(VitroRequest vreq) {
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
         + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n"
-        + "PREFIX afn:  <http://jena.apache.org/ARQ/function#> \n"
         + "SELECT DISTINCT ?subclass ?role (str(?label2) as ?label) ?activity ?hideThis WHERE { \n"
         + "    ?subject <http://purl.obolibrary.org/obo/RO_0000053> ?role . \n"
         + "    ?role a core:ResearcherRole . \n"
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
index 2029d788f2..dc68d76ddd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
@@ -69,7 +69,6 @@ protected ResponseValues processRequest(VitroRequest vreq) {
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
         + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n"
-        + "PREFIX afn: <http://jena.apache.org/ARQ/function#> \n"
         + "PREFIX foaf: <http://xmlns.com/foaf/0.1/> \n"
         + "SELECT DISTINCT ?subclass ?position ?positionLabel (str(?label) as ?name) ?person ?hideThis WHERE { \n"
         + "    ?subject core:relatedBy ?position . \n"
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
index dd4f339d9e..6e00385272 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
@@ -69,7 +69,6 @@ protected ResponseValues processRequest(VitroRequest vreq) {
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
         + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n"
-        + "PREFIX afn: <http://jena.apache.org/ARQ/function#> \n"
         + "SELECT DISTINCT ?subclass ?authorship (str(?label) as ?title) ?pub ?hideThis WHERE { \n"
         + "    ?subject core:relatedBy ?authorship . \n"
         + "    ?authorship a core:Authorship  . \n"
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
index 52ca4d18f1..baf0b552dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
@@ -346,7 +346,6 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 
 	private static String AUTHORSHIPS_MODEL = " \n"
 			+ "PREFIX core: <http://vivoweb.org/ontology/core#>\n"
-			+ "PREFIX afn:  <http://jena.apache.org/ARQ/function#>\n"
 			+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
 			+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/>\n"
 			+ "PREFIX vcard:  <http://www.w3.org/2006/vcard/ns#>\n"
@@ -412,11 +411,10 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 
     private static String AUTHORSHIPS_QUERY = " \n"
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
-        + "PREFIX afn:  <http://jena.apache.org/ARQ/function#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
         + "PREFIX foaf: <http://xmlns.com/foaf/0.1/> \n"
         + "PREFIX vcard:  <http://www.w3.org/2006/vcard/ns#> \n"
-        + "SELECT ?authorshipURI (afn:localname(?authorshipURI) AS ?authorshipName) ?authorURI ?authorName ?rank \n"
+        + "SELECT ?authorshipURI (REPLACE(STR(?authorshipURI),\"^.*(#)(.*)$\", \"$2\") AS ?authorshipName) ?authorURI ?authorName ?rank \n"
         + "WHERE { { \n"
         + "  ?subject core:relatedBy ?authorshipURI . \n"
         + "  ?authorshipURI a core:Authorship . \n"
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
index 5683561290..dad9147f83 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
@@ -309,7 +309,6 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 
 	private static String EDITORSHIPS_MODEL = ""
 			+ "PREFIX core: <http://vivoweb.org/ontology/core#>\n"
-			+ "PREFIX afn:  <http://jena.apache.org/ARQ/function#>\n"
 			+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
 			+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/>\n"
 			+ "CONSTRUCT\n"
@@ -347,10 +346,9 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 
     private static String EDITORSHIPS_QUERY = ""
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
-        + "PREFIX afn:  <http://jena.apache.org/ARQ/function#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
         + "PREFIX foaf: <http://xmlns.com/foaf/0.1/> \n"
-        + "SELECT ?editorshipURI (afn:localname(?editorshipURI) AS ?editorshipName) ?editorURI ?editorName ?rank \n"
+        + "SELECT ?editorshipURI (REPLACE(STR(?editorshipURI),\"^.*(#)(.*)$\", \"$2\") AS ?editorshipName) ?editorURI ?editorName ?rank \n"
         + "WHERE { \n"
         + "?subject core:relatedBy ?editorshipURI . \n"
         + "?editorshipURI a core:Editorship . \n"
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
index b6103813a5..6ff338080f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
@@ -41,7 +41,6 @@ public class QueryConstants {
 			put("vivo", "http://vivo.library.cornell.edu/ns/0.1#");
 			put("geo", "http://aims.fao.org/aos/geopolitical.owl#");
 			put("public", "http://vitro.mannlib.cornell.edu/ns/vitro/public#");
-			put("afn", "http://jena.apache.org/ARQ/function#");
 			put("vivosocnet", "http://vivo.cns.iu.edu/ns/#");
 			put("obo", "http://purl.obolibrary.org/obo/");
 			put("vcard", "http://www.w3.org/2006/vcard/ns#");
diff --git a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
index d8331a7a6a..57320ed9d8 100644
--- a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
@@ -6,7 +6,7 @@
 <list-view-config>
     <query-select>
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
@@ -31,7 +31,7 @@
             ?adviseeRole a core:AdviseeRole .
             ?adviseeRole core:relatedBy ?advisingRel .
             ?advisingRel a core:AdvisingRelationship .
-            LET ( ?localName := afn:localname(?advisingRel) )
+            LET ( ?localName := REPLACE(STR(?advisingRel),"^.*(#)(.*)$", "$2") )
             OPTIONAL {
                 <precise-subquery>?subject ?property ?adviseeRole .
                 ?adviseeRole a core:AdviseeRole .
diff --git a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml
index 03e0c8d437..689f8ab88a 100644
--- a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml
@@ -6,7 +6,6 @@
 <list-view-config>
     <query-select>
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
-        PREFIX afn: &lt;http://jena.apache.org/ARQ/function#&gt;
         PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl: &lt;http://www.w3.org/2002/07/owl#&gt;
@@ -31,7 +30,7 @@
             ?advisorRole a core:AdvisorRole .
             ?advisorRole core:relatedBy ?advisingRel .
             ?advisingRel a core:AdvisingRelationship .
-            LET ( ?localName := afn:localname(?advisingRel) )
+            LET ( ?localName := REPLACE(STR(?advisingRel),"^.*(#)(.*)$", "$2") )
             OPTIONAL {
                 <precise-subquery>?subject ?property ?advisorRole .
                 ?advisorRole a core:AdvisorRole .
diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
index 65fecfbea5..cc614d4c7b 100644
--- a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
@@ -7,7 +7,7 @@
     <query-select>
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
 
         SELECT DISTINCT ?dateTimeInterval ?label
             ?valueStart ?valueStartName
@@ -24,7 +24,7 @@
             OPTIONAL {
                 <precise-subquery>?subject ?property ?dateTimeInterval .</precise-subquery>
                 ?dateTimeInterval core:start ?valueStart .
-                LET (?valueStartName := afn:localname(?valueStart))
+                LET (?valueStartName := REPLACE(STR(?valueStart),"^.*(#)(.*)$", "$2"))
 
                 OPTIONAL {
                     <precise-subquery>?subject ?property ?dateTimeInterval .
@@ -35,13 +35,13 @@
                     <precise-subquery>?subject ?property ?dateTimeInterval .
                     ?dateTimeInterval core:start ?valueStart .</precise-subquery>
                     ?valueStart core:dateTimePrecision ?dateTimePrecisionStart .
-                    LET (?precisionStart := afn:localname(?dateTimePrecisionStart))
+                    LET (?precisionStart := REPLACE(STR(?dateTimePrecisionStart),"^.*(#)(.*)$", "$2"))
                 }
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?dateTimeInterval .</precise-subquery>
                 ?dateTimeInterval core:end ?valueEnd .
-                LET (?valueEndName := afn:localname(?valueEnd))
+                LET (?valueEndName := REPLACE(STR(?valueEnd),"^.*(#)(.*)$", "$2"))
                 OPTIONAL {
                     <precise-subquery>?subject ?property ?dateTimeInterval .
                     ?dateTimeInterval core:end ?valueEnd .</precise-subquery>
@@ -51,7 +51,7 @@
                     <precise-subquery>?subject ?property ?dateTimeInterval .
                     ?dateTimeInterval core:end ?valueEnd .</precise-subquery>
                     ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd .
-                    LET (?precisionEnd := afn:localname(?dateTimePrecisionEnd))
+                    LET (?precisionEnd := REPLACE(STR(?dateTimePrecisionEnd),"^.*(#)(.*)$", "$2"))
                 }
             }
             OPTIONAL {
diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
index 249836eef3..59c77030fd 100644
--- a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
@@ -7,10 +7,10 @@
     <query-select>     
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         
         SELECT DISTINCT ?dateTimeValue 
-                        (afn:localname(?dateTimePrecision) AS ?precision) 
+                        (REPLACE(STR(?dateTimePrecision),"^.*(#)(.*)$", "$2") AS ?precision) 
                         ?dateTime
         WHERE {
             ?subject ?property ?dateTimeValue .
diff --git a/webapp/src/main/webapp/config/listViewConfig-default.xml b/webapp/src/main/webapp/config/listViewConfig-default.xml
index ac2128c8e2..46d9825f66 100644
--- a/webapp/src/main/webapp/config/listViewConfig-default.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-default.xml
@@ -7,7 +7,7 @@
 
 <list-view-config>
     <query-select>
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
@@ -25,7 +25,7 @@
         WHERE
         {
             ?subject ?property ?object .
-            LET (?localName := afn:localname(?object))
+            LET (?localName := REPLACE(STR(?object), "^.*(#)(.*)$", "$2"))
 
             OPTIONAL {
                 <precise-subquery>?subject ?property ?object .</precise-subquery>
@@ -57,7 +57,7 @@
             }
 
         <collated>
-            FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
+            FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
         </collated>
 
         # Order by ?type is important, because if the object has more than one mostSpecificType,
diff --git a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
index 2ac5658dfc..c7ede94f5e 100644
--- a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
@@ -7,7 +7,7 @@
 
 <list-view-config>
     <query-select>
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
@@ -26,7 +26,7 @@
         {
             ?subject ?property ?object .
             ?object a ?objectType .
-            LET (?localName := afn:localname(?object))
+            LET (?localName := REPLACE(STR(?object),"^.*(#)(.*)$", "$2"))
 
             OPTIONAL {
                 <precise-subquery>?subject ?property ?object .
@@ -63,7 +63,7 @@
                 ?object a ?objectType .</precise-subquery>
                 ?object a ?subclass .
             }
-            FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
+            FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
         </collated>
 
         # Order by ?type is important, because if the object has more than one mostSpecificType,
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
index 5dc30ebeff..c7c036f2f2 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
@@ -8,12 +8,12 @@
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
         PREFIX vivo: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdf:  &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&gt;
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         
         SELECT ?concept ?conceptLabel ?conceptName ?vocabularySource ?vocabularySourceName
         WHERE {
          	?subject ?property ?concept .
-         	LET (?conceptName := afn:localname(?concept)) 
+         	LET (?conceptName := REPLACE(STR(?concept),"^.*(#)(.*)$", "$2")) 
          	OPTIONAL {
                 <precise-subquery>?subject ?property ?concept .</precise-subquery>
                 ?concept rdfs:label ?conceptLabel .
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
index 70bb38b2fa..4bc8616fd1 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX vivo:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
@@ -55,7 +55,7 @@
                 }
                 </collated>
 
-                LET (?event1Name := afn:localname(?event1))
+                LET (?event1Name := REPLACE(STR(?event1),"^.*(#)(.*)$", "$2"))
 
                 OPTIONAL {
                     <precise-subquery>
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
index 720a3879a2..5c53b02979 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
@@ -32,7 +32,7 @@
                 ?role core:relatedBy ?activity .
                 ?activity a core:Contract .
                 ?activity rdfs:label ?activityLabel .
-                LET (?activityName := afn:localname(?activity)) .
+                LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) .
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
@@ -40,7 +40,7 @@
                 ?role core:relatedBy ?activity .
                 ?activity a core:Grant .
                 ?activity rdfs:label ?activityLabel .
-                LET (?activityName := afn:localname(?activity)) .
+                LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) .
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
index 0586eab0b8..f5a204df6a 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>    
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
@@ -14,7 +14,7 @@
                         ?role
                         ?subclassLabel
                         ?activity 
-                        (afn:localname(?activity) AS ?activityLocal)
+                        (REPLACE(STR(?activity),"^.*(#)(.*)$", "$2") AS ?activityLocal)
                         ?activityName
                         ?dateTimeStart 
                         ?dateTimeEnd 
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
index f4549c46f2..e6e6eac48d 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
@@ -32,7 +32,7 @@
                 ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
                 ?activity a core:Contract .
                 ?activity rdfs:label ?activityLabel .
-                LET (?activityName := afn:localname(?activity))
+                LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2"))
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
@@ -57,7 +57,7 @@
                 ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
                 ?activity a core:Grant .
                 ?activity rdfs:label ?activityLabel .
-                LET (?activityName := afn:localname(?activity))
+                LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2"))
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
index d83fb4621a..c14ca95135 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
@@ -8,7 +8,7 @@
 
 <list-view-config>
     <query-select>    
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX vivo:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
@@ -38,7 +38,7 @@
                 ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
                 ?presentation a vivo:Presentation .
                 ?presentation rdfs:label ?presentationLabel .
-                LET (?presentationName := afn:localname(?presentation))
+                LET (?presentationName := REPLACE(STR(?presentation),"^.*(#)(.*)$", "$2"))
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
index c120ea34fa..d774208240 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
@@ -34,7 +34,7 @@
                 ?role core:relatedBy ?activity .
                 ?activity a core:Contract .
                 ?activity rdfs:label ?activityLabel .
-                LET (?activityName := afn:localname(?activity)) .
+                LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) .
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
@@ -59,7 +59,7 @@
                 ?role core:relatedBy ?activity .
                 ?activity a core:Grant .
                 ?activity rdfs:label ?activityLabel .
-                LET (?activityName := afn:localname(?activity)) .
+                LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) .
             }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
index 76642ecc7b..81e587c212 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>    
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
@@ -14,7 +14,7 @@
                         ?role
                         ?subclassLabel
                         ?activity 
-                        (afn:localname(?activity) AS ?activityLocal)
+                        (REPLACE(STR(?activity),"^.*(#)(.*)$", "$2") AS ?activityLocal)
                         ?activityName
                         ?dateTimeStart 
                         ?dateTimeEnd 
diff --git a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
index d4d93eb0d3..0cc27b44ff 100644
--- a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
@@ -6,7 +6,7 @@
 <list-view-config>
     <query-select>    
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
-        PREFIX afn:   &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
@@ -26,7 +26,7 @@
         WHERE {
             ?subject ?property ?issuedCredential .
             ?issuedCredential a core:IssuedCredential .
-            LET (?issuedCredentialLocal := afn:localname(?issuedCredential))
+            LET (?issuedCredentialLocal := REPLACE(STR(?issuedCredential),"^.*(#)(.*)$", "$2"))
             OPTIONAL {
                 <precise-subquery>?subject ?property ?issuedCredential .
                 ?issuedCredential a core:IssuedCredential .</precise-subquery>
@@ -39,7 +39,7 @@
                 ?credential a core:Credential .
                 ?credential core:relatedBy ?issuedCredential .
                 ?credential rdfs:label ?credentialLabel .
-                LET (?credentialLocal := afn:localname(?credential))
+                LET (?credentialLocal := REPLACE(STR(?credential),"^.*(#)(.*)$", "$2"))
             }
              OPTIONAL {
                 <precise-subquery>?subject ?property ?issuedCredential .
diff --git a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
index 969bcb8f10..236fde8074 100644
--- a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
@@ -7,7 +7,7 @@
 
 <list-view-config>
     <query-select>
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
@@ -24,7 +24,7 @@
         WHERE
         {
             ?subject ?property ?object .
-            LET (?localName := afn:localname(?object))
+            LET (?localName := REPLACE(STR(?object),"^.*(#)(.*)$", "$2"))
 
             OPTIONAL {
                 <precise-subquery>?subject ?property ?object .</precise-subquery>
@@ -50,7 +50,7 @@
             }
 
         <collated>
-            FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
+            FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
         </collated>
 
         # Order by ?type is important, because if the object has more than one mostSpecificType,
diff --git a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
index 9d3a7df839..55bbe9b709 100644
--- a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
@@ -8,7 +8,7 @@
     <query-select>    
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
         PREFIX vcard:  &lt;http://www.w3.org/2006/vcard/ns#&gt;
         
@@ -18,7 +18,7 @@
                         ?property
                         ?role   
                         ?roleLabel ?roleTypeLabel                          
-                        ?indivInRole (afn:localname(?indivInRole) AS ?indivName)
+                        ?indivInRole (REPLACE(STR(?indivInRole),"^.*(#)(.*)$", "$2") AS ?indivName)
                         ?indivLabel
                         ?dateTimeInterval ?dateTimeStart ?dateTimeEnd ?objectType
         WHERE {
diff --git a/webapp/src/main/webapp/config/listViewConfig-webpage.xml b/webapp/src/main/webapp/config/listViewConfig-webpage.xml
index 31db7f019e..9fb759017e 100644
--- a/webapp/src/main/webapp/config/listViewConfig-webpage.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-webpage.xml
@@ -7,13 +7,13 @@
 
 <list-view-config>
     <query-select>            
-        PREFIX afn:  &lt;http://jena.apache.org/ARQ/function#&gt;
+        
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
 
         SELECT ?vcard ?link 
-               (afn:localname(?link) AS ?linkName) 
+               (REPLACE(STR(?link),"^.*(#)(.*)$", "$2") AS ?linkName) 
                (group_concat(distinct ?linkLabel;separator="/") as ?label)
                ?url 
                ?rank

From adfbe2295008cec3c0a2caac9dfb985400c1f4bb Mon Sep 17 00:00:00 2001
From: Andrew Woods <awoods@duraspace.org>
Date: Tue, 18 Sep 2018 17:13:56 -0400
Subject: [PATCH 10/24] Remove embedded Solr

Related to: https://jira.duraspace.org/browse/VIVO-1592
---
 .gitignore                                    |   3 +-
 installer/pom.xml                             |   7 -
 installer/solr/pom.xml                        | 140 ------------------
 .../main/webResources/META-INF/context.xml    |   9 --
 .../WEB-INF/classes/log4j.properties          |  13 --
 5 files changed, 2 insertions(+), 170 deletions(-)
 delete mode 100644 installer/solr/pom.xml
 delete mode 100644 installer/solr/src/main/webResources/META-INF/context.xml
 delete mode 100644 installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties

diff --git a/.gitignore b/.gitignore
index 08b9a4b199..425a6cfbcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /build.properties
 /runtime.properties
 /ontology/public/catalog-v0001.xml
+settings.xml
 
 rdf/auth/firsttime/test-user-model.owl
 utilities/solrtester/.work
@@ -11,8 +12,8 @@ utilities/rdbmigration/.work
 **/.idea
 **/*.iml
 **/target
-
 **/overlays
+*~
 
 # Eclipse artifacts
 **/.settings
diff --git a/installer/pom.xml b/installer/pom.xml
index 4650d6de58..e51aa26ebf 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -105,18 +105,11 @@
 
     <modules>
         <module>home</module>
-        <module>solr</module>
         <module>webapp</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.vivoweb</groupId>
-                <artifactId>vitro-solr</artifactId>
-                <version>${vitro-version}</version>
-                <type>war</type>
-            </dependency>
             <dependency>
                 <groupId>org.vivoweb</groupId>
                 <artifactId>vivo-home</artifactId>
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
deleted file mode 100644
index 63fb2130d4..0000000000
--- a/installer/solr/pom.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.vivoweb</groupId>
-    <artifactId>vivo-installer-solr</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
-    <packaging>war</packaging>
-
-    <parent>
-        <groupId>org.vivoweb</groupId>
-        <artifactId>vivo-installer</artifactId>
-        <version>1.11.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <name>VIVO Install Solr App</name>
-
-    <profiles>
-        <profile>
-            <id>package</id>
-            <activation>
-                <property><name>app-name</name></property>
-            </activation>
-            <build>
-                <finalName>${app-name}solr</finalName>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <addClasspath>true</addClasspath>
-                                </manifest>
-                            </archive>
-                            <archiveClasses>false</archiveClasses>
-                            <overlays>
-                                <overlay>
-                                    <groupId>org.vivoweb</groupId>
-                                    <artifactId>vitro-solr</artifactId>
-                                    <type>war</type>
-                                </overlay>
-                            </overlays>
-                            <webResources>
-                                <resource>
-                                    <directory>src/main/webResources</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </webResources>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>pinstall</id>
-            <activation>
-                <property><name>tomcat-dir</name></property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>remove-webapp</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>${project.artifactId}</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>war</type>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${tomcat-dir}/webapps/${project.build.finalName}</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>overlays</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.vivoweb</groupId>
-            <artifactId>vitro-solr</artifactId>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml
deleted file mode 100644
index 51e4c1b846..0000000000
--- a/installer/solr/src/main/webResources/META-INF/context.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Context crossContext="true" override="true">
-   <Environment
-        type="java.lang.String" 
-        name="solr/home"  
-        value="${vivo-dir}/solr" override="true"/>
-
-   <!-- Disable persist sessions on shut down.-->
-   <Manager pathname="" />
-</Context>
diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
deleted file mode 100644
index 89f1b4378f..0000000000
--- a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
-log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log
-log4j.appender.AllAppender.MaxFileSize=10MB 
-log4j.appender.AllAppender.MaxBackupIndex=10 
-log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout 
-log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
-
-log4j.rootLogger=INFO, AllAppender 
-
-# Make all of the Solr classes quieter...
-log4j.logger.org.apache.solr.level = WARNING
-# ...except for this one.
-log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO

From f6eb0eb64b97be9a07305df7ab6d264e687a739b Mon Sep 17 00:00:00 2001
From: Andrew Woods <awoods@duraspace.org>
Date: Wed, 26 Sep 2018 16:38:32 -0400
Subject: [PATCH 11/24] Update default startup_listeners.txt for ElasticSearch

Related to: https://jira.duraspace.org/browse/VIVO-1600
---
 .../src/main/webapp/WEB-INF/resources/startup_listeners.txt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
index e7bdfa8864..47dd56595d 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -86,7 +86,7 @@ edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
 
 edu.cornell.mannlib.vivo.orcid.OrcidContextSetup
 
-# This should be near the end, because it will issue a warning if the connection to Solr times out.
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
+# This should be near the end, because it will issue a warning if the connection to Solr or ElasticSearch times out.
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest
 
 org.vivoweb.webapp.startup.i18nSetup

From 9f34f5ee9850eb6c3dd119b3eb07b231397efbbc Mon Sep 17 00:00:00 2001
From: Mike Conlon <mconlon@ufl.edu>
Date: Sun, 14 Apr 2019 16:09:21 -0400
Subject: [PATCH 12/24] Add Zenodo DOI

Click on the DOI badge to visit the Zenodo community collection archive for VIVO
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 748733e08a..ea537679a7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # VIVO: Connect, Share, Discover
 
-[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO)
+[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO) [![DOI][![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2639714.svg)](https://doi.org/10.5281/zenodo.2639713)
 
 VIVO is an open source semantic web tool for research discovery -- finding people and the research they do.
 

From 48dcf8719942213f8c4dd2a3f22e2cc9f68cae5f Mon Sep 17 00:00:00 2001
From: Mike Conlon <mconlon@ufl.edu>
Date: Sun, 14 Apr 2019 16:09:43 -0400
Subject: [PATCH 13/24] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ea537679a7..eec17bc2b6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # VIVO: Connect, Share, Discover
 
-[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO) [![DOI][![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2639714.svg)](https://doi.org/10.5281/zenodo.2639713)
+[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2639714.svg)](https://doi.org/10.5281/zenodo.2639713)
 
 VIVO is an open source semantic web tool for research discovery -- finding people and the research they do.
 

From 87092cec9cc810934bef21ef9db11be0479f44c7 Mon Sep 17 00:00:00 2001
From: Ben <mbgross@wustl.edu>
Date: Fri, 3 May 2019 10:51:00 -0600
Subject: [PATCH 14/24] [VIVO-1690] - Remove trailing whitespace throughout
 project (#126)

* Remove trailing whitespace throughout project

Resolves: https://jira.duraspace.org/browse/VIVO-1690
** Along with: https://github.com/vivo-project/Vitro/pull/117
---
 .../service/impl/AgrovocService.java          |  794 ++--
 .../service/impl/GemetService.java            |  720 +--
 .../semservices/service/impl/LCSHService.java |   34 +-
 .../semservices/service/impl/UMLSService.java |  458 +-
 .../controller/AboutQrCodesController.java    |    6 +-
 .../controller/ExportQrCodeController.java    |   20 +-
 .../controller/ajax/GeoFocusMapLocations.java |   28 +-
 .../ajax/GeoFocusResearcherCount.java         |   14 +-
 .../ajax/HomePageAjaxController.java          |    2 +-
 .../webapp/controller/ajax/QrCodeDetails.java |   14 +-
 .../InstitutionalInternalClassController.java |  516 +--
 .../ManageGrantsForIndividualController.java  |   24 +-
 ...ManagePeopleForOrganizationController.java |   16 +-
 ...gePublicationsForIndividualController.java |   16 +-
 .../harvester/CsvFileHarvestJob.java          |   58 +-
 .../harvester/FileHarvestController.java      |   30 +-
 .../controller/harvester/FileHarvestJob.java  |   18 +-
 .../controller/harvester/Harvester.java       |   24 +-
 .../AjaxVisualizationController.java          |  106 +-
 .../DataVisualizationController.java          |   72 +-
 .../ShortURLVisualizationController.java      |  152 +-
 .../StandardVisualizationController.java      |   92 +-
 .../VisualizationFrameworkConstants.java      |  282 +-
 .../visualization/VisualizationInjector.java  |   36 +-
 .../VisualizationsDependencyInjector.java     |   30 +-
 .../AutocompleteRequiredInputValidator.java   |   16 +-
 .../n3editing/FirstAndLastNameValidator.java  |   24 +-
 .../n3editing/N3TransitionToV2Mapping.java    |   14 +-
 .../PersonHasPublicationValidator.java        |   24 +-
 .../PublicationHasAuthorValidator.java        |   24 +-
 .../AddAssociatedConceptGenerator.java        | 1138 ++---
 .../AddAttendeeRoleToPersonGenerator.java     |  134 +-
 ...AuthorsToInformationResourceGenerator.java |  220 +-
 .../AddClinicalRoleToPersonGenerator.java     |   24 +-
 ...ConceptThroughObjectPropertyGenerator.java |   38 +-
 .../AddEditWebpageFormGenerator.java          |  110 +-
 .../AddEditorRoleToPersonGenerator.java       |   28 +-
 ...EditorsToInformationResourceGenerator.java |  172 +-
 .../AddEditorshipToPersonGenerator.java       |  108 +-
 .../AddFullNameToPersonGenerator.java         |   72 +-
 .../AddGrantRoleToPersonGenerator.java        |  362 +-
 .../AddHeadOfRoleToPersonGenerator.java       |  108 +-
 .../AddMemberRoleToPersonGenerator.java       |   18 +-
 .../AddOrcidIdToPersonGenerator.java          |   30 +-
 .../AddOrganizerRoleToPersonGenerator.java    |   12 +-
 ...OutreachProviderRoleToPersonGenerator.java |   12 +-
 .../AddPresenterRoleToPersonGenerator.java    |  172 +-
 .../AddPublicationToPersonGenerator.java      |  142 +-
 .../AddResearcherRoleToPersonGenerator.java   |   20 +-
 .../AddReviewerRoleToPersonGenerator.java     |   26 +-
 .../AddRoleToPersonTwoStageGenerator.java     |  554 +--
 ...dServiceProviderRoleToPersonGenerator.java |   16 +-
 .../AddTeacherRoleToPersonGenerator.java      |  110 +-
 .../AddUserDefinedConceptGenerator.java       |  622 +--
 ...AutocompleteDataPropertyFormGenerator.java |  134 +-
 .../GrantAdministeredByGenerator.java         |   54 +-
 .../GrantHasContributorGenerator.java         |   76 +-
 .../ManageLabelsForPersonGenerator.java       |  184 +-
 .../ManageWebpagesForIndividualGenerator.java |   28 +-
 ...OrganizationAdministersGrantGenerator.java |   54 +-
 .../OrganizationForTrainingGenerator.java     |  146 +-
 ...ganizationHasPositionHistoryGenerator.java |   10 +-
 ...PersonHasAdviseeRelationshipGenerator.java |  168 +-
 ...PersonHasAdvisorRelationshipGenerator.java |  170 +-
 .../PersonHasAwardOrHonorGenerator.java       |  154 +-
 .../PersonHasEducationalTraining.java         |  154 +-
 .../generators/PersonHasEmailGenerator.java   |   58 +-
 .../PersonHasIssuedCredentialGenerator.java   |  130 +-
 .../PersonHasPositionHistoryGenerator.java    |  180 +-
 .../PersonHasPreferredTitleGenerator.java     |   48 +-
 .../ProjectHasParticipantGenerator.java       |   74 +-
 .../SubjectHasMailingAddressGenerator.java    |   84 +-
 .../SubjectHasPhoneFaxNumberGenerator.java    |   64 +-
 ...aultAddMissingIndividualFormGenerator.java |   48 +-
 .../generators/VIVOManageLabelsGenerator.java |   18 +-
 .../VIVONewIndividualFormGenerator.java       |   66 +-
 .../generators/VivoBaseGenerator.java         |   14 +-
 .../AddAssociatedConceptsPreprocessor.java    | 1750 ++++----
 .../ConceptSemanticTypesPreprocessor.java     |   58 +-
 .../ManageLabelsForPersonPreprocessor.java    |   38 +-
 .../RoleToActivityPredicatePreprocessor.java  |   68 +-
 .../RoleToPredicatePreprocessor.java          |  166 +-
 .../ProcessInternalClassDataGetterN3.java     |  450 +-
 .../documentBuilding/CalculateParameters.java |   88 +-
 .../extensions/LabelsAcrossContextNodes.java  |   16 +-
 .../webapp/servlet/ConceptSearchServlet.java  |  182 +-
 .../ConceptSearchServiceUtils.java            |  202 +-
 .../VocabSourceDescription.java               |   64 +-
 .../dataGetter/InternalClassesDataGetter.java |  268 +-
 .../ProcessInternalClasses.java               |  162 +-
 .../VIVOMenuManagementDataUtils.java          |  118 +-
 .../CoAuthorshipGraphMLWriter.java            |  664 +--
 .../coauthorship/CoAuthorshipQueryRunner.java |   10 +-
 .../CoAuthorshipRequestHandler.java           |  176 +-
 .../CoAuthorshipVisCodeGenerator.java         |  508 +--
 .../collaborationutils/CoAuthorshipData.java  |  114 +-
 .../CoInvestigationData.java                  |  114 +-
 .../CollaborationComparator.java              |   44 +-
 .../collaborationutils/CollaborationData.java |  146 +-
 .../CollaboratorComparator.java               |   42 +-
 .../constants/MapOfScienceConstants.java      | 2290 +++++-----
 .../constants/QueryConstants.java             |  120 +-
 .../constants/QueryFieldLabels.java           |   70 +-
 .../visualization/constants/VOConstants.java  |   88 +-
 .../visualization/constants/VisConstants.java |   42 +-
 .../CoPIGrantCountConstructQueryRunner.java   |   10 +-
 .../CoPIGrantCountQueryRunner.java            |   62 +-
 .../CoPIGrantCountRequestHandler.java         |  184 +-
 .../CoPIGraphMLWriter.java                    |   48 +-
 .../CoPIVisCodeGenerator.java                 |   84 +-
 .../DocumentFieldNotFoundException.java       |   42 +-
 ...alConstructedModelIdentifierException.java |   42 +-
 .../MalformedQueryParametersException.java    |   42 +-
 ...pOfScienceVisualizationRequestHandler.java | 1334 +++---
 .../ModelConstructorRequestHandler.java       |   10 +-
 .../ModelConstructorUtilities.java            |   62 +-
 .../PersonToGrantsModelConstructor.java       |   46 +-
 .../factory/ModelFactoryInterface.java        |    2 +-
 .../PersonGrantCountQueryRunner.java          |    6 +-
 .../PersonGrantCountRequestHandler.java       |   88 +-
 .../PersonGrantCountVisCodeGenerator.java     |   36 +-
 .../PersonLevelRequestHandler.java            |  112 +-
 .../PersonPublicationCountQueryRunner.java    |    6 +-
 .../PersonPublicationCountRequestHandler.java |  590 +--
 ...ersonPublicationCountVisCodeGenerator.java |  466 +-
 .../OrganizationUtilityFunctions.java         |   56 +-
 ...poralGrantVisualizationRequestHandler.java |  626 +--
 ...ublicationVisualizationRequestHandler.java |  632 +--
 .../tools/ToolsRequestHandler.java            |    8 +-
 .../utilities/UtilitiesRequestHandler.java    |  170 +-
 .../visualization/valueobjects/Activity.java  |   28 +-
 .../valueobjects/Collaboration.java           |  306 +-
 .../valueobjects/Collaborator.java            |  300 +-
 .../valueobjects/ConstructedModel.java        |    4 +-
 .../valueobjects/ConstructedModelTracker.java |   22 +-
 .../visualization/valueobjects/Entity.java    |   22 +-
 .../valueobjects/GenericQueryMap.java         |   82 +-
 .../valueobjects/Individual.java              |   64 +-
 .../valueobjects/MapOfScienceActivity.java    |    2 +-
 .../valueobjects/SparklineData.java           |  334 +-
 .../visualization/valueobjects/SubEntity.java |   18 +-
 .../YearToEntityCountDataElement.java         |    6 +-
 .../valueobjects/json/JsonObject.java         |    8 +-
 .../valueobjects/json/MapOfScience.java       |    4 +-
 .../valueobjects/json/SubjectEntityJSON.java  |    4 +-
 .../visutils/AllPropertiesQueryRunner.java    |   20 +-
 .../visutils/CachedModelConstructor.java      |    6 +-
 .../visutils/GenericQueryRunner.java          |   38 +-
 .../visutils/GenericQueryRunnerOnModel.java   |   36 +-
 .../visutils/ModelConstructor.java            |    4 +-
 .../visualization/visutils/PDFDocument.java   |  108 +-
 .../visualization/visutils/QueryRunner.java   |   22 +-
 .../visutils/UniqueIDGenerator.java           |   32 +-
 .../visutils/UtilityFunctions.java            |  156 +-
 .../visutils/VisualizationRequestHandler.java |   96 +-
 .../VIVOIndividualTemplateModel.java          |   54 +-
 .../individuallist/VIVOListedIndividual.java  |    6 +-
 .../VIVOIndividualSearchResult.java           |   10 +-
 .../policy/AdvisingRelationshipChecker.java   |    2 +-
 .../vivo/auth/policy/CourseChecker.java       |    2 +-
 .../vivo/auth/policy/GrantChecker.java        |    4 +-
 .../auth/policy/InfoContentEntityChecker.java |    8 +-
 .../vivo/auth/policy/PresentationChecker.java |    2 +-
 .../auth/policy/ProjectOrServiceChecker.java  |    2 +-
 .../policy/SelfEditorRelationshipPolicy.java  |  286 +-
 .../mannlib/vivo/orcid/OrcidContextSetup.java |    4 +-
 .../mannlib/vivo/orcid/OrcidIdDataGetter.java |    6 +-
 .../OrcidAuthAuthenticateHandler.java         |    2 +-
 .../OrcidAuthExternalIdsHandler.java          |    2 +-
 .../controller/OrcidCallbackHandler.java      |    4 +-
 .../controller/OrcidConfirmationState.java    |    4 +-
 .../orcid/controller/OrcidDefaultHandler.java |    6 +-
 .../OrcidIntegrationController.java           |    6 +-
 .../plugin/DCCreatorForDocuments.java         |    6 +-
 .../reasoner/plugin/DCTitleForDocuments.java  |    6 +-
 .../org/vivoweb/webapp/util/ModelUtils.java   |   34 +-
 .../LabelsAcrossContextNodesTest.java         |   20 +-
 .../SelfEditorRelationshipPolicyTest.java     |  896 ++--
 .../SelfEditorRelationshipPolicyTest.n3       |  330 +-
 api/src/test/resources/log4j.properties       |   20 +-
 .../config/example.applicationSetup.n3        |   38 +-
 .../config/example.runtime.properties         |   96 +-
 .../rdf/abox/filegraph/academicDegree.rdf     |    6 +-
 .../rdf/abox/filegraph/us-states.rdf          |    2 +-
 .../rdf/abox/filegraph/validation.n3          |    2 +-
 .../firsttime/classgroups.rdf                 |    2 +-
 .../firsttime/initialSiteConfig.rdf           |    2 +-
 .../firsttime/propertygroups.rdf              |    2 +-
 .../display/everytime/homePageDataGetters.n3  |   10 +-
 .../display/everytime/localeSelectionGUI.n3   |    6 +-
 .../everytime/n3ModelChangePreprocessors.n3   |   12 +-
 .../everytime/orcidInterfaceDataGetters.n3    |    6 +-
 .../searchIndexerConfigurationVivo.n3         |   26 +-
 .../everytime/vivoConceptDataGetters.n3       |   22 +-
 .../display/everytime/vivoListViewConfig.rdf  |   18 +-
 .../everytime/vivoOrganizationDataGetters.n3  |   32 +-
 .../display/everytime/vivoQrCodeDataGetter.n3 |   14 +-
 .../display/everytime/vivoSearchProhibited.n3 |   10 +-
 .../rdf/display/firsttime/PropertyConfig.n3   |   50 +-
 .../display/firsttime/PropertyConfigSupp.n3   |    2 +-
 .../rdf/display/firsttime/aboutPage.n3        |    2 +-
 .../resources/rdf/display/firsttime/menu.n3   |   42 +-
 .../rdf/tbox/filegraph/ontologies.owl         |    6 +-
 .../resources/rdf/tbox/filegraph/vivo.owl     | 1804 ++++----
 .../rdf/tbox/firsttime/vitroAnnotations.n3    |   66 +-
 .../firsttime/initialSiteConfig.rdf           |    2 +-
 .../WEB-INF/classes/log4j.properties          |   10 +-
 .../src/main/webapp/local/css/local.css       |    2 +-
 legacy/config/licenser/licenser.properties    |   68 +-
 legacy/example.build.properties               |  112 +-
 .../rdf/display/firsttime/aboutPage_es_GO.n3  |    2 +-
 .../es_GO/rdf/display/firsttime/menu_es_GO.n3 |    2 +-
 .../freemarker/aboutMapOfScience_es_GO.ftl    |  104 +-
 .../freemarker/mapOfScienceTooltips_es_GO.ftl |    2 +-
 .../themes/wilma/i18n/all_es_GO.properties    |   44 +-
 .../image_file_query.sparql                   |    2 +-
 .../example.acceptance_tests.properties       |   60 +-
 .../suites/MultiLabels/TestMultipleLabels.n3  |   48 +-
 .../ProcessRDFData/ontology_v2.0_Lite.rdf     |    2 +-
 .../suites/SearchBoost/BoostClass.n3          |    4 +-
 .../SearchExclusion/TestSearchExclusion.n3    |   14 +-
 .../suites/ShortViews/shortview_config.n3     |   22 +-
 .../suites/ShortViews/view-browse-faculty.ftl |    2 +-
 .../SparqlQueryApi/EnableSparqlQueryApi.n3    |    4 +-
 .../SparqlUpdateApi/EnableSparqlUpdateApi.n3  |    4 +-
 selenium/test-output/testng.css               |   18 +-
 selenium/test-user-model.owl                  |   18 +-
 .../webapp/WEB-INF/applicationContext.xml     |    2 +-
 .../ontologies/update15to16/askUpdated.sparql |    4 +-
 .../ontologies/update15to16/diff.tab.txt      |    2 +-
 ...opolitical-ver1.1-11-18-11-annotations.rdf |    2 +-
 .../isDefinedBy-1.5-annotations.rdf           |    2 +-
 .../oldAnnotations/vitro-0.7-annotations.rdf  |    2 +-
 .../vivo-core-1.5-annotations.rdf             |    2 +-
 .../geopolitical.tbox.ver1.1-11-18-11.owl     |    2 +-
 .../oldVersion/isDefinedBy-1.5.owl            |    2 +-
 .../update15to16/oldVersion/vivo-bibo-1.5.owl |    2 +-
 .../oldVersion/vivo-fabio-1.5.owl             |    4 +-
 .../additions/AdviseeRole.sparql              |    4 +-
 .../additions/AdvisorRole.sparql              |    4 +-
 .../additions/Editorship.sparql               |   10 +-
 .../additions/LeaderRole.sparql               |    8 +-
 .../additions/MemberRole.sparql               |    8 +-
 .../sparqlConstructs/additions/concept.sparql |    4 +-
 .../additions/grant-pre.sparql                |    6 +-
 .../additions/grantAdmin.sparql               |    8 +-
 .../sparqlConstructs/additions/orcid.sparql   |    6 +-
 .../additions/post/Grant.sparql               |    6 +-
 .../additions/post/awardConferred.sparql      |    4 +-
 .../additions/post/awardedDegree.sparql       |    8 +-
 .../post/contributingAdvising.sparql          |    4 +-
 .../additions/vcard1-0.sparql                 |   14 +-
 .../additions/vcard1-1.sparql                 |   12 +-
 .../additions/vcard1-2.sparql                 |   16 +-
 .../additions/vcard1-3.sparql                 |   16 +-
 .../sparqlConstructs/additions/vcard22.sparql |    8 +-
 .../sparqlConstructs/additions/vcard2a.sparql |    8 +-
 .../sparqlConstructs/additions/vcard2b.sparql |    8 +-
 .../sparqlConstructs/additions/vcard2c.sparql |   10 +-
 .../sparqlConstructs/additions/vcard2d.sparql |   10 +-
 .../sparqlConstructs/additions/vcard2e.sparql |   10 +-
 .../sparqlConstructs/additions/vcard2f.sparql |   10 +-
 .../sparqlConstructs/additions/vcard2g.sparql |   10 +-
 .../sparqlConstructs/additions/vcard2h.sparql |   10 +-
 .../sparqlConstructs/additions/vcard2i.sparql |   10 +-
 .../sparqlConstructs/additions/vcard2j.sparql |   10 +-
 .../sparqlConstructs/additions/vcard3.sparql  |    8 +-
 .../sparqlConstructs/additions/vcard4.sparql  |   10 +-
 .../sparqlConstructs/additions/vcard5.sparql  |    8 +-
 .../sparqlConstructs/additions/vcard6.sparql  |    8 +-
 .../sparqlConstructs/additions/vcard7.sparql  |   10 +-
 .../sparqlConstructs/additions/vcard8.sparql  |   16 +-
 .../sparqlConstructs/additions/vcard9.sparql  |    8 +-
 .../deletions/AdvisingRelationshipDel.sparql  |    8 +-
 .../deletions/AdvisingRelationshipDel2.sparql |    4 +-
 .../deletions/EditorshipDel.sparql            |    6 +-
 .../deletions/conceptDel.sparql               |    4 +-
 .../deletions/grant-pre-del.sparql            |    6 +-
 .../deletions/orcidDel.sparql                 |    6 +-
 .../deletions/post/awardConferredDel.sparql   |    4 +-
 .../deletions/post/awardedDegreeDel.sparql    |    4 +-
 .../deletions/vcardDel.sparql                 |   60 +-
 .../ontologies/update15to16/success.n3        |    2 +-
 .../ontologies/update16to17/askUpdated.sparql |    4 +-
 .../oldAnnotations/additionalHiding.n3        |   16 +-
 .../oldAnnotations/initialTBoxAnnotations.n3  |   18 +-
 .../update16to17/oldVersion/empty.owl         |    2 +-
 .../ontologies/update16to17/success.n3        |    2 +-
 .../ontologies/update17to18/askUpdated.sparql |    4 +-
 .../oldAnnotations/additionalHiding.n3        |   16 +-
 .../oldAnnotations/initialTBoxAnnotations.n3  |   18 +-
 .../update17to18/oldVersion/empty.owl         |    2 +-
 .../ontologies/update17to18/success.n3        |    2 +-
 .../WEB-INF/resources/startup_listeners.txt   |  184 +-
 .../rich-export/address/address.sparql        |    2 +-
 .../address/locationOfAddress.sparql          |    2 +-
 .../rich-export/advising/advisee.sparql       |    2 +-
 .../advising/adviseesDegreeAlt.sparql         |    2 +-
 .../advising/adviseesEducationEndDate.sparql  |    2 +-
 .../adviseesEducationalInsitituionAlt.sparql  |    2 +-
 .../advising/associatedDegree.sparql          |    2 +-
 .../associatedEducationalTraining.sparql      |    2 +-
 .../associatedEducationalTrainingAlt.sparql   |    2 +-
 .../WEB-INF/rich-export/award/award.sparql    |    4 +-
 .../award/conferringOrganization.sparql       |    4 +-
 .../award/sponsoringOrganization.sparql       |    4 +-
 .../rich-export/credential/credential.sparql  |    6 +-
 .../credentialGoverningAuthority.sparql       |    6 +-
 .../credential/eligibleForCredential.sparql   |    4 +-
 .../credential/issuedCredential.sparql        |    6 +-
 .../issuedCredentialExpirationDate.sparql     |    6 +-
 .../issuedCredentialIssueDate.sparql          |    6 +-
 .../issuedCredentialSubjectArea.sparql        |    6 +-
 .../educationalTraining.sparql                |    6 +-
 .../educationalTrainingDegree.sparql          |    6 +-
 .../educationalTrainingEndDate.sparql         |    6 +-
 .../educationalTrainingLocation.sparql        |    6 +-
 .../educationalTrainingOrganization.sparql    |    6 +-
 .../educationalTrainingStartDate.sparql       |    6 +-
 .../rich-export/funding/grantAwardedBy.sparql |   10 +-
 .../WEB-INF/rich-export/funding/grants.sparql |    8 +-
 .../membership/memberRoleIn.sparql            |    2 +-
 .../outreach/outreachRoleIn.sparql            |    2 +-
 .../rich-export/patent/assignee.sparql        |    8 +-
 .../rich-export/patent/inventors.sparql       |    8 +-
 .../WEB-INF/rich-export/patent/patent.sparql  |    4 +-
 .../rich-export/patent/patentFiledDate.sparql |    2 +-
 .../patent/patentIssuedDate.sparql            |    2 +-
 .../position/locationForPosition.sparql       |    6 +-
 .../position/organizationForPosition.sparql   |    6 +-
 .../subOrganizationForPosition.sparql         |    6 +-
 .../superOrganizationForPosition.sparql       |    6 +-
 .../presentation/meetingName.sparql           |    2 +-
 .../presentation/presenterRoleIn.sparql       |    6 +-
 .../publication/associatedJournal.sparql      |    8 +-
 .../rich-export/publication/authors.sparql    |    6 +-
 .../publication/presentedAtEvent.sparql       |    4 +-
 .../presentedAtEventEndDate.sparql            |    4 +-
 .../presentedAtEventLocation.sparql           |    4 +-
 .../presentedAtEventStartDate.sparql          |    4 +-
 .../publication/publication.sparql            |    4 +-
 .../publication/publicationDate.sparql        |    4 +-
 .../publicationPartOfInfoResource.sparql      |    4 +-
 .../publicationReproducedIn.sparql            |    8 +-
 .../publication/publicationStatus.sparql      |    4 +-
 .../publication/publicationURL.sparql         |    4 +-
 .../publication/publisher_variant1.sparql     |   10 +-
 .../publication/publisher_variant2.sparql     |   10 +-
 .../rich-export/teaching/teacherRoleIn.sparql |    2 +-
 .../main/webapp/WEB-INF/springmvc-beans.xml   |    2 +-
 .../visualizations-beans-injection-fm.xml     |  282 +-
 webapp/src/main/webapp/WEB-INF/web.xml        |   10 +-
 .../config/listViewConfig-additionalEmail.xml |    8 +-
 .../config/listViewConfig-adviseeIn.xml       |    2 +-
 .../listViewConfig-dateTimeInterval.xml       |    2 +-
 .../config/listViewConfig-dateTimeValue.xml   |   14 +-
 .../webapp/config/listViewConfig-default.xml  |    6 +-
 .../config/listViewConfig-degreeEarned.xml    |   12 +-
 .../main/webapp/config/listViewConfig-doi.xml |    8 +-
 .../listViewConfig-fauxPropertyDefault.xml    |    6 +-
 .../config/listViewConfig-faxNumber.xml       |    6 +-
 .../webapp/config/listViewConfig-fullName.xml |    6 +-
 .../listViewConfig-grantAdministeredBy.xml    |    2 +-
 .../listViewConfig-hasAssociatedConcept.xml   |   68 +-
 .../config/listViewConfig-hasAttendeeRole.xml |    2 +-
 ...wConfig-hasCoPrincipalInvestigatorRole.xml |    2 +-
 .../config/listViewConfig-hasEditorRole.xml   |   12 +-
 .../listViewConfig-hasInvestigatorRole.xml    |    2 +-
 .../listViewConfig-hasPresenterRole.xml       |   12 +-
 ...iewConfig-hasPrincipalInvestigatorRole.xml |    2 +-
 .../config/listViewConfig-hasReviewerRole.xml |   14 +-
 .../webapp/config/listViewConfig-hasRole.xml  |   22 +-
 ...Config-informationResourceInEditorship.xml |   10 +-
 .../listViewConfig-issuedCredential.xml       |    4 +-
 .../config/listViewConfig-mailingAddress.xml  |   12 +-
 .../webapp/config/listViewConfig-orcidId.xml  |    6 +-
 ...iewConfig-organizationAdministersGrant.xml |    2 +-
 ...listViewConfig-organizationAwardsGrant.xml |    2 +-
 ...listViewConfig-organizationForTraining.xml |   18 +-
 .../config/listViewConfig-preferredTitle.xml  |   10 +-
 .../config/listViewConfig-primaryEmail.xml    |    8 +-
 .../config/listViewConfig-rangeUnion.xml      |    6 +-
 .../config/listViewConfig-relatedRole.xml     |   18 +-
 .../config/listViewConfig-researchAreaOf.xml  |   20 +-
 .../listViewConfig-roleContributesTo.xml      |   26 +-
 .../config/listViewConfig-roleRealizedIn.xml  |   16 +-
 .../webapp/config/listViewConfig-scopusId.xml |   14 +-
 .../config/listViewConfig-telephoneNumber.xml |    8 +-
 .../webapp/config/listViewConfig-webpage.xml  |   18 +-
 webapp/src/main/webapp/css/home-page-maps.css |    2 +-
 .../individual/individual-2column-view.css    |   90 +-
 .../css/individual/individual-quick-view.css  |   40 +-
 .../webapp/css/individual/individual-vivo.css |   20 +-
 .../webapp/css/jquery_plugins/ui.notify.css   |  106 +-
 .../css/visualization/capabilitymap/graph.css |    4 +-
 .../css/visualization/coauthorship/style.css  |  502 +--
 .../visualization/entitycomparison/layout.css |   22 +-
 .../css/visualization/mapofscience/layout.css |   46 +-
 .../css/visualization/personlevel/page.css    |   46 +-
 .../css/visualization/visualization.css       |    6 +-
 .../src/main/webapp/i18n/vivo_all.properties  | 1624 +++----
 .../placeholders/placeholders.properties      |    2 +-
 webapp/src/main/webapp/js/d3.min.js           |    2 +-
 webapp/src/main/webapp/js/homePageMaps.js     |  112 +-
 webapp/src/main/webapp/js/homePageUtils.js    |   52 +-
 .../individual/individualProfilePageType.js   |   28 +-
 .../js/individual/individualQtipBubble.js     |    6 +-
 .../webapp/js/individual/individualUtils.js   |   32 +-
 .../datatable/1.10.12/dataTables.bootstrap.js |    4 +-
 .../1.10.12/dataTables.bootstrap4.js          |    4 +-
 .../datatable/1.10.12/dataTables.material.js  |    4 +-
 .../1.10.12/dataTables.semanticui.js          |    4 +-
 .../datatable/1.10.12/dataTables.uikit.js     |    4 +-
 .../datatable/1.10.12/jquery.dataTables.js    | 3922 ++++++++---------
 .../webapp/js/jquery_plugins/jquery.notify.js |   34 +-
 .../js/jquery_plugins/jquery.truncator.js     |    8 +-
 webapp/src/main/webapp/js/latLongJson.js      |    2 +-
 .../webapp/js/leaflet/dist/leaflet-src.js     |    2 +-
 .../main/webapp/js/leaflet/dist/leaflet.css   |  914 ++--
 .../webapp/js/leaflet/dist/leaflet.ie.css     |  114 +-
 .../js/menupage/processDataGetterUtils.js     |   80 +-
 .../processInternalClassDataGetterContent.js  |  164 +-
 .../visualization/capabilitymap/d3v3.min.js   |    2 +-
 .../visualization/capabilitymap/graph_new.js  |   90 +-
 .../visualization/capabilitymap/jsr_class.js  |   26 +-
 .../coPIship/coPIship-person-level.js         |   50 +-
 .../visualization/coauthorship/AC_OETags.js   |   30 +-
 .../coauthorship/coauthorship-personlevel.js  |   46 +-
 .../js/visualization/dataTables.helper.js     |   24 +-
 .../entitycomparison/constants.js             |   26 +-
 .../entitycomparison/gui-event-manager.js     |  428 +-
 .../jquery_plugins/datatable/demo_table.css   |   10 +-
 .../jquery_plugins/flot/excanvas.js           |   12 +-
 .../flot/jquery.colorhelpers.js               |   26 +-
 .../flot/jquery.flot.crosshair.js             |   20 +-
 .../jquery_plugins/flot/jquery.flot.image.js  |   30 +-
 .../jquery_plugins/flot/jquery.flot.js        |    4 +-
 .../flot/jquery.flot.navigate.js              |   48 +-
 .../flot/jquery.flot.selection.js             |    6 +-
 .../jquery_plugins/flot/jquery.flot.stack.js  |   28 +-
 .../flot/jquery.flot.threshold.js             |   14 +-
 .../jquery_plugins/flot/r293/excanvas.js      |   12 +-
 .../jquery_plugins/flot/r293/jquery.flot.js   |  314 +-
 .../jquery_plugins/jgrowl/jquery.jgrowl.css   |    4 +-
 .../jquery_plugins/jgrowl/jquery.jgrowl.js    |   42 +-
 .../jquery_plugins/jquery-jangle.js           |    2 +-
 .../jquery_plugins/jquery.AutoEllipsis.js     |  194 +-
 .../js/visualization/entitycomparison/util.js |  492 +--
 .../mapofscience/ClassExtendUtils.js          |  128 +-
 .../mapofscience/ColorStrategy.js             |  102 +-
 .../mapofscience/ComparisonDataTableWidget.js |  534 +--
 .../mapofscience/ComparisonScimapWidget.js    |  534 +--
 .../mapofscience/ControlPanel.js              |  336 +-
 .../mapofscience/CustomMarker.js              |  130 +-
 .../mapofscience/CustomScimaps.js             |  162 +-
 .../mapofscience/DataTableWidget.js           |  118 +-
 .../mapofscience/DownloadManager.js           |   98 +-
 .../mapofscience/EntityTablesWidget.js        |   98 +-
 .../mapofscience/ErrorDisplayWidget.js        |   82 +-
 .../js/visualization/mapofscience/GMapAPI.js  |    4 +-
 .../mapofscience/InitializeMap.js             |   38 +-
 .../js/visualization/mapofscience/Marker.js   |  120 +-
 .../mapofscience/MarkerManager.js             |   22 +-
 .../visualization/mapofscience/NumberUtils.js |   30 +-
 .../js/visualization/mapofscience/Polygon.js  |   10 +-
 .../mapofscience/ScimapWidget.js              |   60 +-
 .../mapofscience/SimpleDataTableWidget.js     |  332 +-
 .../visualization/mapofscience/SizeCoding.js  |  158 +-
 .../js/visualization/mapofscience/Tooltip.js  |  200 +-
 .../mapofscience/VisCommonControl.js          |   16 +-
 .../mapofscience/VisModeControllers.js        |   16 +-
 .../visualization/personlevel/person-level.js |   92 +-
 .../main/webapp/js/visualization/sparkline.js |   10 +-
 .../visualization-helper-functions.js         |   22 +-
 .../freemarker/body/harvester/fileharvest.ftl |  102 +-
 .../individual--foaf-organization.ftl         |    4 +-
 .../individual--foaf-person-2column.ftl       |   36 +-
 .../individual--foaf-person-quickview.ftl     |   34 +-
 .../individual/individual--foaf-person.ftl    |   30 +-
 .../body/individual/individual-openSocial.ftl |    4 +-
 .../freemarker/body/individual/individual.ftl |    8 +-
 .../manageLabelsForIndividualAddForm.ftl      |   22 +-
 .../freemarker/body/menupage/publications.ftl |    8 +-
 .../freemarker/body/orcid/orcidConfirm.ftl    |   22 +-
 .../individual-affiliated-departments.ftl     |    4 +-
 .../individual-affiliated-dept-details.ftl    |    2 +-
 ...individual-affiliated-res-area-details.ftl |    2 +-
 .../individual-affiliated-research-areas.ftl  |    6 +-
 .../individual-contactInfo-2column.ftl        |   18 +-
 .../individual/individual-contactInfo.ftl     |   12 +-
 .../individual-dept-active-grants.ftl         |    2 +-
 .../individual-dept-res-area-details.ftl      |    2 +-
 .../individual/individual-geographicFocus.ftl |    8 +-
 .../individual/individual-iconControls.ftl    |    8 +-
 .../individual/individual-orcidInterface.ftl  |   12 +-
 .../individual/individual-overview.ftl        |    2 +-
 .../individual/individual-positions.ftl       |    4 +-
 .../individual/individual-qrCodeGenerator.ftl |   10 +-
 .../individual/individual-researchAreas.ftl   |   10 +-
 .../individual-visualizationFoafPerson.ftl    |   38 +-
 .../individual-visualizationQuickView.ftl     |   18 +-
 .../individual-vocabularyService.ftl          |   10 +-
 .../individual/individual-webpage.ftl         |    4 +-
 .../individual/propStatement-adviseeIn.ftl    |    8 +-
 .../individual/propStatement-advisorIn.ftl    |    6 +-
 .../propStatement-authorInAuthorship.ftl      |    6 +-
 .../individual/propStatement-awardOrHonor.ftl |    8 +-
 .../propStatement-awardOrHonorGiven.ftl       |   10 +-
 .../propStatement-dateTimeInterval.ftl        |    6 +-
 .../propStatement-dateTimeValue.ftl           |    6 +-
 .../individual/propStatement-default.ftl      |    8 +-
 .../individual/propStatement-degreeEarned.ftl |    8 +-
 .../partials/individual/propStatement-doi.ftl |    6 +-
 .../individual/propStatement-editorship.ftl   |    8 +-
 .../propStatement-educationalTraining.ftl     |   10 +-
 .../individual/propStatement-emailAddress.ftl |   10 +-
 .../individual/propStatement-fullName.ftl     |   10 +-
 .../propStatement-grantAdministeredBy.ftl     |    8 +-
 .../propStatement-hasAssociatedConcept.ftl    |   36 +-
 .../propStatement-hasAttendeeRole.ftl         |   10 +-
 .../propStatement-hasEditReviewRole.ftl       |    4 +-
 .../propStatement-hasInvestigatorRole.ftl     |   14 +-
 .../propStatement-hasPresenterRole.ftl        |   10 +-
 .../individual/propStatement-hasRole.ftl      |   12 +-
 ...tement-informationResourceInAuthorship.ftl |    4 +-
 ...tement-informationResourceInEditorship.ftl |    4 +-
 .../propStatement-issuedCredential.ftl        |   10 +-
 .../propStatement-mailingAddress.ftl          |   22 +-
 .../individual/propStatement-orcidId.ftl      |    6 +-
 ...Statement-organizationAdministersGrant.ftl |    8 +-
 .../propStatement-organizationAwardsGrant.ftl |    8 +-
 .../propStatement-organizationForPosition.ftl |    6 +-
 .../propStatement-organizationForTraining.ftl |    6 +-
 .../propStatement-personInPosition.ftl        |    8 +-
 .../propStatement-phoneFaxNumber.ftl          |   10 +-
 .../propStatement-preferredTitle.ftl          |    8 +-
 .../propStatement-publicationVenueFor.ftl     |    8 +-
 .../individual/propStatement-publisherOf.ftl  |    8 +-
 .../individual/propStatement-relatedRole.ftl  |   10 +-
 .../propStatement-researchAreaOf.ftl          |    4 +-
 .../individual/propStatement-scopusId.ftl     |    6 +-
 .../propStatement-webpage-quickview.ftl       |   24 +-
 .../individual/propStatement-webpage.ftl      |    8 +-
 .../body/search/search-csvResults.ftl         |    2 +-
 .../body/search/search-xmlResults.ftl         |   10 +-
 .../edit/forms/addAssociatedConcept.ftl       |   46 +-
 .../edit/forms/addAttendeeRoleToPerson.ftl    |   64 +-
 .../forms/addAuthorsToInformationResource.ftl |   26 +-
 .../edit/forms/addClinicalRoleToPerson.ftl    |    2 +-
 ...nceptThroughObjectPropertyAutoComplete.ftl |   32 +-
 ...dConceptThroughObjectPropertyCreateNew.ftl |   26 +-
 .../addConceptThroughObjectPropertyForm.ftl   |    8 +-
 .../edit/forms/addEditWebpageForm.ftl         |   22 +-
 .../edit/forms/addEditorRoleToPerson.ftl      |   66 +-
 .../forms/addEditorsToInformationResource.ftl |   22 +-
 .../edit/forms/addEditorshipToPerson.ftl      |   36 +-
 .../edit/forms/addFullNameToPerson.ftl        |   18 +-
 .../edit/forms/addGrantRoleToPerson.ftl       |   18 +-
 .../edit/forms/addHeadOfRoleToPerson.ftl      |   62 +-
 .../edit/forms/addMemberRoleToPerson.ftl      |    2 +-
 .../edit/forms/addOrcidIdToPerson.ftl         |   16 +-
 .../edit/forms/addPresenterRoleToPerson.ftl   |  406 +-
 .../edit/forms/addPublicationToPerson.ftl     |   46 +-
 .../edit/forms/addResearcherRoleToPerson.ftl  |   68 +-
 .../edit/forms/addRoleToPersonTwoStage.ftl    |   32 +-
 .../edit/forms/addTeacherRoleToPerson.ftl     |   70 +-
 .../edit/forms/addUserDefinedConcept.ftl      |  156 +-
 .../edit/forms/autoCompleteDataPropForm.ftl   |  174 +-
 .../freemarker/edit/forms/css/addConcept.css  |   10 +-
 .../edit/forms/css/autocomplete.css           |    2 +-
 .../edit/forms/css/manageDragDropList.css     |    6 +-
 .../edit/forms/dateTimeValueForm.ftl          |   18 +-
 .../forms/defaultAddMissingIndividualForm.ftl |   12 +-
 .../edit/forms/grantAdministeredBy.ftl        |   18 +-
 .../edit/forms/grantHasContributor.ftl        |   32 +-
 .../forms/institutionalInternalClassForm.ftl  |   28 +-
 .../js/addAuthorsToInformationResource.js     |  326 +-
 .../freemarker/edit/forms/js/addConcept.js    |   98 +-
 .../js/addEditorsToInformationResource.js     |  292 +-
 .../edit/forms/js/addOrcidIdToPersonUtils.js  |   20 +-
 .../edit/forms/js/adviseeRelationshipUtils.js |   42 +-
 .../edit/forms/js/advisorRelationshipUtils.js |   42 +-
 .../edit/forms/js/awardReceiptUtils.js        |   26 +-
 .../js/customFormWithDataAutocomplete.js      |  884 ++--
 .../defaultAddMissingIndividualFormUtils.js   |   16 +-
 .../edit/forms/js/educationalTrainingUtils.js |   14 +-
 .../edit/forms/js/grantHasContributorUtils.js |   30 +-
 .../edit/forms/js/issuedCredentialUtils.js    |   18 +-
 .../edit/forms/js/mailingAddressUtils.js      |   24 +-
 .../edit/forms/js/manageHideShowStatus.js     |   38 +-
 .../forms/js/manageWebpagesForIndividual.js   |  128 +-
 .../edit/forms/js/newIndividualFormUtils.js   |   16 +-
 .../edit/forms/js/orgHasPositionUtils.js      |   30 +-
 .../forms/js/organizationForTrainingUtils.js  |   38 +-
 .../forms/js/projectHasParticipantUtils.js    |   30 +-
 .../edit/forms/js/publicationToPersonUtils.js |  106 +-
 .../edit/forms/manageGrantsForIndividual.ftl  |   14 +-
 .../forms/managePeopleForOrganization.ftl     |   14 +-
 .../forms/managePublicationsForIndividual.ftl |   14 +-
 .../forms/manageWebpagesForIndividual.ftl     |   26 +-
 .../menuManagement--classIntersections.ftl    |   30 +-
 .../edit/forms/newIndividualForm.ftl          |   14 +-
 .../forms/organizationAdministersGrant.ftl    |   18 +-
 .../edit/forms/organizationForTraining.ftl    |   64 +-
 .../forms/organizationHasPositionHistory.ftl  |   40 +-
 ...geManagement--browseClassGroupsScripts.ftl |   10 +-
 .../pageManagement--classIntersections.ftl    |   32 +-
 .../pageManagement--customDataScript.ftl      |   40 +-
 .../forms/personHasAdviseeRelationship.ftl    |   52 +-
 .../forms/personHasAdvisorRelationship.ftl    |   50 +-
 .../edit/forms/personHasAwardOrHonor.ftl      |   30 +-
 .../forms/personHasEducationalTraining.ftl    |   86 +-
 .../edit/forms/personHasEmailAddress.ftl      |   16 +-
 .../edit/forms/personHasIssuedCredential.ftl  |   54 +-
 .../edit/forms/personHasPositionHistory.ftl   |   46 +-
 .../edit/forms/personHasPreferredTitle.ftl    |   16 +-
 .../edit/forms/projectHasParticipant.ftl      |   28 +-
 .../edit/forms/subjectHasMailingAddress.ftl   |   24 +-
 .../edit/forms/subjectHasPhoneFaxNumber.ftl   |   16 +-
 .../freemarker/lib/lib-home-page.ftl          |   20 +-
 .../freemarker/lib/lib-microformats.ftl       |    2 +-
 .../freemarker/lib/lib-vivo-form.ftl          |    4 +-
 .../freemarker/lib/lib-vivo-properties.ftl    |    6 +-
 .../coAuthorshipDynamicActivator.ftl          |   10 +-
 .../coAuthorshipSparklineContent.ftl          |  154 +-
 .../copi/coInvestigationDynamicActivator.ftl  |    2 +-
 .../copi/coInvestigationSparklineContent.ftl  |  170 +-
 .../entitycomparison/entityComparisonBody.ftl |   64 +-
 .../entityComparisonErrorCommonBody.ftl       |    6 +-
 .../entityComparisonOnGrantsStandalone.ftl    |   10 +-
 ...tityComparisonOnPublicationsStandalone.ftl |   10 +-
 .../entityComparisonSetup.ftl                 |   30 +-
 .../personGrantCountDynamicActivator.ftl      |    2 +-
 .../grant/personGrantSparklineContent.ftl     |  176 +-
 .../mapOfScience/aboutMapOfScience.ftl        |   54 +-
 .../mapOfScience/mapOfScienceSetup.ftl        |   12 +-
 .../mapOfScience/mapOfScienceStandalone.ftl   |   20 +-
 .../mapOfScience/mapOfScienceTooltips.ftl     |   32 +-
 .../regenerateConstructedModels.ftl           |   16 +-
 .../personlevel/coAuthorPersonLevelD3.ftl     |   58 +-
 .../personlevel/coPIPersonLevelD3.ftl         |   56 +-
 ...personPublicationCountDynamicActivator.ftl |   38 +-
 .../personPublicationCountNoSparkline.ftl     |   46 +-
 .../personPublicationSparklineContent.ftl     |  138 +-
 .../freemarker/visualization/tools.ftl        |    2 +-
 .../visualization/visualizationError.ftl      |   16 +-
 .../bootstrap/css/bootstrap-theme.min.css     |    2 +-
 .../bootstrap/css/bootstrap.min.css           |    2 +-
 .../tenderfoot/bootstrap/js/bootstrap.min.js  |    2 +-
 .../themes/tenderfoot/bootstrap/js/npm.js     |    2 +-
 .../tenderfoot/css/navbar-breakpoint.css      |    2 +-
 .../themes/tenderfoot/css/page-browse.css     |    2 +-
 .../themes/tenderfoot/css/page-individual.css |    2 +-
 .../webapp/themes/tenderfoot/css/reset.css    |  226 +-
 .../webapp/themes/tenderfoot/css/screen.css   |   68 +-
 .../themes/tenderfoot/css/tenderfoot.css      |  728 +--
 .../themes/tenderfoot/i18n/all.properties     |    2 +-
 .../individual/individual--foaf-person.ftl    |  378 +-
 .../templates/body/individual/scratch.ftl     |   66 +-
 .../individual/individual-positions.ftl       |    4 +-
 .../individual-visualizationFoafPerson.ftl    |    8 +-
 .../tenderfoot/templates/page/page-home.ftl   |  298 +-
 .../themes/tenderfoot/templates/page/page.ftl |   76 +-
 .../templates/page/partials/footer.ftl        |   82 +-
 .../templates/page/partials/head.ftl          |   68 +-
 .../templates/page/partials/headScripts.ftl   |   72 +-
 .../templates/page/partials/identity.ftl      |  110 +-
 .../templates/page/partials/menu.ftl          |   68 +-
 .../templates/page/partials/search.ftl        |   34 +-
 .../themes/wilma/css/openSocial/gadgets.css   |  234 +-
 .../main/webapp/themes/wilma/css/reset.css    |   28 +-
 .../main/webapp/themes/wilma/css/screen.css   |   14 +-
 .../main/webapp/themes/wilma/css/wilma.css    |  122 +-
 .../webapp/themes/wilma/i18n/all.properties   |    2 +-
 .../webapp/themes/wilma/templates/footer.ftl  |    6 +-
 .../themes/wilma/templates/gadgetDetails.ftl  |    4 +-
 .../themes/wilma/templates/gadgetLogin.ftl    |    6 +-
 .../wilma/templates/googleAnalytics.ftl       |   22 +-
 .../webapp/themes/wilma/templates/head.ftl    |    8 +-
 .../themes/wilma/templates/identity.ftl       |   12 +-
 .../templates/individual--foaf-person.ftl     |   54 +-
 .../webapp/themes/wilma/templates/menu.ftl    |    4 +-
 .../themes/wilma/templates/page-home.ftl      |   36 +-
 .../webapp/themes/wilma/templates/page.ftl    |   10 +-
 .../webapp/themes/wilma/templates/search.ftl  |    4 +-
 685 files changed, 26784 insertions(+), 26784 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
index e6ebe67a29..0a61876de0 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
@@ -1,397 +1,397 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.semservices.service.impl;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import edu.cornell.mannlib.semservices.bo.Concept;
-import edu.cornell.mannlib.semservices.service.ExternalConceptService;
-import edu.cornell.mannlib.semservices.util.SKOSUtils;
-import edu.cornell.mannlib.semservices.util.XMLUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
-import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
-
-public class AgrovocService implements ExternalConceptService {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-	private final String schemeUri = "http://aims.fao.org/aos/agrovoc/agrovocScheme";
-	private final String ontologyName = "agrovoc";
-	private final String format = "SKOS";
-	private final String lang = "en";
-	private final String searchMode = "starts with";//Used to be Exact Match, or exact word or starts with
-	protected final String dbpedia_endpoint = " http://dbpedia.org/sparql";
-	// URL to get all the information for a concept
-	
-	protected final String conceptSkosMosBase = "http://agrovoc.uniroma2.it/agrovoc/rest/v1/";
-	protected final String conceptsSkosMosSearch = conceptSkosMosBase + "search?";
-	protected final String conceptSkosMosURL = conceptSkosMosBase + "data?";
-	@Override
-	public List<Concept> getConcepts(String term) throws Exception {
-		List<Concept> conceptList = new ArrayList<>();
-		
-		//For the RDF webservices mechanism, utilize the following
-		/*
-		String result = getTermExpansion(this.ontologyName, term,
-				this.searchMode, this.format, this.lang);
-		
-		// return empty conceptList if conceptUri is empty
-		if (StringUtils.isEmpty(result)) {
-			return conceptList;
-		}
-
-		// Get the list of the concept URIs in the RDF
-		List<String> conceptUris = getConceptURIsListFromRDF(result);
-		*/
-		
-		//For the SKOSMos search mechanism, utilize this instead
-		String result = getSKOSMosSearchResults(term, this.lang);
-		List<String> conceptUris = getConceptURIsListFromSkosMosResult(result);
-		if (conceptUris.size() == 0)
-			return conceptList;
-		int conceptCounter = 0;
-		
-		HashSet<String> encounteredURI = new HashSet<>();
-		
-		// Loop through each of these URIs and load using the SKOSManager
-		for (String conceptUri : conceptUris) {
-			conceptCounter++;
-			if (StringUtils.isEmpty(conceptUri)) {
-				// If the conceptURI is empty, keep going
-				continue;
-			}
-			if(encounteredURI.contains(conceptUri)) {
-				//If we have already encountered this concept URI, do not redisplay or reprocess
-				continue;
-			}
-			encounteredURI.add(conceptUri);
-
-			// Test and see if the URI is valid
-			URI uri = null;
-			try {
-				uri = new URI(conceptUri);
-			} catch (URISyntaxException e) {
-				logger.error("Error occurred with creating the URI ", e);
-				continue;
-			}
-			// Returns concept information in the format specified, which is
-			// currently XML
-			// Utilizing Agrovoc's getConceptInfo returns alternate and
-			// preferred labels but
-			// none of the exact match or close match descriptions
-			String bestMatch = "false";
-			//Assume the first result is considered the 'best match'
-			//Although that is not something we are actually retrieving from the service itself explicitly
-			if(conceptCounter == 1) {
-				bestMatch = "true";
-			}
-			Concept c = this.createConcept(bestMatch, conceptUri);
-			if (c != null) {
-				// Get definition from dbpedia references stored in the close
-				// Match list
-				List<String> closeMatches = c.getCloseMatchURIList();
-				for (String closeMatch : closeMatches) {
-
-					if (closeMatch.startsWith("http://dbpedia.org")) {
-						try {
-							String description = getDbpediaDescription(closeMatch);
-							c.setDefinition(description);
-						} catch (Exception ex) {
-							logger.error("An error occurred in the process of retrieving dbpedia description", ex);
-						}
-					}
-				}
-				conceptList.add(c);
-			}
-		}
-
-		return conceptList;
-	}
-
-
-
-
-
-
-	public List<Concept> processResults(String term) throws Exception {
-		return getConcepts(term);
-	}
-
-	public Concept createConcept(String bestMatch, String skosConceptURI) {
-
-		Concept concept = new Concept();
-		concept.setUri(skosConceptURI);
-		concept.setConceptId(stripConceptId(skosConceptURI));
-		concept.setBestMatch(bestMatch);
-		concept.setDefinedBy(schemeUri);
-		concept.setSchemeURI(this.schemeUri);
-		concept.setType("");
-
-		String encodedURI = URLEncoder.encode(skosConceptURI);
-		String encodedFormat = URLEncoder.encode("application/rdf+xml");
-		String url = conceptSkosMosURL + "uri=" + encodedURI + "&format="
-				+ encodedFormat;
-
-		// Utilize the XML directly instead of the SKOS API
-		try {
-
-			concept = SKOSUtils
-					.createConceptUsingXMLFromURL(concept, url, "en", false);
-
-		} catch (Exception ex) {
-			logger.debug("Error occurred for creating concept "
-					+ skosConceptURI, ex);
-			return null;
-		}
-
-		return concept;
-	}
-
-	public List<Concept> getConceptsByURIWithSparql(String uri)
-			throws Exception {
-		// deprecating this method...just return an empty list
-		List<Concept> conceptList = new ArrayList<>();
-		return conceptList;
-	}
-
-	protected String getAgrovocTermCode(String rdf) throws Exception {
-		String termcode = "";
-		try {
-			Document doc = XMLUtils.parse(rdf);
-			NodeList nodes = doc.getElementsByTagName("hasCodeAgrovoc");
-			if (nodes.item(0) != null) {
-				Node node = nodes.item(0);
-				termcode = node.getTextContent();
-			}
-
-		} catch (SAXException | IOException | ParserConfigurationException e) {
-			// e.printStackTrace();
-			throw e;
-		}
-		return termcode;
-	}
-
-	protected String getConceptURIFromRDF(String rdf) {
-		String conceptUri = "";
-		try {
-			Document doc = XMLUtils.parse(rdf);
-			NodeList nodes = doc.getElementsByTagName("skos:Concept");
-			Node node = nodes.item(0);
-
-			NamedNodeMap attrs = node.getAttributes();
-			Attr idAttr = (Attr) attrs.getNamedItem("rdf:about");
-			conceptUri = idAttr.getTextContent();
-		} catch (IOException | ParserConfigurationException | SAXException e) {
-			e.printStackTrace();
-			System.err.println("rdf: " + rdf);
-		}
-		return conceptUri;
-
-	}
-
-	// When utilizing the getTermExpansion method, will get a list of URIs back
-	// and not just one URI
-	protected List<String> getConceptURIsListFromRDF(String rdf) {
-		List<String> conceptUris = new ArrayList<>();
-		try {
-			Document doc = XMLUtils.parse(rdf);
-				NodeList nodes = doc.getElementsByTagName("skos:Concept");
-				int numberNodes = nodes.getLength();
-				int n;
-				for (n = 0; n < numberNodes; n++) {
-					Node node = nodes.item(n);
-					NamedNodeMap attrs = node.getAttributes();
-					Attr idAttr = (Attr) attrs.getNamedItem("rdf:about");
-					String conceptUri = idAttr.getTextContent();
-					conceptUris.add(conceptUri);
-				}
-
-			
-		} catch (IOException | ParserConfigurationException | SAXException e) {
-			e.printStackTrace();
-			System.err.println("rdf: " + rdf);
-		}
-		return conceptUris;
-
-	}
-
-	protected String getDbpediaDescription(String uri) throws Exception {
-		String descriptionSource = " (Source: DBpedia)";
-		String description = "";
-		String qs = ""
-				+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
-				+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
-				+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/> \n"
-				+ "PREFIX dbpedia-owl: <http://dbpedia.org/ontology/>\n"
-				+ "SELECT DISTINCT ?description WHERE { \n" + "<" + uri
-				+ "> rdfs:comment ?description . \n"
-				+ "FILTER (LANG(?description)='en' ) \n" + "}";
-		// System.out.println(qs);
-		List<HashMap> resultList = new ArrayList<>();
-		QueryExecution qexec = null;
-		try {
-
-			Query query = QueryFactory.create(qs);
-			qexec = QueryExecutionFactory.sparqlService(this.dbpedia_endpoint, query);
-			qexec.setTimeout(5000, TimeUnit.MILLISECONDS);
-			resultList = new ArrayList<>();
-			ResultSet resultSet = qexec.execSelect();
-			int resultSetSize = 0;
-			while (resultSet.hasNext()) {
-				resultSetSize++;
-				QuerySolution solution = resultSet.nextSolution();
-				Iterator varnames = solution.varNames();
-				HashMap<String, String> hm = new HashMap<>();
-				while (varnames.hasNext()) {
-					String name = (String) varnames.next();
-					RDFNode rdfnode = solution.get(name);
-					// logger.info("rdf node name, type: "+ name
-					// +", "+getRDFNodeType(rdfnode));
-					if (rdfnode.isLiteral()) {
-						Literal literal = rdfnode.asLiteral();
-						String nodeval = literal.getString();
-						hm.put(name, nodeval);
-					} else if (rdfnode.isResource()) {
-						Resource resource = rdfnode.asResource();
-						String nodeval = resource.toString();
-						hm.put(name, nodeval);
-					}
-				}
-				resultList.add(hm);
-			}
-			description = "";
-			for (HashMap map : resultList) {
-				if (map.containsKey("description")) {
-					description = (String) map.get("description");
-				}
-			}
-		} catch (Exception ex) {
-			throw ex;
-		}
-		// Adding source so it is clear that this description comes from DBPedia
-		return description + descriptionSource;
-	}
-
-	/**
-	 * @param uri The URI
-	 */
-	protected String stripConceptId(String uri) {
-		String conceptId = "";
-		int lastslash = uri.lastIndexOf('/');
-		conceptId = uri.substring(lastslash + 1, uri.length());
-		return conceptId;
-	}
-
-	/**
-	 * @param str The String
-	 */
-	protected String extractConceptId(String str) {
-		try {
-			return str.substring(1, str.length() - 1);
-		} catch (Exception ex) {
-			return "";
-		}
-	}
-
-	/**
-	 * The code here utilizes the SKOSMOS REST API for Agrovoc
-	 * This returns JSON LD so we would parse JSON instead of RDF
-	 * The code above can still be utilized if we need to employ the web services directly
-	 */
-	//Get search results for a particular term and language code
-		private String getSKOSMosSearchResults(String term, String lang) {
-			String urlEncodedTerm = URLEncoder.encode(term); 
-			//Utilize 'starts with' using the * operator at the end
-			String searchUrlString = this.conceptsSkosMosSearch + "query=" + urlEncodedTerm + "*" + "&lang=" + lang;
-			URL searchURL = null;
-			try {
-				searchURL = new URL(searchUrlString);
-			} catch (Exception e) {
-				logger.error("Exception occurred in instantiating URL for "
-						+ searchUrlString, e);
-				// If the url is having trouble, just return null for the concept
-				return null;
-			}
-			
-			String results = null;
-			try {
-
-				StringWriter sw = new StringWriter();
-
-				BufferedReader in = new BufferedReader(new InputStreamReader(
-						searchURL.openStream()));
-				String inputLine;
-				while ((inputLine = in.readLine()) != null) {
-					sw.write(inputLine);
-				}
-				in.close();
-
-				results = sw.toString();
-				logger.debug(results);
-			} catch (Exception ex) {
-				logger.error("Error occurred in getting concept from the URL "
-						+ searchUrlString, ex);
-				return null;
-			}
-			return results;
-			
-		}
-		
-		//JSON-LD array
-		private List<String> getConceptURIsListFromSkosMosResult(String results) {
-			List<String> conceptURIs = new ArrayList<>();
-			ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results);
-			//Format should be: { ..."results":["uri":uri...]
-			if (json.has("results")) {
-				ArrayNode jsonArray = (ArrayNode) json.get("results");
-				int numberResults = jsonArray.size();
-				int i;
-				for(i = 0; i < numberResults; i++) {
-					ObjectNode jsonObject = (ObjectNode) jsonArray.get(i);
-					if(jsonObject.has("uri")) {
-						conceptURIs.add(jsonObject.get("uri").asText());
-					}
-				}
-			}
-			return conceptURIs;
-		}
-
-		
-		
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.semservices.service.impl;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import edu.cornell.mannlib.semservices.bo.Concept;
+import edu.cornell.mannlib.semservices.service.ExternalConceptService;
+import edu.cornell.mannlib.semservices.util.SKOSUtils;
+import edu.cornell.mannlib.semservices.util.XMLUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
+import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
+
+public class AgrovocService implements ExternalConceptService {
+
+	protected final Log logger = LogFactory.getLog(getClass());
+	private final String schemeUri = "http://aims.fao.org/aos/agrovoc/agrovocScheme";
+	private final String ontologyName = "agrovoc";
+	private final String format = "SKOS";
+	private final String lang = "en";
+	private final String searchMode = "starts with";//Used to be Exact Match, or exact word or starts with
+	protected final String dbpedia_endpoint = " http://dbpedia.org/sparql";
+	// URL to get all the information for a concept
+
+	protected final String conceptSkosMosBase = "http://agrovoc.uniroma2.it/agrovoc/rest/v1/";
+	protected final String conceptsSkosMosSearch = conceptSkosMosBase + "search?";
+	protected final String conceptSkosMosURL = conceptSkosMosBase + "data?";
+	@Override
+	public List<Concept> getConcepts(String term) throws Exception {
+		List<Concept> conceptList = new ArrayList<>();
+
+		//For the RDF webservices mechanism, utilize the following
+		/*
+		String result = getTermExpansion(this.ontologyName, term,
+				this.searchMode, this.format, this.lang);
+
+		// return empty conceptList if conceptUri is empty
+		if (StringUtils.isEmpty(result)) {
+			return conceptList;
+		}
+
+		// Get the list of the concept URIs in the RDF
+		List<String> conceptUris = getConceptURIsListFromRDF(result);
+		*/
+
+		//For the SKOSMos search mechanism, utilize this instead
+		String result = getSKOSMosSearchResults(term, this.lang);
+		List<String> conceptUris = getConceptURIsListFromSkosMosResult(result);
+		if (conceptUris.size() == 0)
+			return conceptList;
+		int conceptCounter = 0;
+
+		HashSet<String> encounteredURI = new HashSet<>();
+
+		// Loop through each of these URIs and load using the SKOSManager
+		for (String conceptUri : conceptUris) {
+			conceptCounter++;
+			if (StringUtils.isEmpty(conceptUri)) {
+				// If the conceptURI is empty, keep going
+				continue;
+			}
+			if(encounteredURI.contains(conceptUri)) {
+				//If we have already encountered this concept URI, do not redisplay or reprocess
+				continue;
+			}
+			encounteredURI.add(conceptUri);
+
+			// Test and see if the URI is valid
+			URI uri = null;
+			try {
+				uri = new URI(conceptUri);
+			} catch (URISyntaxException e) {
+				logger.error("Error occurred with creating the URI ", e);
+				continue;
+			}
+			// Returns concept information in the format specified, which is
+			// currently XML
+			// Utilizing Agrovoc's getConceptInfo returns alternate and
+			// preferred labels but
+			// none of the exact match or close match descriptions
+			String bestMatch = "false";
+			//Assume the first result is considered the 'best match'
+			//Although that is not something we are actually retrieving from the service itself explicitly
+			if(conceptCounter == 1) {
+				bestMatch = "true";
+			}
+			Concept c = this.createConcept(bestMatch, conceptUri);
+			if (c != null) {
+				// Get definition from dbpedia references stored in the close
+				// Match list
+				List<String> closeMatches = c.getCloseMatchURIList();
+				for (String closeMatch : closeMatches) {
+
+					if (closeMatch.startsWith("http://dbpedia.org")) {
+						try {
+							String description = getDbpediaDescription(closeMatch);
+							c.setDefinition(description);
+						} catch (Exception ex) {
+							logger.error("An error occurred in the process of retrieving dbpedia description", ex);
+						}
+					}
+				}
+				conceptList.add(c);
+			}
+		}
+
+		return conceptList;
+	}
+
+
+
+
+
+
+	public List<Concept> processResults(String term) throws Exception {
+		return getConcepts(term);
+	}
+
+	public Concept createConcept(String bestMatch, String skosConceptURI) {
+
+		Concept concept = new Concept();
+		concept.setUri(skosConceptURI);
+		concept.setConceptId(stripConceptId(skosConceptURI));
+		concept.setBestMatch(bestMatch);
+		concept.setDefinedBy(schemeUri);
+		concept.setSchemeURI(this.schemeUri);
+		concept.setType("");
+
+		String encodedURI = URLEncoder.encode(skosConceptURI);
+		String encodedFormat = URLEncoder.encode("application/rdf+xml");
+		String url = conceptSkosMosURL + "uri=" + encodedURI + "&format="
+				+ encodedFormat;
+
+		// Utilize the XML directly instead of the SKOS API
+		try {
+
+			concept = SKOSUtils
+					.createConceptUsingXMLFromURL(concept, url, "en", false);
+
+		} catch (Exception ex) {
+			logger.debug("Error occurred for creating concept "
+					+ skosConceptURI, ex);
+			return null;
+		}
+
+		return concept;
+	}
+
+	public List<Concept> getConceptsByURIWithSparql(String uri)
+			throws Exception {
+		// deprecating this method...just return an empty list
+		List<Concept> conceptList = new ArrayList<>();
+		return conceptList;
+	}
+
+	protected String getAgrovocTermCode(String rdf) throws Exception {
+		String termcode = "";
+		try {
+			Document doc = XMLUtils.parse(rdf);
+			NodeList nodes = doc.getElementsByTagName("hasCodeAgrovoc");
+			if (nodes.item(0) != null) {
+				Node node = nodes.item(0);
+				termcode = node.getTextContent();
+			}
+
+		} catch (SAXException | IOException | ParserConfigurationException e) {
+			// e.printStackTrace();
+			throw e;
+		}
+		return termcode;
+	}
+
+	protected String getConceptURIFromRDF(String rdf) {
+		String conceptUri = "";
+		try {
+			Document doc = XMLUtils.parse(rdf);
+			NodeList nodes = doc.getElementsByTagName("skos:Concept");
+			Node node = nodes.item(0);
+
+			NamedNodeMap attrs = node.getAttributes();
+			Attr idAttr = (Attr) attrs.getNamedItem("rdf:about");
+			conceptUri = idAttr.getTextContent();
+		} catch (IOException | ParserConfigurationException | SAXException e) {
+			e.printStackTrace();
+			System.err.println("rdf: " + rdf);
+		}
+		return conceptUri;
+
+	}
+
+	// When utilizing the getTermExpansion method, will get a list of URIs back
+	// and not just one URI
+	protected List<String> getConceptURIsListFromRDF(String rdf) {
+		List<String> conceptUris = new ArrayList<>();
+		try {
+			Document doc = XMLUtils.parse(rdf);
+				NodeList nodes = doc.getElementsByTagName("skos:Concept");
+				int numberNodes = nodes.getLength();
+				int n;
+				for (n = 0; n < numberNodes; n++) {
+					Node node = nodes.item(n);
+					NamedNodeMap attrs = node.getAttributes();
+					Attr idAttr = (Attr) attrs.getNamedItem("rdf:about");
+					String conceptUri = idAttr.getTextContent();
+					conceptUris.add(conceptUri);
+				}
+
+
+		} catch (IOException | ParserConfigurationException | SAXException e) {
+			e.printStackTrace();
+			System.err.println("rdf: " + rdf);
+		}
+		return conceptUris;
+
+	}
+
+	protected String getDbpediaDescription(String uri) throws Exception {
+		String descriptionSource = " (Source: DBpedia)";
+		String description = "";
+		String qs = ""
+				+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
+				+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
+				+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/> \n"
+				+ "PREFIX dbpedia-owl: <http://dbpedia.org/ontology/>\n"
+				+ "SELECT DISTINCT ?description WHERE { \n" + "<" + uri
+				+ "> rdfs:comment ?description . \n"
+				+ "FILTER (LANG(?description)='en' ) \n" + "}";
+		// System.out.println(qs);
+		List<HashMap> resultList = new ArrayList<>();
+		QueryExecution qexec = null;
+		try {
+
+			Query query = QueryFactory.create(qs);
+			qexec = QueryExecutionFactory.sparqlService(this.dbpedia_endpoint, query);
+			qexec.setTimeout(5000, TimeUnit.MILLISECONDS);
+			resultList = new ArrayList<>();
+			ResultSet resultSet = qexec.execSelect();
+			int resultSetSize = 0;
+			while (resultSet.hasNext()) {
+				resultSetSize++;
+				QuerySolution solution = resultSet.nextSolution();
+				Iterator varnames = solution.varNames();
+				HashMap<String, String> hm = new HashMap<>();
+				while (varnames.hasNext()) {
+					String name = (String) varnames.next();
+					RDFNode rdfnode = solution.get(name);
+					// logger.info("rdf node name, type: "+ name
+					// +", "+getRDFNodeType(rdfnode));
+					if (rdfnode.isLiteral()) {
+						Literal literal = rdfnode.asLiteral();
+						String nodeval = literal.getString();
+						hm.put(name, nodeval);
+					} else if (rdfnode.isResource()) {
+						Resource resource = rdfnode.asResource();
+						String nodeval = resource.toString();
+						hm.put(name, nodeval);
+					}
+				}
+				resultList.add(hm);
+			}
+			description = "";
+			for (HashMap map : resultList) {
+				if (map.containsKey("description")) {
+					description = (String) map.get("description");
+				}
+			}
+		} catch (Exception ex) {
+			throw ex;
+		}
+		// Adding source so it is clear that this description comes from DBPedia
+		return description + descriptionSource;
+	}
+
+	/**
+	 * @param uri The URI
+	 */
+	protected String stripConceptId(String uri) {
+		String conceptId = "";
+		int lastslash = uri.lastIndexOf('/');
+		conceptId = uri.substring(lastslash + 1, uri.length());
+		return conceptId;
+	}
+
+	/**
+	 * @param str The String
+	 */
+	protected String extractConceptId(String str) {
+		try {
+			return str.substring(1, str.length() - 1);
+		} catch (Exception ex) {
+			return "";
+		}
+	}
+
+	/**
+	 * The code here utilizes the SKOSMOS REST API for Agrovoc
+	 * This returns JSON LD so we would parse JSON instead of RDF
+	 * The code above can still be utilized if we need to employ the web services directly
+	 */
+	//Get search results for a particular term and language code
+		private String getSKOSMosSearchResults(String term, String lang) {
+			String urlEncodedTerm = URLEncoder.encode(term);
+			//Utilize 'starts with' using the * operator at the end
+			String searchUrlString = this.conceptsSkosMosSearch + "query=" + urlEncodedTerm + "*" + "&lang=" + lang;
+			URL searchURL = null;
+			try {
+				searchURL = new URL(searchUrlString);
+			} catch (Exception e) {
+				logger.error("Exception occurred in instantiating URL for "
+						+ searchUrlString, e);
+				// If the url is having trouble, just return null for the concept
+				return null;
+			}
+
+			String results = null;
+			try {
+
+				StringWriter sw = new StringWriter();
+
+				BufferedReader in = new BufferedReader(new InputStreamReader(
+						searchURL.openStream()));
+				String inputLine;
+				while ((inputLine = in.readLine()) != null) {
+					sw.write(inputLine);
+				}
+				in.close();
+
+				results = sw.toString();
+				logger.debug(results);
+			} catch (Exception ex) {
+				logger.error("Error occurred in getting concept from the URL "
+						+ searchUrlString, ex);
+				return null;
+			}
+			return results;
+
+		}
+
+		//JSON-LD array
+		private List<String> getConceptURIsListFromSkosMosResult(String results) {
+			List<String> conceptURIs = new ArrayList<>();
+			ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results);
+			//Format should be: { ..."results":["uri":uri...]
+			if (json.has("results")) {
+				ArrayNode jsonArray = (ArrayNode) json.get("results");
+				int numberResults = jsonArray.size();
+				int i;
+				for(i = 0; i < numberResults; i++) {
+					ObjectNode jsonObject = (ObjectNode) jsonArray.get(i);
+					if(jsonObject.has("uri")) {
+						conceptURIs.add(jsonObject.get("uri").asText());
+					}
+				}
+			}
+			return conceptURIs;
+		}
+
+
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java
index 5c6999b08a..7f95be2f06 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java
@@ -1,360 +1,360 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.semservices.service.impl;
-
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import edu.cornell.mannlib.semservices.bo.Concept;
-import edu.cornell.mannlib.semservices.exceptions.ConceptsNotFoundException;
-import edu.cornell.mannlib.semservices.service.ExternalConceptService;
-import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
-
-public class GemetService implements ExternalConceptService  {
-   protected final Log logger = LogFactory.getLog(getClass());
-   private final String GemetWS_address = "https://www.eionet.europa.eu/gemet/";
-   private final String narrowerUri = "http://www.w3.org/2004/02/skos/core%23narrower";
-   private final String broaderUri = "http://www.w3.org/2004/02/skos/core%23broader";
-   private final String relatedUri = "http://www.w3.org/2004/02/skos/core%23related";
-   private final String definitionUri = "http://www.w3.org/2004/02/skos/core%23definition";
-   private final String prefLabelUri = "http://www.w3.org/2004/02/skos/core%23prefLabel";
-   private final String scopeNoteUri = "http://www.w3.org/2004/02/skos/core%23scopeNote";
-   private final String altLabelUri = "http://www.w3.org/2004/02/skos/core%23altLabel";
-   private final String exampleUri = "http://www.w3.org/2004/02/skos/core%23example";
-   private final String acronymLabelUri = "http://www.w3.org/2004/02/skos/core%23acronymLabel";
-   private final String endpoint = "http://cr.eionet.europa.eu/sparql";
-   private final String schemeURI = "http://www.eionet.europa.eu/gemet/gemetThesaurus";
-
-   
-	@Override
-	public List<Concept> getConcepts(String term) throws Exception {
-		List<Concept> conceptList = new ArrayList<Concept>();
-	      try {
-	         String results = getConceptsMatchingKeyword(term);
-	         //System.out.println(results);
-	         conceptList = processOutput(results);         
-	          
-	      } catch (Exception ex) {
-	         return new ArrayList<Concept>();
-	         //ex.printStackTrace();
-	         //throw ex;
-	      }
-	      return conceptList;
-	}
-
-   public List<Concept> processResults(String term) throws Exception {
-      List<Concept> conceptList = new ArrayList<Concept>();
-      try {
-         String results = getConceptsMatchingKeyword(term);
-         conceptList = processOutput(results);
-      } catch (Exception ex) {
-         //ex.printStackTrace();
-         throw ex;
-      }
-      return conceptList;
-
-   }
-
-	public List<Concept> getConceptsByURIWithSparql(String uri)
-			throws Exception {
-		// deprecating this method...just return an empty list
-		List<Concept> conceptList = new ArrayList<Concept>();
-		return conceptList;
-	}
-
-   /**
-    * @param results Results to process
-    */
-   private List<Concept> processOutput(String results) throws Exception  {
-
-      List<Concept> conceptList = new ArrayList<Concept>();
-
-      try {
-         ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(results);
-         if (jsonArray.size() == 0) {
-            throw new ConceptsNotFoundException();
-         }
-
-         for (int i = 0; i < jsonArray.size(); i++) {
-            Concept concept = new Concept();
-            concept.setDefinedBy(schemeURI);
-            concept.setBestMatch("true");
-            ObjectNode json = (ObjectNode) jsonArray.get(i);
-            String uri = getJsonValue(json, "uri");
-
-            concept.setUri(uri);
-            concept.setConceptId(stripConceptId(uri));
-            concept.setSchemeURI(schemeURI);
-            concept.setType("");
-            if (json.has("preferredLabel")) {
-               ObjectNode preferredLabelObj = (ObjectNode) json.get("preferredLabel");
-               if (preferredLabelObj.has("string")) {
-                  concept.setLabel(getJsonValue(preferredLabelObj,
-                        "string"));
-               }
-            }
-            if (json.has("definition")) {
-               ObjectNode definitionObj = (ObjectNode) json.get("definition");
-               if (definitionObj.has("string")) {
-                  concept.setDefinition(getJsonValue(definitionObj,
-                        "string"));
-               }
-            }
-            
-            String narrower = getRelatedConcepts(uri, "narrower");
-            List<String> narrowerURIList = getRelatedUris(narrower);
-            concept.setNarrowerURIList(narrowerURIList);            
-            
-            String broader = getRelatedConcepts(uri, "broader");
-            List<String> broaderURIList = getRelatedUris(broader);
-            concept.setBroaderURIList(broaderURIList); 
-            
-            /*String related = getRelatedConcepts(uri, "related");
-            List<String> relatedURIList = getRelatedUris(related);
-            for (String s: relatedURIList) {
-            	System.out.println("related uri: "+s);
-            }*/
-            //String altLabels = getAllTranslationsForConcept(uri, "nonPreferredLabels");
-            
-            conceptList.add(concept);
-
-         }
-
-      } catch (Exception ex ) {
-         //ex.printStackTrace();
-         logger.error("Could not get concepts", ex);
-         throw ex;
-      }
-      return conceptList;
-
-   }
-
-   /**
-    * Get a string from a json object or an empty string if there is no value for the given key
-   * @param obj JSON Object
-   * @param key Key to retrieve
-   */
-  protected String getJsonValue(ObjectNode obj, String key) {
-      if (obj.has(key)) {
-         return obj.get(key).asText();
-      } else {
-         return "";
-      }
-   }
-
-
-   /**
-    * @param concept_uri Concept URI
-    * @throws Exception
-    */
-   protected String getAvailableLangs(String concept_uri) throws Exception {
-      String result = "";
-      String serviceUrl = GemetWS_address + "getAvailableLanguages" +
-      "?concept_uri=" + concept_uri;
-      try {
-         result = getGemetResults(serviceUrl);
-      } catch (Exception e) {
-         e.printStackTrace();
-         throw e;
-      }
-      return result;
-   }
-
-   /**
-    * @param concept_uri concept URI
-    * @throws Exception
-    */
-   protected String getConcept(String concept_uri) throws Exception {
-      String result = "";
-      String serviceUrl = GemetWS_address + "getConcept" +
-      "?concept_uri=" + concept_uri +
-      "&language=en";
-      try {
-         result = getGemetResults(serviceUrl);
-      } catch (Exception e) {
-         e.printStackTrace();
-         throw e;
-      }
-      return result;
-   }
-
-   /**
-    * @param concept_uri Concept URI
-    * @param property Property
-    * @throws Exception
-    */
-   protected String getAllTranslationsForConcept(String concept_uri, String property) throws Exception {
-      String result = "";
-      String property_uri = "";
-      switch (property) {
-         case "definition":
-            property_uri = definitionUri;
-            break;
-         case "preferredLabel":
-            property_uri = prefLabelUri;
-            break;
-         case "scopeNote":
-            property_uri = scopeNoteUri;
-            break;
-         case "nonPreferredLabels":
-            property_uri = altLabelUri;
-            break;
-         case "example":
-            property_uri = exampleUri;
-            break;
-         case "acronymLabel":
-            property_uri = acronymLabelUri;
-            break;
-      }
-
-      String serviceUrl = GemetWS_address + "getAllTranslationsForConcept" +
-      "?concept_uri=" + concept_uri +
-      "&property_uri=" + property_uri +
-      "&language=en";
-      try {
-         result = getGemetResults(serviceUrl);
-         List<String> props = getPropertyFromJson(result);
-          
-      } catch (Exception e) {
-         e.printStackTrace();
-         throw e;
-      }
-      return result;
-   }
-
-
-   /**
-    * @param concept_uri Concept URI
-    * @param relation Relations
-    * @throws Exception
-    */
-   protected String getRelatedConcepts(String concept_uri, String relation) throws Exception {
-      String result = "";
-      String relation_uri = "";
-      switch (relation) {
-         case "broader":
-            relation_uri = broaderUri;
-            break;
-         case "narrower":
-            relation_uri = narrowerUri;
-            break;
-         case "related":
-            relation_uri = relatedUri;
-            break;
-      }
-      String serviceUrl = GemetWS_address + "getRelatedConcepts" +
-      "?concept_uri=" + concept_uri +
-      "&relation_uri=" + relation_uri +
-      "&language=en";
-      try {
-         result = getGemetResults(serviceUrl);
-      } catch (Exception e) {
-         e.printStackTrace();
-         throw e;
-      }
-      return result;
-   }
-
-
-
-   /**
-    * @param keyword Keyword
-    * @throws Exception
-    */
-   protected String getConceptsMatchingKeyword(String keyword) throws Exception {
-      String result = "";
-      String encodedKeyword = URLEncoder.encode(keyword, "UTF-8"); 
-      String serviceUrl = GemetWS_address + "getConceptsMatchingKeyword" +
-      "?keyword="  + encodedKeyword +
-      "&search_mode=0" +
-      "&thesaurus_uri=http://www.eionet.europa.eu/gemet/concept/" +
-      "&language=en";
-      try {
-         result = getGemetResults(serviceUrl);
-      } catch (Exception ex) {
-         throw ex;
-      }
-      return result;
-
-   }
-
-   /**
-    * @param url URI
-    */
-   protected String getGemetResults(String url) throws Exception  {
-      String results = "";
-      //System.out.println("url: "+url);
-      try {
-
-         StringWriter sw = new StringWriter();
-         URL serviceUrl = new URL(url);
-
-         BufferedReader in = new BufferedReader(new InputStreamReader(serviceUrl.openStream()));
-         String inputLine;
-         while ((inputLine = in.readLine()) != null) {
-            sw.write(inputLine);
-         }
-         in.close();
-
-         results = sw.toString();
-
-      } catch (Exception ex) {
-         logger.error("error occurred in servlet", ex);
-         ex.printStackTrace();
-         throw ex;
-      }
-      return results;
-   }
-   
-    
-   protected List<String> getRelatedUris(String json) {
-	   List<String> uriList = new ArrayList<String>();
-	   String uri = "";
-	   ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(json);
-	    if (jsonArray.size() == 0) {
-           return new ArrayList<String>();
-        }
-	    for (int i = 0; i < jsonArray.size(); i++) {
-	    	ObjectNode jsonObj = (ObjectNode) jsonArray.get(i);	    	
-            uri = getJsonValue(jsonObj, "uri");	
-            uriList.add(uri);
-	    }
-       
-	   return uriList;
-	   
-   }
-   
-	protected List<String> getPropertyFromJson(String json) {
-		List<String> props = new ArrayList<String>();
-		ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(json);
-		if (jsonArray.size() == 0) {
-			return new ArrayList<String>();
-		}
-		for (int i = 0; i < jsonArray.size(); i++) {
-			System.out.println((jsonArray.get(i)).toString());
-		}
-		return props;
-	}
-
-   protected String stripConceptId(String uri) {
-	     String conceptId = "";
-	     int lastslash = uri.lastIndexOf('/');
-	     conceptId = uri.substring(lastslash + 1, uri.length());
-	     return conceptId;
-	  }
-   
-   
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.semservices.service.impl;
+
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import edu.cornell.mannlib.semservices.bo.Concept;
+import edu.cornell.mannlib.semservices.exceptions.ConceptsNotFoundException;
+import edu.cornell.mannlib.semservices.service.ExternalConceptService;
+import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
+
+public class GemetService implements ExternalConceptService  {
+   protected final Log logger = LogFactory.getLog(getClass());
+   private final String GemetWS_address = "https://www.eionet.europa.eu/gemet/";
+   private final String narrowerUri = "http://www.w3.org/2004/02/skos/core%23narrower";
+   private final String broaderUri = "http://www.w3.org/2004/02/skos/core%23broader";
+   private final String relatedUri = "http://www.w3.org/2004/02/skos/core%23related";
+   private final String definitionUri = "http://www.w3.org/2004/02/skos/core%23definition";
+   private final String prefLabelUri = "http://www.w3.org/2004/02/skos/core%23prefLabel";
+   private final String scopeNoteUri = "http://www.w3.org/2004/02/skos/core%23scopeNote";
+   private final String altLabelUri = "http://www.w3.org/2004/02/skos/core%23altLabel";
+   private final String exampleUri = "http://www.w3.org/2004/02/skos/core%23example";
+   private final String acronymLabelUri = "http://www.w3.org/2004/02/skos/core%23acronymLabel";
+   private final String endpoint = "http://cr.eionet.europa.eu/sparql";
+   private final String schemeURI = "http://www.eionet.europa.eu/gemet/gemetThesaurus";
+
+
+	@Override
+	public List<Concept> getConcepts(String term) throws Exception {
+		List<Concept> conceptList = new ArrayList<Concept>();
+	      try {
+	         String results = getConceptsMatchingKeyword(term);
+	         //System.out.println(results);
+	         conceptList = processOutput(results);
+
+	      } catch (Exception ex) {
+	         return new ArrayList<Concept>();
+	         //ex.printStackTrace();
+	         //throw ex;
+	      }
+	      return conceptList;
+	}
+
+   public List<Concept> processResults(String term) throws Exception {
+      List<Concept> conceptList = new ArrayList<Concept>();
+      try {
+         String results = getConceptsMatchingKeyword(term);
+         conceptList = processOutput(results);
+      } catch (Exception ex) {
+         //ex.printStackTrace();
+         throw ex;
+      }
+      return conceptList;
+
+   }
+
+	public List<Concept> getConceptsByURIWithSparql(String uri)
+			throws Exception {
+		// deprecating this method...just return an empty list
+		List<Concept> conceptList = new ArrayList<Concept>();
+		return conceptList;
+	}
+
+   /**
+    * @param results Results to process
+    */
+   private List<Concept> processOutput(String results) throws Exception  {
+
+      List<Concept> conceptList = new ArrayList<Concept>();
+
+      try {
+         ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(results);
+         if (jsonArray.size() == 0) {
+            throw new ConceptsNotFoundException();
+         }
+
+         for (int i = 0; i < jsonArray.size(); i++) {
+            Concept concept = new Concept();
+            concept.setDefinedBy(schemeURI);
+            concept.setBestMatch("true");
+            ObjectNode json = (ObjectNode) jsonArray.get(i);
+            String uri = getJsonValue(json, "uri");
+
+            concept.setUri(uri);
+            concept.setConceptId(stripConceptId(uri));
+            concept.setSchemeURI(schemeURI);
+            concept.setType("");
+            if (json.has("preferredLabel")) {
+               ObjectNode preferredLabelObj = (ObjectNode) json.get("preferredLabel");
+               if (preferredLabelObj.has("string")) {
+                  concept.setLabel(getJsonValue(preferredLabelObj,
+                        "string"));
+               }
+            }
+            if (json.has("definition")) {
+               ObjectNode definitionObj = (ObjectNode) json.get("definition");
+               if (definitionObj.has("string")) {
+                  concept.setDefinition(getJsonValue(definitionObj,
+                        "string"));
+               }
+            }
+
+            String narrower = getRelatedConcepts(uri, "narrower");
+            List<String> narrowerURIList = getRelatedUris(narrower);
+            concept.setNarrowerURIList(narrowerURIList);
+
+            String broader = getRelatedConcepts(uri, "broader");
+            List<String> broaderURIList = getRelatedUris(broader);
+            concept.setBroaderURIList(broaderURIList);
+
+            /*String related = getRelatedConcepts(uri, "related");
+            List<String> relatedURIList = getRelatedUris(related);
+            for (String s: relatedURIList) {
+            	System.out.println("related uri: "+s);
+            }*/
+            //String altLabels = getAllTranslationsForConcept(uri, "nonPreferredLabels");
+
+            conceptList.add(concept);
+
+         }
+
+      } catch (Exception ex ) {
+         //ex.printStackTrace();
+         logger.error("Could not get concepts", ex);
+         throw ex;
+      }
+      return conceptList;
+
+   }
+
+   /**
+    * Get a string from a json object or an empty string if there is no value for the given key
+   * @param obj JSON Object
+   * @param key Key to retrieve
+   */
+  protected String getJsonValue(ObjectNode obj, String key) {
+      if (obj.has(key)) {
+         return obj.get(key).asText();
+      } else {
+         return "";
+      }
+   }
+
+
+   /**
+    * @param concept_uri Concept URI
+    * @throws Exception
+    */
+   protected String getAvailableLangs(String concept_uri) throws Exception {
+      String result = "";
+      String serviceUrl = GemetWS_address + "getAvailableLanguages" +
+      "?concept_uri=" + concept_uri;
+      try {
+         result = getGemetResults(serviceUrl);
+      } catch (Exception e) {
+         e.printStackTrace();
+         throw e;
+      }
+      return result;
+   }
+
+   /**
+    * @param concept_uri concept URI
+    * @throws Exception
+    */
+   protected String getConcept(String concept_uri) throws Exception {
+      String result = "";
+      String serviceUrl = GemetWS_address + "getConcept" +
+      "?concept_uri=" + concept_uri +
+      "&language=en";
+      try {
+         result = getGemetResults(serviceUrl);
+      } catch (Exception e) {
+         e.printStackTrace();
+         throw e;
+      }
+      return result;
+   }
+
+   /**
+    * @param concept_uri Concept URI
+    * @param property Property
+    * @throws Exception
+    */
+   protected String getAllTranslationsForConcept(String concept_uri, String property) throws Exception {
+      String result = "";
+      String property_uri = "";
+      switch (property) {
+         case "definition":
+            property_uri = definitionUri;
+            break;
+         case "preferredLabel":
+            property_uri = prefLabelUri;
+            break;
+         case "scopeNote":
+            property_uri = scopeNoteUri;
+            break;
+         case "nonPreferredLabels":
+            property_uri = altLabelUri;
+            break;
+         case "example":
+            property_uri = exampleUri;
+            break;
+         case "acronymLabel":
+            property_uri = acronymLabelUri;
+            break;
+      }
+
+      String serviceUrl = GemetWS_address + "getAllTranslationsForConcept" +
+      "?concept_uri=" + concept_uri +
+      "&property_uri=" + property_uri +
+      "&language=en";
+      try {
+         result = getGemetResults(serviceUrl);
+         List<String> props = getPropertyFromJson(result);
+
+      } catch (Exception e) {
+         e.printStackTrace();
+         throw e;
+      }
+      return result;
+   }
+
+
+   /**
+    * @param concept_uri Concept URI
+    * @param relation Relations
+    * @throws Exception
+    */
+   protected String getRelatedConcepts(String concept_uri, String relation) throws Exception {
+      String result = "";
+      String relation_uri = "";
+      switch (relation) {
+         case "broader":
+            relation_uri = broaderUri;
+            break;
+         case "narrower":
+            relation_uri = narrowerUri;
+            break;
+         case "related":
+            relation_uri = relatedUri;
+            break;
+      }
+      String serviceUrl = GemetWS_address + "getRelatedConcepts" +
+      "?concept_uri=" + concept_uri +
+      "&relation_uri=" + relation_uri +
+      "&language=en";
+      try {
+         result = getGemetResults(serviceUrl);
+      } catch (Exception e) {
+         e.printStackTrace();
+         throw e;
+      }
+      return result;
+   }
+
+
+
+   /**
+    * @param keyword Keyword
+    * @throws Exception
+    */
+   protected String getConceptsMatchingKeyword(String keyword) throws Exception {
+      String result = "";
+      String encodedKeyword = URLEncoder.encode(keyword, "UTF-8");
+      String serviceUrl = GemetWS_address + "getConceptsMatchingKeyword" +
+      "?keyword="  + encodedKeyword +
+      "&search_mode=0" +
+      "&thesaurus_uri=http://www.eionet.europa.eu/gemet/concept/" +
+      "&language=en";
+      try {
+         result = getGemetResults(serviceUrl);
+      } catch (Exception ex) {
+         throw ex;
+      }
+      return result;
+
+   }
+
+   /**
+    * @param url URI
+    */
+   protected String getGemetResults(String url) throws Exception  {
+      String results = "";
+      //System.out.println("url: "+url);
+      try {
+
+         StringWriter sw = new StringWriter();
+         URL serviceUrl = new URL(url);
+
+         BufferedReader in = new BufferedReader(new InputStreamReader(serviceUrl.openStream()));
+         String inputLine;
+         while ((inputLine = in.readLine()) != null) {
+            sw.write(inputLine);
+         }
+         in.close();
+
+         results = sw.toString();
+
+      } catch (Exception ex) {
+         logger.error("error occurred in servlet", ex);
+         ex.printStackTrace();
+         throw ex;
+      }
+      return results;
+   }
+
+
+   protected List<String> getRelatedUris(String json) {
+	   List<String> uriList = new ArrayList<String>();
+	   String uri = "";
+	   ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(json);
+	    if (jsonArray.size() == 0) {
+           return new ArrayList<String>();
+        }
+	    for (int i = 0; i < jsonArray.size(); i++) {
+	    	ObjectNode jsonObj = (ObjectNode) jsonArray.get(i);
+            uri = getJsonValue(jsonObj, "uri");
+            uriList.add(uri);
+	    }
+
+	   return uriList;
+
+   }
+
+	protected List<String> getPropertyFromJson(String json) {
+		List<String> props = new ArrayList<String>();
+		ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(json);
+		if (jsonArray.size() == 0) {
+			return new ArrayList<String>();
+		}
+		for (int i = 0; i < jsonArray.size(); i++) {
+			System.out.println((jsonArray.get(i)).toString());
+		}
+		return props;
+	}
+
+   protected String stripConceptId(String uri) {
+	     String conceptId = "";
+	     int lastslash = uri.lastIndexOf('/');
+	     conceptId = uri.substring(lastslash + 1, uri.length());
+	     return conceptId;
+	  }
+
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java
index a234792789..32327ebc09 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java
@@ -39,8 +39,8 @@ public class LCSHService implements ExternalConceptService {
 	private final String schemeUri = hostUri + "/authorities/subjects";
 	private final String baseUri = hostUri + "/search/";
 
-	
-	
+
+
 	@Override
 	public List<Concept> getConcepts(String term) throws Exception {
 		List<Concept> conceptList = new ArrayList<Concept>();
@@ -111,19 +111,19 @@ private List<Concept> processOutput(String results) throws Exception {
 				conceptList.add(c);
 			}
 			i++;
-			
+
 		}
 		return conceptList;
 	}
 
-	
+
 	//Load individual concept using a request
-	//private 
-	
+	//private
+
 	public Concept createConcept(String bestMatch, String conceptURLString, String skosConceptURI) {
 
 		Concept concept = new Concept();
-		
+
 		log.debug("SKOSConceptURI is " + skosConceptURI);
 		// get skos version of uri
 
@@ -133,31 +133,31 @@ public Concept createConcept(String bestMatch, String conceptURLString, String s
 		concept.setDefinedBy(schemeUri);
 		concept.setSchemeURI(schemeUri);
 		concept.setType("");
-		
+
 		//Utilize the XML directly instead of the SKOS API
 		try {
 			//LCSH doesn't need a language tag right now as results in english
 			//Also want to add skos notes as definition
 			concept = SKOSUtils.createConceptUsingXMLFromURL(concept, conceptURLString, null, true);
-			
+
 		}  catch(Exception ex) {
 			log.debug("Error occurred for annotation retrieval for skos concept " + skosConceptURI, ex);
 			return null;
 		}
-		
-		
+
+
 		return concept;
 	}
-	
+
 
 
 	private String getSKOSURL(String uri) {
 		String skosURI = uri + skosSuffix;
-		
+
 		return skosURI;
 	}
-	
-	
+
+
 
 	public List<String> getConceptURISFromJSON(String results) {
 		List<String> uris = new ArrayList<String>();
@@ -197,7 +197,7 @@ protected List<String> getConceptURIFromXML(String rdf) {
 
 					}
 				}
-				
+
 				log.debug("concept uri is " + conceptUri);
 				uris.add(conceptUri);
 			}
@@ -241,6 +241,6 @@ public List<Concept> getConceptsByURIWithSparql(String uri)
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java
index 9232592dd4..59653f3fd3 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java
@@ -1,229 +1,229 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.semservices.service.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import edu.cornell.mannlib.semservices.bo.Concept;
-import edu.cornell.mannlib.semservices.exceptions.ConceptsNotFoundException;
-import edu.cornell.mannlib.semservices.service.ExternalConceptService;
-import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
-import org.apache.http.HttpVersion;
-import org.apache.http.client.fluent.Form;
-import org.apache.http.client.fluent.Request;
-import org.apache.http.client.utils.URIBuilder;
-import org.springframework.util.StringUtils;
-
-/**
- * @author jaf30
- *
- */
-public class UMLSService implements ExternalConceptService {
-    protected final Log logger = LogFactory.getLog(getClass());
-
-    private static String UTS_REST_API_URL = "https://uts-ws.nlm.nih.gov/rest";
-    private static String SEARCH_PATH = "/search/current";
-    private static String SEARCH_PARAMETER = "string";
-    private static String SEARCH_TYPE_PARAMETER = "searchType";
-    private static String SEARCH_TYPE = "rightTruncation";
-    private static String PAGE_SIZE_PARAMETER = "pageSize";
-    private static String RETURN_TYPE_PARAMETER = "returnIdType";
-    private static String RETURN_TYPE = "concept";
-    private static String TICKET_PARAMETER = "ticket";
-
-    private static String ticketGrantingTicketURL = null;
-
-    private static long lastUpdate = -1;
-
-    private static String username = null;
-    private static String password = null;
-    private static String apikey = null;
-
-    private static String pageSize = "50";
-
-    private static String UMLS_AUTH_USER_URL = "https://utslogin.nlm.nih.gov/cas/v1/tickets";
-    private static String UMLS_AUTH_KEY_URL = "https://utslogin.nlm.nih.gov/cas/v1/api-key";
-    private static String UTS_SERVICE_URL   = "http://umlsks.nlm.nih.gov";
-
-    {
-        if (username == null || apikey == null) {
-            final Properties properties = new Properties();
-            try (InputStream stream = getClass().getResourceAsStream("/umls.properties")) {
-                properties.load(stream);
-                username = properties.getProperty("username");
-                password = properties.getProperty("password");
-                apikey   = properties.getProperty("apikey");
-
-                String exPageSize = properties.getProperty("pagesize");
-                try {
-                    if (!StringUtils.isEmpty(exPageSize)) {
-                        int iPageSize = Integer.parseInt(exPageSize, 10);
-                        if (iPageSize > 5 && iPageSize < 200) {
-                            pageSize = Integer.toString(iPageSize, 10);
-                        }
-                    }
-                } catch (Exception e) {
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    public boolean isConfigured() {
-        return !(StringUtils.isEmpty(username) && StringUtils.isEmpty(apikey));
-    }
-
-    @Override
-    public List<Concept> getConcepts(String term) throws Exception {
-        String ticket = getSingleUseTicket();
-
-        List<Concept> conceptList = new ArrayList<Concept>();
-
-        String results = null;
-
-        try {
-            URIBuilder b = new URIBuilder(UTS_REST_API_URL + SEARCH_PATH);
-            b.addParameter(SEARCH_PARAMETER, term);
-            b.addParameter(RETURN_TYPE_PARAMETER, RETURN_TYPE);
-            b.addParameter(SEARCH_TYPE_PARAMETER, SEARCH_TYPE);
-            b.addParameter(PAGE_SIZE_PARAMETER, pageSize);
-            b.addParameter(TICKET_PARAMETER, ticket);
-
-            results = Request.Get(b.build())
-                    .connectTimeout(3000)
-                    .socketTimeout(3000)
-                    .execute().returnContent().asString();
-
-            conceptList = processOutput(results);
-            return conceptList;
-
-        } catch (Exception ex) {
-            logger.error("error occurred in servlet", ex);
-            return null;
-        }
-    }
-
-    public List<Concept> processResults(String term) throws Exception {
-        return getConcepts(term);
-    }
-
-    /**
-     * @param uri URI
-     */
-    public List<Concept> getConceptsByURIWithSparql(String uri) throws Exception {
-        // deprecating this method...just return an empty list
-        List<Concept> conceptList = new ArrayList<Concept>();
-        return conceptList;
-    }
-
-    /**
-     * @param results Results to process
-     */
-    private List<Concept> processOutput(String results) throws Exception {
-        List<Concept> conceptList = new ArrayList<Concept>();
-        List<String> bestMatchIdList = new ArrayList<String>();
-        String bestMatchId = "";
-
-        try {
-            ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results);
-            ArrayNode allArray = (ArrayNode) json.get("result").get("results");
-            int len = allArray.size();
-            int i;
-            for (i = 0; i < len; i++) {
-                ObjectNode o = (ObjectNode) allArray.get(i);
-
-                Concept concept = new Concept();
-                concept.setDefinedBy(UTS_SERVICE_URL);
-                concept.setSchemeURI(UTS_SERVICE_URL);
-
-                concept.setType(RETURN_TYPE);
-                concept.setConceptId(getJsonValue(o, "ui"));
-                concept.setLabel(getJsonValue(o, "name"));
-                concept.setUri(getJsonValue(o, "uri"));
-
-                concept.setBestMatch("false");
-                conceptList.add(concept);
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            logger.error("Could not get concepts", ex);
-            throw ex;
-        }
-
-        if (conceptList.size() == 0) {
-            throw new ConceptsNotFoundException();
-        }
-
-        //
-        return conceptList;
-
-    }
-
-    /**
-     * Get a string from a json object or an empty string if there is no value for the given key
-     *
-     * @param obj JSON Object
-     * @param key Key to retrieve
-     */
-    protected String getJsonValue(ObjectNode obj, String key) {
-        if (obj.has(key)) {
-            return obj.get(key).asText();
-        } else {
-            return "";
-        }
-    }
-
-
-    protected String stripConceptId(String uri) {
-        String conceptId = "";
-        int lastslash = uri.lastIndexOf('/');
-        conceptId = uri.substring(lastslash + 1, uri.length());
-        return conceptId;
-    }
-
-    private synchronized void getTicketGrantingTicket() {
-        if (StringUtils.isEmpty(username) && StringUtils.isEmpty(apikey)) {
-            throw new IllegalStateException("Unable to read umls.properties");
-        }
-
-        if (ticketGrantingTicketURL == null || lastUpdate + 28700000L < System.currentTimeMillis()) {
-            try {
-                if (!StringUtils.isEmpty(apikey)) {
-                    ticketGrantingTicketURL = Request.Post(UMLS_AUTH_KEY_URL).useExpectContinue().version(HttpVersion.HTTP_1_1)
-                            .bodyForm(Form.form().add("apikey", apikey).build())
-                            .execute().returnResponse().getFirstHeader("location").getValue();
-                } else {
-                    ticketGrantingTicketURL = Request.Post(UMLS_AUTH_USER_URL).useExpectContinue().version(HttpVersion.HTTP_1_1)
-                            .bodyForm(Form.form().add("username", username).add("password", password).build())
-                            .execute().returnResponse().getFirstHeader("location").getValue();
-                }
-            } catch (IOException e) {
-                throw new IllegalStateException("Unable to get ticket granting ticket.");
-            }
-            lastUpdate = System.currentTimeMillis();
-        }
-    }
-
-    private String getSingleUseTicket() {
-        getTicketGrantingTicket();
-        String ticket = "";
-        try {
-            ticket = Request.Post(ticketGrantingTicketURL).useExpectContinue().version(HttpVersion.HTTP_1_1)
-                    .bodyForm(Form.form().add("service", UTS_SERVICE_URL).build())
-                    .execute().returnContent().asString();
-        } catch (IOException e) {
-            throw new IllegalStateException("Unable to get ticket.");
-        }
-        return ticket;
-    }
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.semservices.service.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import edu.cornell.mannlib.semservices.bo.Concept;
+import edu.cornell.mannlib.semservices.exceptions.ConceptsNotFoundException;
+import edu.cornell.mannlib.semservices.service.ExternalConceptService;
+import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
+import org.apache.http.HttpVersion;
+import org.apache.http.client.fluent.Form;
+import org.apache.http.client.fluent.Request;
+import org.apache.http.client.utils.URIBuilder;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author jaf30
+ *
+ */
+public class UMLSService implements ExternalConceptService {
+    protected final Log logger = LogFactory.getLog(getClass());
+
+    private static String UTS_REST_API_URL = "https://uts-ws.nlm.nih.gov/rest";
+    private static String SEARCH_PATH = "/search/current";
+    private static String SEARCH_PARAMETER = "string";
+    private static String SEARCH_TYPE_PARAMETER = "searchType";
+    private static String SEARCH_TYPE = "rightTruncation";
+    private static String PAGE_SIZE_PARAMETER = "pageSize";
+    private static String RETURN_TYPE_PARAMETER = "returnIdType";
+    private static String RETURN_TYPE = "concept";
+    private static String TICKET_PARAMETER = "ticket";
+
+    private static String ticketGrantingTicketURL = null;
+
+    private static long lastUpdate = -1;
+
+    private static String username = null;
+    private static String password = null;
+    private static String apikey = null;
+
+    private static String pageSize = "50";
+
+    private static String UMLS_AUTH_USER_URL = "https://utslogin.nlm.nih.gov/cas/v1/tickets";
+    private static String UMLS_AUTH_KEY_URL = "https://utslogin.nlm.nih.gov/cas/v1/api-key";
+    private static String UTS_SERVICE_URL   = "http://umlsks.nlm.nih.gov";
+
+    {
+        if (username == null || apikey == null) {
+            final Properties properties = new Properties();
+            try (InputStream stream = getClass().getResourceAsStream("/umls.properties")) {
+                properties.load(stream);
+                username = properties.getProperty("username");
+                password = properties.getProperty("password");
+                apikey   = properties.getProperty("apikey");
+
+                String exPageSize = properties.getProperty("pagesize");
+                try {
+                    if (!StringUtils.isEmpty(exPageSize)) {
+                        int iPageSize = Integer.parseInt(exPageSize, 10);
+                        if (iPageSize > 5 && iPageSize < 200) {
+                            pageSize = Integer.toString(iPageSize, 10);
+                        }
+                    }
+                } catch (Exception e) {
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    public boolean isConfigured() {
+        return !(StringUtils.isEmpty(username) && StringUtils.isEmpty(apikey));
+    }
+
+    @Override
+    public List<Concept> getConcepts(String term) throws Exception {
+        String ticket = getSingleUseTicket();
+
+        List<Concept> conceptList = new ArrayList<Concept>();
+
+        String results = null;
+
+        try {
+            URIBuilder b = new URIBuilder(UTS_REST_API_URL + SEARCH_PATH);
+            b.addParameter(SEARCH_PARAMETER, term);
+            b.addParameter(RETURN_TYPE_PARAMETER, RETURN_TYPE);
+            b.addParameter(SEARCH_TYPE_PARAMETER, SEARCH_TYPE);
+            b.addParameter(PAGE_SIZE_PARAMETER, pageSize);
+            b.addParameter(TICKET_PARAMETER, ticket);
+
+            results = Request.Get(b.build())
+                    .connectTimeout(3000)
+                    .socketTimeout(3000)
+                    .execute().returnContent().asString();
+
+            conceptList = processOutput(results);
+            return conceptList;
+
+        } catch (Exception ex) {
+            logger.error("error occurred in servlet", ex);
+            return null;
+        }
+    }
+
+    public List<Concept> processResults(String term) throws Exception {
+        return getConcepts(term);
+    }
+
+    /**
+     * @param uri URI
+     */
+    public List<Concept> getConceptsByURIWithSparql(String uri) throws Exception {
+        // deprecating this method...just return an empty list
+        List<Concept> conceptList = new ArrayList<Concept>();
+        return conceptList;
+    }
+
+    /**
+     * @param results Results to process
+     */
+    private List<Concept> processOutput(String results) throws Exception {
+        List<Concept> conceptList = new ArrayList<Concept>();
+        List<String> bestMatchIdList = new ArrayList<String>();
+        String bestMatchId = "";
+
+        try {
+            ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results);
+            ArrayNode allArray = (ArrayNode) json.get("result").get("results");
+            int len = allArray.size();
+            int i;
+            for (i = 0; i < len; i++) {
+                ObjectNode o = (ObjectNode) allArray.get(i);
+
+                Concept concept = new Concept();
+                concept.setDefinedBy(UTS_SERVICE_URL);
+                concept.setSchemeURI(UTS_SERVICE_URL);
+
+                concept.setType(RETURN_TYPE);
+                concept.setConceptId(getJsonValue(o, "ui"));
+                concept.setLabel(getJsonValue(o, "name"));
+                concept.setUri(getJsonValue(o, "uri"));
+
+                concept.setBestMatch("false");
+                conceptList.add(concept);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            logger.error("Could not get concepts", ex);
+            throw ex;
+        }
+
+        if (conceptList.size() == 0) {
+            throw new ConceptsNotFoundException();
+        }
+
+        //
+        return conceptList;
+
+    }
+
+    /**
+     * Get a string from a json object or an empty string if there is no value for the given key
+     *
+     * @param obj JSON Object
+     * @param key Key to retrieve
+     */
+    protected String getJsonValue(ObjectNode obj, String key) {
+        if (obj.has(key)) {
+            return obj.get(key).asText();
+        } else {
+            return "";
+        }
+    }
+
+
+    protected String stripConceptId(String uri) {
+        String conceptId = "";
+        int lastslash = uri.lastIndexOf('/');
+        conceptId = uri.substring(lastslash + 1, uri.length());
+        return conceptId;
+    }
+
+    private synchronized void getTicketGrantingTicket() {
+        if (StringUtils.isEmpty(username) && StringUtils.isEmpty(apikey)) {
+            throw new IllegalStateException("Unable to read umls.properties");
+        }
+
+        if (ticketGrantingTicketURL == null || lastUpdate + 28700000L < System.currentTimeMillis()) {
+            try {
+                if (!StringUtils.isEmpty(apikey)) {
+                    ticketGrantingTicketURL = Request.Post(UMLS_AUTH_KEY_URL).useExpectContinue().version(HttpVersion.HTTP_1_1)
+                            .bodyForm(Form.form().add("apikey", apikey).build())
+                            .execute().returnResponse().getFirstHeader("location").getValue();
+                } else {
+                    ticketGrantingTicketURL = Request.Post(UMLS_AUTH_USER_URL).useExpectContinue().version(HttpVersion.HTTP_1_1)
+                            .bodyForm(Form.form().add("username", username).add("password", password).build())
+                            .execute().returnResponse().getFirstHeader("location").getValue();
+                }
+            } catch (IOException e) {
+                throw new IllegalStateException("Unable to get ticket granting ticket.");
+            }
+            lastUpdate = System.currentTimeMillis();
+        }
+    }
+
+    private String getSingleUseTicket() {
+        getTicketGrantingTicket();
+        String ticket = "";
+        try {
+            ticket = Request.Post(ticketGrantingTicketURL).useExpectContinue().version(HttpVersion.HTTP_1_1)
+                    .bodyForm(Form.form().add("service", UTS_SERVICE_URL).build())
+                    .execute().returnContent().asString();
+        } catch (IOException e) {
+            throw new IllegalStateException("Unable to get ticket.");
+        }
+        return ticket;
+    }
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java
index 1ac272926b..47cb51712d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller; 
+package edu.cornell.mannlib.vitro.webapp.controller;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@
 
 @WebServlet(name = "AboutQrCodesController", urlPatterns = {"/qrcode/about"})
 public class AboutQrCodesController extends FreemarkerHttpServlet {
-    
+
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(ExportQrCodeController.class);
     private static final String TEMPLATE_DEFAULT = "aboutQrCodes.ftl";
@@ -27,7 +27,7 @@ public class AboutQrCodesController extends FreemarkerHttpServlet {
     protected ResponseValues processRequest(VitroRequest vreq) {
         try {
             Map<String, Object> body = new HashMap<String, Object>();
-            
+
             return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
         } catch (Throwable e) {
             log.error(e, e);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
index d036ff1d4f..d74f424f32 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller; 
+package edu.cornell.mannlib.vitro.webapp.controller;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,7 +31,7 @@
 
 @WebServlet(name = "ExportQrCodeController", urlPatterns = {"/qrcode"})
 public class ExportQrCodeController extends FreemarkerHttpServlet {
-    
+
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(ExportQrCodeController.class);
     private static final String TEMPLATE_DEFAULT = "foaf-person--exportQrCode.ftl";
@@ -61,12 +61,12 @@ public class ExportQrCodeController extends FreemarkerHttpServlet {
     protected ResponseValues processRequest(VitroRequest vreq) {
         try {
         	Individual individual = getIndividualFromRequest(vreq);
-            
+
 			qrData = generateQrData(individual, vreq);
 
             DefaultObjectWrapper wrapper = new DefaultObjectWrapper();
             wrapper.setExposureLevel(BeansWrapper.EXPOSE_SAFE);
-            
+
             Map<String, Object> body = new HashMap<String, Object>();
             body.put("individual", wrapper.wrap(IndividualTemplateModelBuilder.build(individual, vreq)));
             body.put("qrData", qrData);
@@ -94,7 +94,7 @@ protected String getTitle(String siteName, VitroRequest vreq) {
     }
 
     private Map<String, String> generateQrData(Individual individual, VitroRequest vreq) {
-        
+
         try {
             String firstName = "";
             String lastName = "";
@@ -106,7 +106,7 @@ private Map<String, String> generateQrData(Individual individual, VitroRequest v
 
             Map<String,String> qrData = new HashMap<String,String>();
 
-            for (Map<String, String> map: vcardData) {        
+            for (Map<String, String> map: vcardData) {
                 firstName = map.get("firstName");
                 lastName = map.get("lastName");
                 preferredTitle = map.get("title");
@@ -128,13 +128,13 @@ private Map<String, String> generateQrData(Individual individual, VitroRequest v
             String tempUrl = vreq.getRequestURL().toString();
             String prefix = "http://";
             tempUrl = tempUrl.substring(0, tempUrl.replace(prefix, "").indexOf("/") + prefix.length());
-            String externalUrl = tempUrl ; 
+            String externalUrl = tempUrl ;
             qrData.put("externalUrl", externalUrl);
 
             String individualUri = individual.getURI();
             String contextPath = vreq.getContextPath();
             qrData.put("exportQrCodeUrl", contextPath + "/qrcode?uri=" + UrlBuilder.urlEncode(individualUri));
-        
+
             qrData.put("aboutQrCodesUrl", contextPath + "/qrcode/about");
             return qrData;
 		} catch (Exception e) {
@@ -155,8 +155,8 @@ private List<Map<String,String>>  getVcardData(Individual individual, VitroReque
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
-       
+        }
+
         return vcardData;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
index ea5d56dd49..eecbb5cfa8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
@@ -27,7 +27,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
     private static String GEO_FOCUS_QUERY = ""
         + "PREFIX geo: <http://aims.fao.org/aos/geopolitical.owl#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>  \n"
-        + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n" 
+        + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
         + "PREFIX core: <http://vivoweb.org/ontology/core#>  \n"
         + "PREFIX foaf: <http://xmlns.com/foaf/0.1/>  \n"
         + "PREFIX vivoc: <http://vivo.library.cornell.edu/ns/0.1#>  \n"
@@ -52,7 +52,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
         + "    ?person rdf:type foaf:Person   \n"
         + "} }  \n"
         + "GROUP BY ?label ?location  \n";
-    
+
 	public GeoFocusMapLocations(HttpServlet parent, VitroRequest vreq,
 			HttpServletResponse resp) {
 		super(parent, vreq, resp);
@@ -62,12 +62,12 @@ public GeoFocusMapLocations(HttpServlet parent, VitroRequest vreq,
 	public String prepareResponse() throws IOException {
 		try {
             geoLocations = getGeoLocations(vreq);
-            
+
             StringBuilder response = new StringBuilder("[");
             String geometry = "{\"geometry\": {\"type\": \"Point\",\"coordinates\": \"\"},";
             String typeProps = "\"type\": \"Feature\",\"properties\": {\"mapType\": \"\",";
             String previousLabel = "";
-            
+
             for (Map<String, String> map: geoLocations) {
                 String label = map.get("label");
                 String html  = map.get("count");
@@ -79,7 +79,7 @@ public String prepareResponse() throws IOException {
                 Integer count    = Integer.parseInt(map.get("count"));
                 String radius   = String.valueOf(calculateRadius(count));
                 String name = "";
-                
+
                 if ( label != null && !label.equals(previousLabel) ) {
                     if ( label.contains("Ivoire") ) {
                         name = "Ivory Coast";
@@ -94,18 +94,18 @@ else if ( label.contains("United Kingdom") ) {
                         name = label;
                     }
                     String tempStr = geometry; //+label
-                    tempStr += typeProps //+ label 
+                    tempStr += typeProps //+ label
                                         + "\"popupContent\": \""
-                                        + name 
+                                        + name
                                         + "\",\"html\":"
-                                        + html 
+                                        + html
                                         + ",\"radius\":"
                                         + radius
                                         + ",\"uri\": \""
                                         + uri
                                         + "\",\"local\": \""
                                         + local
-                                        + "\"}},";                 
+                                        + "\"}},";
                     response.append(tempStr);
                     previousLabel = label;
                 }
@@ -123,9 +123,9 @@ else if ( label.contains("United Kingdom") ) {
 			return EMPTY_RESPONSE;
 		}
 	}
-           
+
     private List<Map<String,String>>  getGeoLocations(VitroRequest vreq) {
-          
+
         String queryStr = GEO_FOCUS_QUERY;
         log.debug("queryStr = " + queryStr);
         List<Map<String,String>>  locations = new ArrayList<Map<String,String>>();
@@ -137,12 +137,12 @@ private List<Map<String,String>>  getGeoLocations(VitroRequest vreq) {
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
-       
+        }
+
         return locations;
     }
     private Integer calculateRadius(Integer count) {
-          
+
         int radius = 8;
         if ( count != null ) {
             if ( count < 4 ) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java
index c03e464331..8012b782cc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java
@@ -30,7 +30,7 @@ public class GeoFocusResearcherCount extends AbstractAjaxResponder {
         + "    ?person a foaf:Person .  \n"
         + "    ?person core:geographicFocus ?focus   \n"
         + "}" ;
-    
+
 	public GeoFocusResearcherCount(HttpServlet parent, VitroRequest vreq,
 			HttpServletResponse resp) {
 		super(parent, vreq, resp);
@@ -40,9 +40,9 @@ public GeoFocusResearcherCount(HttpServlet parent, VitroRequest vreq,
 	public String prepareResponse() throws IOException {
 		try {
             geoFocusCount = getGeoFocusCount(vreq);
-            
+
             StringBuilder response = new StringBuilder("{ ");
-            
+
             for (Map<String, String> map: geoFocusCount) {
                 String theCount  = map.get("count");
                 response.append("\"count\": \"").append(theCount).append("\"");
@@ -55,9 +55,9 @@ public String prepareResponse() throws IOException {
 			return EMPTY_RESPONSE;
 		}
 	}
-           
+
     private List<Map<String,String>>  getGeoFocusCount(VitroRequest vreq) {
-          
+
         String queryStr = GEO_FOCUS_COUNT_QUERY;
         log.debug("queryStr = " + queryStr);
         List<Map<String,String>>  count = new ArrayList<Map<String,String>>();
@@ -69,8 +69,8 @@ private List<Map<String,String>>  getGeoFocusCount(VitroRequest vreq) {
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
-       
+        }
+
         return count;
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java
index bfc02d108d..bb6e0c5040 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java
@@ -35,7 +35,7 @@ protected void doRequest(VitroRequest vreq, HttpServletResponse resp)
 			}
 			else if ("getGeoFocusResearcherCount".equals(function)) {
 			    new GeoFocusResearcherCount(this, vreq, resp).processRequest();
-			} 
+			}
 			else {
 				resp.getWriter().write("[]");
 			}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
index 444e7e523d..19beed0d64 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
@@ -46,7 +46,7 @@ public class QrCodeDetails extends AbstractAjaxResponder {
         + "               ?vTitle vcard:title ?title . \n"
         + "    } \n"
         + "} "  ;
-    
+
 	public QrCodeDetails(HttpServlet parent, VitroRequest vreq,
 			HttpServletResponse resp) {
 		super(parent, vreq, resp);
@@ -62,17 +62,17 @@ public String prepareResponse() throws IOException {
             String phoneNumber = "";
             String email = "";
 			String response = "[";
-			
+
 			vcardData = getVcardData(individual, vreq);
 
-            for (Map<String, String> map: vcardData) {        
+            for (Map<String, String> map: vcardData) {
                 firstName = map.get("firstName");
                 lastName = map.get("lastName");
                 preferredTitle = map.get("title");
                 phoneNumber = map.get("phone");
                 email = map.get("email");
             }
-            
+
 /*
             String tempUrl = vreq.getRequestURL().toString();
             String prefix = "http://";
@@ -121,7 +121,7 @@ public String prepareResponse() throws IOException {
 			return EMPTY_RESPONSE;
 		}
 	}
-           
+
     private List<Map<String,String>>  getVcardData(Individual individual, VitroRequest vreq) {
         String queryStr = QueryUtils.subUriForQueryVar(VCARD_DATA_QUERY, "subject", individual.getURI());
         log.debug("queryStr = " + queryStr);
@@ -134,8 +134,8 @@ private List<Map<String,String>>  getVcardData(Individual individual, VitroReque
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
-       
+        }
+
         return vcardData;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
index f2de9d4c47..4a19317b5b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
@@ -1,258 +1,258 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.rdf.model.Statement;
-import org.apache.jena.rdf.model.StmtIterator;
-import org.apache.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.LocalNamespaceClassUtils;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
-/*
- * Custom controller for menu management.  This will be replaced later once N3 Editing
- * has been successfully refactored and integrated with menu management.
- */
-@WebServlet(name = "InstitutionalInternalClassController", urlPatterns = {"/processInstitutionalInternalClass"} )
-public class InstitutionalInternalClassController extends FreemarkerHttpServlet {
-    private static final Log log = LogFactory.getLog(InstitutionalInternalClassController.class);
-   
-    private static final String EDIT_FORM = "/processInstitutionalInternalClass";
-    public final static AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.MANAGE_MENUS.ACTION;
-    private static final String DISPLAY_FORM = "/institutionalInternalClassForm.ftl";
-    private static HashMap<String, String> localNamespaces = new HashMap<String, String>();
-    private static HashMap<String, String> localNamespaceClasses = new HashMap<String, String>();
-    private static final String CREATE_CLASS_PARAM = "createClass";
-    private static final String REDIRECT_PAGE = "/siteAdmin";
-    @Override
-    protected AuthorizationRequest requiredActions(VitroRequest vreq) {
-    	return REQUIRED_ACTIONS;
-    }
-
-    @Override
-    protected ResponseValues processRequest(VitroRequest vreq) {
-    	
-    	//Based on existing of local namespaces and number of local classes present
-    	//as well as command parameter, execute command
-    	
-    	Map<String, Object> data = new HashMap<String,Object>();
-    	//Get all local classes and namespace information
-    	retrieveLocalClasses(vreq, data);
-    	if(isSubmission(vreq)){
-    		processSubmission(vreq, data);
-    	} else if(isCreateNewClass(vreq)) {
-    		//Local namespace(s) exist and user wishes to create a new class
-    		//Either cmd = create new or no local classes exist at all and one must be created
-    		processCreateNewClass(vreq, data);
-    	} else if(isSelectExistingClass(vreq)) {
-    		//Local namespace(s) exist and user can select an existing class
-    		processSelectExistingClass(vreq, data);
-    	}  else if(isCreateOntologies(vreq)) {
-    		//Not being handled expliclity but message will display indicating
-    		//no local namespaces exist and one must be created
-    		processCreateOntologies(vreq, data);
-    	} else {
-    		log.error("Don't recognize the type of request.");
-    	}
-    	//Retrieve local namespaces
-    	
-    	
-    	//Check if existing local namespaces
-    	
-    	data.put("formUrl", vreq.getContextPath() + EDIT_FORM);
-    	data.put("cancelUrl", vreq.getContextPath() + REDIRECT_PAGE);
-
-    	//if no local namespaces, then provide message to display
-    	//if existing namespace(s), then check
-    	//if single namespace, retrieve all classes belonging to that local namespace
-    	//if multiple namespaces, generate select list with namespaces
-    	//for instertion: VClassDaoJena.insertVClass
-    	//
-    	if(isSubmission(vreq)){
-    		return redirectToSiteAdmin();
-    	} 
-    	return new TemplateResponseValues(DISPLAY_FORM, data);
-    	
-    }
-
-	private boolean isSubmission(VitroRequest vreq) {
-		String submit = vreq.getParameter("submitForm");
-		return(submit!= null && !submit.isEmpty());
-	}
-
-	private void processCreateOntologies(VitroRequest vreq, Map<String, Object> data) {
-		data.put("submitAction", "");
-		
-	}
-
-	private boolean isCreateOntologies(VitroRequest vreq) {
-		//no local namespaces
-		return (localNamespaces.size() == 0);
-		
-	}
-
-	private void processCreateNewClass(VitroRequest vreq, Map<String, Object> data) {
-		//this may need to be changed on the basis of how new classes interact with new ontologies 
-		data.put("submitAction", "Create Class");
-		data.put("createNewClass", true);
-	}
-
-	private boolean isCreateNewClass(VitroRequest vreq) {
-		String command = vreq.getParameter("cmd");
-		if(command != null && command.equals(CREATE_CLASS_PARAM)) {
-			return true;
-		}
-		//If local namespace exists but no classes in local namespaces, then need to enable creation of new classes
-		return(localNamespaces.size() > 0 && localNamespaceClasses.size() == 0);
-	}
-
-	private void processSelectExistingClass(VitroRequest vreq, Map<String, Object> data) {
-		//Check if local classes exist and use for selection
-		data.put("useExistingLocalClass", true);
-		data.put("submitAction", "Save");
-	}
-
-	private boolean isSelectExistingClass(VitroRequest vreq) {
-		//Local namespaces exist and there are existing classes within those namespaces
-		return (localNamespaces.size() > 0 && localNamespaceClasses.size() > 0);
-	}
-
-	
-
-	private void retrieveLocalClasses(VitroRequest vreq, Map<String, Object> data) {
-		localNamespaces = LocalNamespaceClassUtils.getLocalOntologyNamespaces(vreq);
-    	//Get classes for local namespaces
-    	localNamespaceClasses = LocalNamespaceClassUtils.getLocalNamespacesClasses(vreq, localNamespaces);
-    	data.put("existingLocalClasses", localNamespaceClasses);
-    	data.put("existingLocalNamespaces", localNamespaces);
-    	String noLocalOntologiesMessage = "There are currently no local ontologies.  You must create a new ontology";
-    	data.put("noLocalOntologiesMessage", noLocalOntologiesMessage);
-    	if(localNamespaces.size() == 0) {
-    		data.put("ontologiesExist", false);
-    	}
-    	else {
-    		data.put("ontologiesExist", true);
-    		if(localNamespaces.size() > 1) {
-    			data.put("multipleLocalNamespaces", true);
-    		} else {
-    			data.put("multipleLocalNamespaces", false);
-    			data.put("existingLocalNamespace", localNamespaces.keySet().iterator().next());
-    		}
-    		//Get current internal class if it exists
-    		data.put("existingInternalClass", retrieveCurrentInternalClass());
-    	}
-    	//Place default namespace within data to pass back to template
-    	String defaultNamespace = vreq.getWebappDaoFactory().getDefaultNamespace();
-    	data.put("defaultNamespace", defaultNamespace);
-	}
-
-    
-    //Process submission on submitting form
-	private void processSubmission(VitroRequest vreq, Map<String, Object> data) {
-		//If new class, need to generate new class
-		String classUri = null;
-		if(isNewClassSubmission(vreq)){
-			VClass v= generateNewVClass(vreq.getParameter("localClassName"), vreq.getParameter("existingLocalNamespaces"));
-			classUri = v.getURI();
-			try {
-				vreq.getWebappDaoFactory().getVClassDao().insertNewVClass(v);
-			} catch(Exception ex) {
-				log.error("Insertion of new class " + vreq.getParameter("name") + " resulted in error ", ex);
-			} 
-		} else {
-			//Existing class so get URI from that
-			classUri = getExistingClassUri(vreq);
-		}
-		//If existing class, need to simply add a statement specifying existing class is an internal class
-		if(classUri != null && !classUri.isEmpty()) {
-			Model writeModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS);
-			writeModel.enterCriticalSection(Lock.WRITE);
-			writeModel.notifyEvent(new EditEvent(null,true));
-			try {
-				log.debug("Should be removing these statements " + writeModel.listStatements(null, 
-						ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), 
-						(RDFNode) null).toList().toString());
-				//remove existing internal classes if there are any as assuming only one
-				writeModel.removeAll(null, 
-								ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), 
-								(RDFNode) null);
-				log.debug("Are there any statements left for internal class annotation:  " + writeModel.listStatements(null, 
-						ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), 
-						(RDFNode) null).toList().toString());
-				writeModel.add(
-						writeModel.createStatement(
-								ResourceFactory.createResource(classUri),
-								ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT),
-								writeModel.createLiteral("true")));
-			} catch(Exception ex) {
-				log.error("Error occurred in adding statement for " + classUri + " becoming internal class", ex);
-			} finally {
-				writeModel.notifyEvent(new EditEvent(null,true));
-				writeModel.leaveCriticalSection();
-			}
-		}
-	}
-    
-	private VClass generateNewVClass(String newClassName, String namespace) {
-		VClass newClass = new VClass();
-		newClass.setName(newClassName);
-		newClass.setNamespace(namespace);
-		String uri = namespace + newClassName.replaceAll(" ", "");
-		newClass.setURI(uri);
-		//How to g
-		return newClass;
-	}
-    
-	private boolean isNewClassSubmission(VitroRequest vreq) {
-		String localName = vreq.getParameter("localClassName");
-		return (localName != null && !localName.isEmpty());
-	}
-	
-	private String getExistingClassUri(VitroRequest vreq) {
-		return vreq.getParameter("existingLocalClasses");
-		
-	}
-	
-	private RedirectResponseValues redirectToSiteAdmin() {
-		return new RedirectResponseValues(REDIRECT_PAGE, HttpServletResponse.SC_SEE_OTHER);
-	}
-	
-	//Get current internal class
-	private String retrieveCurrentInternalClass() {
-		String internalClassUri = "";
-		Model mainModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS);
-		StmtIterator internalIt = mainModel.listStatements(null, 
-				ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), 
-				(RDFNode) null);
-		while(internalIt.hasNext()){
-			Statement s = internalIt.nextStatement();
-			//The class IS an internal class so the subject is what we're looking for
-			internalClassUri = s.getSubject().getURI();
-			log.debug("Found internal class uri " + internalClassUri);
-		}
-		return internalClassUri;
-	}
-	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.LocalNamespaceClassUtils;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+/*
+ * Custom controller for menu management.  This will be replaced later once N3 Editing
+ * has been successfully refactored and integrated with menu management.
+ */
+@WebServlet(name = "InstitutionalInternalClassController", urlPatterns = {"/processInstitutionalInternalClass"} )
+public class InstitutionalInternalClassController extends FreemarkerHttpServlet {
+    private static final Log log = LogFactory.getLog(InstitutionalInternalClassController.class);
+
+    private static final String EDIT_FORM = "/processInstitutionalInternalClass";
+    public final static AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.MANAGE_MENUS.ACTION;
+    private static final String DISPLAY_FORM = "/institutionalInternalClassForm.ftl";
+    private static HashMap<String, String> localNamespaces = new HashMap<String, String>();
+    private static HashMap<String, String> localNamespaceClasses = new HashMap<String, String>();
+    private static final String CREATE_CLASS_PARAM = "createClass";
+    private static final String REDIRECT_PAGE = "/siteAdmin";
+    @Override
+    protected AuthorizationRequest requiredActions(VitroRequest vreq) {
+    	return REQUIRED_ACTIONS;
+    }
+
+    @Override
+    protected ResponseValues processRequest(VitroRequest vreq) {
+
+    	//Based on existing of local namespaces and number of local classes present
+    	//as well as command parameter, execute command
+
+    	Map<String, Object> data = new HashMap<String,Object>();
+    	//Get all local classes and namespace information
+    	retrieveLocalClasses(vreq, data);
+    	if(isSubmission(vreq)){
+    		processSubmission(vreq, data);
+    	} else if(isCreateNewClass(vreq)) {
+    		//Local namespace(s) exist and user wishes to create a new class
+    		//Either cmd = create new or no local classes exist at all and one must be created
+    		processCreateNewClass(vreq, data);
+    	} else if(isSelectExistingClass(vreq)) {
+    		//Local namespace(s) exist and user can select an existing class
+    		processSelectExistingClass(vreq, data);
+    	}  else if(isCreateOntologies(vreq)) {
+    		//Not being handled expliclity but message will display indicating
+    		//no local namespaces exist and one must be created
+    		processCreateOntologies(vreq, data);
+    	} else {
+    		log.error("Don't recognize the type of request.");
+    	}
+    	//Retrieve local namespaces
+
+
+    	//Check if existing local namespaces
+
+    	data.put("formUrl", vreq.getContextPath() + EDIT_FORM);
+    	data.put("cancelUrl", vreq.getContextPath() + REDIRECT_PAGE);
+
+    	//if no local namespaces, then provide message to display
+    	//if existing namespace(s), then check
+    	//if single namespace, retrieve all classes belonging to that local namespace
+    	//if multiple namespaces, generate select list with namespaces
+    	//for instertion: VClassDaoJena.insertVClass
+    	//
+    	if(isSubmission(vreq)){
+    		return redirectToSiteAdmin();
+    	}
+    	return new TemplateResponseValues(DISPLAY_FORM, data);
+
+    }
+
+	private boolean isSubmission(VitroRequest vreq) {
+		String submit = vreq.getParameter("submitForm");
+		return(submit!= null && !submit.isEmpty());
+	}
+
+	private void processCreateOntologies(VitroRequest vreq, Map<String, Object> data) {
+		data.put("submitAction", "");
+
+	}
+
+	private boolean isCreateOntologies(VitroRequest vreq) {
+		//no local namespaces
+		return (localNamespaces.size() == 0);
+
+	}
+
+	private void processCreateNewClass(VitroRequest vreq, Map<String, Object> data) {
+		//this may need to be changed on the basis of how new classes interact with new ontologies
+		data.put("submitAction", "Create Class");
+		data.put("createNewClass", true);
+	}
+
+	private boolean isCreateNewClass(VitroRequest vreq) {
+		String command = vreq.getParameter("cmd");
+		if(command != null && command.equals(CREATE_CLASS_PARAM)) {
+			return true;
+		}
+		//If local namespace exists but no classes in local namespaces, then need to enable creation of new classes
+		return(localNamespaces.size() > 0 && localNamespaceClasses.size() == 0);
+	}
+
+	private void processSelectExistingClass(VitroRequest vreq, Map<String, Object> data) {
+		//Check if local classes exist and use for selection
+		data.put("useExistingLocalClass", true);
+		data.put("submitAction", "Save");
+	}
+
+	private boolean isSelectExistingClass(VitroRequest vreq) {
+		//Local namespaces exist and there are existing classes within those namespaces
+		return (localNamespaces.size() > 0 && localNamespaceClasses.size() > 0);
+	}
+
+
+
+	private void retrieveLocalClasses(VitroRequest vreq, Map<String, Object> data) {
+		localNamespaces = LocalNamespaceClassUtils.getLocalOntologyNamespaces(vreq);
+    	//Get classes for local namespaces
+    	localNamespaceClasses = LocalNamespaceClassUtils.getLocalNamespacesClasses(vreq, localNamespaces);
+    	data.put("existingLocalClasses", localNamespaceClasses);
+    	data.put("existingLocalNamespaces", localNamespaces);
+    	String noLocalOntologiesMessage = "There are currently no local ontologies.  You must create a new ontology";
+    	data.put("noLocalOntologiesMessage", noLocalOntologiesMessage);
+    	if(localNamespaces.size() == 0) {
+    		data.put("ontologiesExist", false);
+    	}
+    	else {
+    		data.put("ontologiesExist", true);
+    		if(localNamespaces.size() > 1) {
+    			data.put("multipleLocalNamespaces", true);
+    		} else {
+    			data.put("multipleLocalNamespaces", false);
+    			data.put("existingLocalNamespace", localNamespaces.keySet().iterator().next());
+    		}
+    		//Get current internal class if it exists
+    		data.put("existingInternalClass", retrieveCurrentInternalClass());
+    	}
+    	//Place default namespace within data to pass back to template
+    	String defaultNamespace = vreq.getWebappDaoFactory().getDefaultNamespace();
+    	data.put("defaultNamespace", defaultNamespace);
+	}
+
+
+    //Process submission on submitting form
+	private void processSubmission(VitroRequest vreq, Map<String, Object> data) {
+		//If new class, need to generate new class
+		String classUri = null;
+		if(isNewClassSubmission(vreq)){
+			VClass v= generateNewVClass(vreq.getParameter("localClassName"), vreq.getParameter("existingLocalNamespaces"));
+			classUri = v.getURI();
+			try {
+				vreq.getWebappDaoFactory().getVClassDao().insertNewVClass(v);
+			} catch(Exception ex) {
+				log.error("Insertion of new class " + vreq.getParameter("name") + " resulted in error ", ex);
+			}
+		} else {
+			//Existing class so get URI from that
+			classUri = getExistingClassUri(vreq);
+		}
+		//If existing class, need to simply add a statement specifying existing class is an internal class
+		if(classUri != null && !classUri.isEmpty()) {
+			Model writeModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS);
+			writeModel.enterCriticalSection(Lock.WRITE);
+			writeModel.notifyEvent(new EditEvent(null,true));
+			try {
+				log.debug("Should be removing these statements " + writeModel.listStatements(null,
+						ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT),
+						(RDFNode) null).toList().toString());
+				//remove existing internal classes if there are any as assuming only one
+				writeModel.removeAll(null,
+								ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT),
+								(RDFNode) null);
+				log.debug("Are there any statements left for internal class annotation:  " + writeModel.listStatements(null,
+						ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT),
+						(RDFNode) null).toList().toString());
+				writeModel.add(
+						writeModel.createStatement(
+								ResourceFactory.createResource(classUri),
+								ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT),
+								writeModel.createLiteral("true")));
+			} catch(Exception ex) {
+				log.error("Error occurred in adding statement for " + classUri + " becoming internal class", ex);
+			} finally {
+				writeModel.notifyEvent(new EditEvent(null,true));
+				writeModel.leaveCriticalSection();
+			}
+		}
+	}
+
+	private VClass generateNewVClass(String newClassName, String namespace) {
+		VClass newClass = new VClass();
+		newClass.setName(newClassName);
+		newClass.setNamespace(namespace);
+		String uri = namespace + newClassName.replaceAll(" ", "");
+		newClass.setURI(uri);
+		//How to g
+		return newClass;
+	}
+
+	private boolean isNewClassSubmission(VitroRequest vreq) {
+		String localName = vreq.getParameter("localClassName");
+		return (localName != null && !localName.isEmpty());
+	}
+
+	private String getExistingClassUri(VitroRequest vreq) {
+		return vreq.getParameter("existingLocalClasses");
+
+	}
+
+	private RedirectResponseValues redirectToSiteAdmin() {
+		return new RedirectResponseValues(REDIRECT_PAGE, HttpServletResponse.SC_SEE_OTHER);
+	}
+
+	//Get current internal class
+	private String retrieveCurrentInternalClass() {
+		String internalClassUri = "";
+		Model mainModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS);
+		StmtIterator internalIt = mainModel.listStatements(null,
+				ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT),
+				(RDFNode) null);
+		while(internalIt.hasNext()){
+			Statement s = internalIt.nextStatement();
+			//The class IS an internal class so the subject is what we're looking for
+			internalClassUri = s.getSubject().getURI();
+			log.debug("Found internal class uri " + internalClassUri);
+		}
+		return internalClassUri;
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
index 6a5024b06e..fbb5b46738 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
@@ -32,7 +32,7 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(ManageGrantsForIndividualController.class.getName());
     private static final String TEMPLATE_NAME = "manageGrantsForIndividual.ftl";
-    
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.DO_FRONT_END_EDITING.ACTION;
@@ -54,17 +54,17 @@ protected ResponseValues processRequest(VitroRequest vreq) {
 
         List<String> allSubclasses = getAllSubclasses(grants);
         body.put("allSubclasses", allSubclasses);
-        
+
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
         if( subject != null && subject.getName() != null ){
              body.put("subjectName", subject.getName());
         }else{
              body.put("subjectName", null);
         }
-        
+
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
-  
+
     private static String GRANT_QUERY = ""
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
@@ -87,12 +87,12 @@ protected ResponseValues processRequest(VitroRequest vreq) {
 		+ "        ?activity a core:Project . \n"
         + "        ?activity rdfs:label ?label2 . \n"
         + "    } \n"
-        + "    OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n" 
+        + "    OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n"
         + "} ORDER BY ?subclass ?label2";
-    
+
     HashMap<String, List<Map<String,String>>>  getGrants(String subjectUri, VitroRequest vreq) {
-        VClassDao vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao(); 
-          
+        VClassDao vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
+
         String queryStr = QueryUtils.subUriForQueryVar(GRANT_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
         HashMap<String, List<Map<String,String>>>  subclassToGrants = new HashMap<String, List<Map<String,String>>>();
@@ -109,13 +109,13 @@ HashMap<String, List<Map<String,String>>>  getGrants(String subjectUri, VitroReq
                         subclassToGrants.put(subclass, new ArrayList<Map<String,String>>()); //list of grant information
                     }
                     List<Map<String,String>> grantsList = subclassToGrants.get(subclass);
-                    grantsList.add(QueryUtils.querySolutionToStringValueMap(soln)); 
-                }       
+                    grantsList.add(QueryUtils.querySolutionToStringValueMap(soln));
+                }
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
-       
+        }
+
         return subclassToGrants;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
index dc68d76ddd..aad9f18056 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
@@ -32,7 +32,7 @@ public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet
 
     private static final Log log = LogFactory.getLog(ManagePeopleForOrganizationController.class.getName());
     private static final String TEMPLATE_NAME = "managePeopleForOrganization.ftl";
-    
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.DO_FRONT_END_EDITING.ACTION;
@@ -54,17 +54,17 @@ protected ResponseValues processRequest(VitroRequest vreq) {
 
         List<String> allSubclasses = getAllSubclasses(people);
         body.put("allSubclasses", allSubclasses);
-        
+
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
         if( subject != null && subject.getName() != null ){
              body.put("subjectName", subject.getName());
         }else{
              body.put("subjectName", null);
         }
-        
+
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
-  
+
 	private static String PEOPLE_QUERY = ""
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
@@ -88,8 +88,8 @@ protected ResponseValues processRequest(VitroRequest vreq) {
 		+ "    } \n "
         + "    OPTIONAL { ?position core:hideFromDisplay ?hideThis } \n "
         + "    FILTER ( !BOUND(?displayRank) || ?displayRank < 500 )"
-        + "} ORDER BY ?subclass ?name";    
-       
+        + "} ORDER BY ?subclass ?name";
+
     HashMap<String, List<Map<String,String>>>  getPeople(String subjectUri, VitroRequest vreq) {
         VClassDao vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
 
@@ -106,7 +106,7 @@ HashMap<String, List<Map<String,String>>>  getPeople(String subjectUri, VitroReq
                     VClass vClass = vcDao.getVClassByURI(subclassUriStr);
                     String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
                     if(!subclassToPeople.containsKey(subclass)) {
-                        subclassToPeople.put(subclass, new ArrayList<Map<String,String>>()); 
+                        subclassToPeople.put(subclass, new ArrayList<Map<String,String>>());
                     }
                     List<Map<String,String>> peopleList = subclassToPeople.get(subclass);
                     peopleList.add(QueryUtils.querySolutionToStringValueMap(soln));
@@ -114,7 +114,7 @@ HashMap<String, List<Map<String,String>>>  getPeople(String subjectUri, VitroReq
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
+        }
 
         return subclassToPeople;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
index 6e00385272..d1e6ff1c60 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
@@ -32,7 +32,7 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
 
     private static final Log log = LogFactory.getLog(ManagePublicationsForIndividualController.class.getName());
     private static final String TEMPLATE_NAME = "managePublicationsForIndividual.ftl";
-    
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.DO_FRONT_END_EDITING.ACTION;
@@ -54,17 +54,17 @@ protected ResponseValues processRequest(VitroRequest vreq) {
 
         List<String> allSubclasses = getAllSubclasses(publications);
         body.put("allSubclasses", allSubclasses);
-        
+
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
         if( subject != null && subject.getName() != null ){
              body.put("subjectName", subject.getName());
         }else{
              body.put("subjectName", null);
         }
-        
+
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
-  
+
     private static String PUBLICATION_QUERY = ""
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
@@ -85,10 +85,10 @@ protected ResponseValues processRequest(VitroRequest vreq) {
         + "            ?pub a <http://purl.org/ontology/bibo/Document> . \n"
         + "            ?pub vitro:mostSpecificType ?subclass . \n"
         + "        } \n"
-        + "    } \n" 
+        + "    } \n"
         + "    OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } \n"
         + "} ORDER BY ?subclass ?title";
-    
+
     HashMap<String, List<Map<String,String>>>  getPublications(String subjectUri, VitroRequest vreq) {
 
         VClassDao vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
@@ -118,8 +118,8 @@ HashMap<String, List<Map<String,String>>>  getPublications(String subjectUri, Vi
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
-       
+        }
+
         return subclassToPublications;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
index 6844dadb51..e7fcb2ae23 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.harvester; 
+package edu.cornell.mannlib.vitro.webapp.controller.harvester;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -69,7 +69,7 @@ public static JobType getByHttpParameterName(String httpParameterName) {
             }
             return returnValue;
         }
-        
+
         private JobType(String httpParameterName, String templateFileName, String scriptFileName, String xsltFileName, String friendlyName, String linkHeader, String noNewDataMessage, String[] rdfTypesForLinks) {
             this.httpParameterName = httpParameterName;
             this.templateFileName = templateFileName;
@@ -80,13 +80,13 @@ private JobType(String httpParameterName, String templateFileName, String script
             this.noNewDataMessage = noNewDataMessage;
             this.rdfTypesForLinks = Arrays.copyOf(rdfTypesForLinks, rdfTypesForLinks.length);
         }
-        
+
         private CsvFileHarvestJob constructCsvFileHarvestJob(VitroRequest vreq, String namespace) {
             return new CsvFileHarvestJob(vreq, this.templateFileName, this.scriptFileName, this.xsltFileName, namespace, this.friendlyName, this.linkHeader, this.noNewDataMessage, this.rdfTypesForLinks);
         }
     }
 
-    
+
     /**
      * Logger.
      */
@@ -139,17 +139,17 @@ private CsvFileHarvestJob constructCsvFileHarvestJob(VitroRequest vreq, String n
      * An array of rdf:type values which will be used for links.
      */
     private final String[] rdfTypesForLinks;
-    
+
     /**
      * The session ID of this user session.
      */
     private final String sessionId;
 
-    
+
     public static CsvFileHarvestJob createJob(JobType jobType, VitroRequest vreq, String namespace) {
         return jobType.constructCsvFileHarvestJob(vreq, namespace);
     }
-    
+
     /**
      * Constructor.
      * @param templateFileName just the name of the template file.  The directory is assumed to be standard.
@@ -164,7 +164,7 @@ private CsvFileHarvestJob(VitroRequest vreq, String templateFileName, String scr
         this.linkHeader = linkHeader;
         this.noNewDataMessage = noNewDataMessage;
         this.rdfTypesForLinks = Arrays.copyOf(rdfTypesForLinks, rdfTypesForLinks.length);
-        
+
         this.sessionId = this.vreq.getSession().getId();
     }
 
@@ -189,27 +189,27 @@ private String getScriptFileDirectory() {
     }
 
 
-    
+
     private boolean[] getLinesEndingInComma(File file) throws IOException {
         ArrayList<Boolean> linesEndingInCommaList = new ArrayList<Boolean>();
-        
+
         BufferedReader reader = new BufferedReader(new FileReader(file));
-        
+
         for(String line = reader.readLine(); line != null; line = reader.readLine()) {
             boolean lineEndsInComma = line.endsWith(",");
             linesEndingInCommaList.add(lineEndsInComma);
         }
         reader.close();
-        
+
         boolean[] linesEndingInComma = new boolean[linesEndingInCommaList.size()];
         for(int i = 0; i < linesEndingInComma.length; i++) {
             linesEndingInComma[i] = linesEndingInCommaList.get(i);
         }
         return linesEndingInComma;
     }
-    
-    
-    
+
+
+
     @Override
     @SuppressWarnings("rawtypes")
     public String validateUpload(File file) {
@@ -256,31 +256,31 @@ public String validateUpload(File file) {
         }
     }
 
-/*    
+/*
     private void prepareWorkspaceDirectory() {
         String path = FileHarvestController.getFileHarvestRootPath() + "workspaces/" + this.sessionId;
         File directory = new File(path);
         if(!directory.exists())
             directory.mkdirs();
-        
+
         File scriptTemplate = this.scriptFile;
         String scriptTemplateContents = readFromFile(scriptTemplate);
         String scriptTemplateReplacements = performScriptTemplateReplacements(scriptTemplateContents);
         File outputScriptFile = new File(path + "/" + scriptTemplate.getName());
         writeToFile(outputScriptFile, scriptTemplateReplacements);
-        
+
         File xsltTemplate = this.xsltFile;
         String xsltTemplateContents = readFromFile(xsltTemplate);
         String xsltTemplateReplacements = performXsltTemplateReplacements(xsltTemplateContents);
         File outputXsltFile = new File(path + "/" + xsltTemplate.getName());
         writeToFile(outputXsltFile, xsltTemplateReplacements);
-        
+
     }
-*/    
-    
-    
-    
-    
+*/
+
+
+
+
     @Override
     public String getScript()
     {
@@ -302,7 +302,7 @@ private String performScriptTemplateReplacements(String scriptTemplateContents)
 
         if(harvestedDataPath.endsWith("/"))
             harvestedDataPath = harvestedDataPath.substring(0, harvestedDataPath.length() - 1);
-        
+
         replacements = replacements.replace("${WORKING_DIRECTORY}", workingDirectory);
         replacements = replacements.replace("${UPLOADS_FOLDER}", fileDirectory);
         replacements = replacements.replace("${HARVESTED_DATA_PATH}", harvestedDataPath);
@@ -314,13 +314,13 @@ private String performScriptTemplateReplacements(String scriptTemplateContents)
 /*
     private String performXsltTemplateReplacements(String xsltTemplateContents) {
         String replacements = xsltTemplateContents;
-        
+
         replacements = replacements.replace("", "");
 
         return replacements;
     }
 
-    
+
     private void writeToFile(File file, String contents) {
         PrintWriter writer = null;
         try {
@@ -333,7 +333,7 @@ private void writeToFile(File file, String contents) {
                 writer.close();
         }
     }
-*/    
+*/
 
     private String readFromFile(File file) {
         String contents = null;
@@ -407,7 +407,7 @@ public String getTemplateFillInHelp() {
     public String getNoNewDataMessage() {
         return this.noNewDataMessage;
     }
-    
+
 }
 
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java
index f45d5ad5b9..e58b285519 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java
@@ -54,7 +54,7 @@ public class FileHarvestController extends FreemarkerHttpServlet {
     private static final String TEMPLATE_DEFAULT = "fileharvest.ftl";
 
     private static final String NORMAL_TERMINATION_LAST_OUTPUT = "File Harvest completed successfully";
-    
+
     private static final String PARAMETER_FIRST_UPLOAD = "firstUpload";
     private static final String PARAMETER_UPLOADED_FILE = "uploadedFile";
     private static final String PARAMETER_MODE = "mode";
@@ -191,7 +191,7 @@ protected String getTitle(String siteName, VitroRequest vreq) {
      */
     public static String getHarvesterPath(HttpServletRequest req)
     {
-    	String pathToHarvester = ConfigurationProperties.getBean(req).getProperty("harvester.location"); 
+    	String pathToHarvester = ConfigurationProperties.getBean(req).getProperty("harvester.location");
     	if (pathToHarvester == null) {
     		log.error("The runtime.properties file does not contain a value for 'harvester.location'");
     		return "";
@@ -217,7 +217,7 @@ public static String getFileHarvestRootPath(HttpServletRequest req)
      */
     private static String getUploadPathBase(ServletContext context) throws Exception
     {
-        String vitroHomeDirectoryName = ApplicationUtils.instance().getHomeDirectory().getPath().toString(); 
+        String vitroHomeDirectoryName = ApplicationUtils.instance().getHomeDirectory().getPath().toString();
         return vitroHomeDirectoryName + "/" + FileStorageImplWrapper.FILE_STORAGE_SUBDIRECTORY + "/" + PATH_TO_UPLOADS;
     }
 
@@ -419,7 +419,7 @@ private void doHarvestPost(HttpServletRequest request, HttpServletResponse respo
         	json = generateJson(true);
             log.error(e, e);
         }
-        
+
         try {
         	response.getWriter().write(json.toString());
         } catch(IOException e) {
@@ -477,8 +477,8 @@ private void doCheckHarvestStatusPost(HttpServletRequest request, HttpServletRes
 
                     //remove all entries in "sessionIdTo..." mappings for this session ID
                     clearSessionInfo(sessionId);
-                    
-                    if(sessionInfo.getAbnormalTermination()) 
+
+                    if(sessionInfo.getAbnormalTermination())
                     	abnormalTermination = true;
                 }
 
@@ -500,7 +500,7 @@ private void doCheckHarvestStatusPost(HttpServletRequest request, HttpServletRes
         	json = generateJson(true);
             log.error(e, e);
         }
-        
+
         try {
         	response.getWriter().write(json.toString());
         } catch(IOException e) {
@@ -543,9 +543,9 @@ private void doDownloadTemplatePost(HttpServletRequest request, HttpServletRespo
     private static String getScriptFileLocation(HttpServletRequest req) {
         return getHarvesterPath(req) + PATH_TO_HARVESTER_SCRIPTS + "temp/";
     }
-    
-    
-    
+
+
+
     private File createScriptFile(String scriptFileLocation, String script) throws IOException {
         File scriptDirectory = new File(scriptFileLocation);
         if(!scriptDirectory.exists()) {
@@ -631,7 +631,7 @@ private void extractNewlyAddedUris(File additionsFile, List<String> newlyAddedUr
                 Node node = descriptionNodes.item(i);
 
                 ArrayList<String> types = getRdfTypes(node);
-                
+
                 boolean match = false;
                 String[] validRdfTypesForJob = job.getRdfTypesForLinks();
                 for(String rdfType : validRdfTypesForJob) {
@@ -640,7 +640,7 @@ private void extractNewlyAddedUris(File additionsFile, List<String> newlyAddedUr
                         break;
                     }
                 }
-                
+
                 if(match) {
 
                     NamedNodeMap attributes = node.getAttributes();
@@ -795,7 +795,7 @@ public void setAbnormalTermination() {
         public boolean getAbnormalTermination() {
         	return abnormalTermination;
         }
-        
+
         public void finish() {
             finished = true;
         }
@@ -833,7 +833,7 @@ public ScriptRunner(String sessionId, String script, String additionsFilePath, S
             this.sessionId = sessionId;
             this.script = script;
             this.additionsFilePath = additionsFilePath;
-            this.scriptFileLocation = scriptFileLocation; 
+            this.scriptFileLocation = scriptFileLocation;
             this.job = job;
         }
 
@@ -863,7 +863,7 @@ public void run() {
                     for(String line = processOutputReader.readLine(); line != null; line = processOutputReader.readLine()) {
 
                     	normalTerminationLineFound = line.endsWith(NORMAL_TERMINATION_LAST_OUTPUT); //set every read to ensure it's the last line
-                    	
+
                         //don't add stuff to this list if the main thread is running a "transaction" of copying out the data to send to client and then clearing the list
                         synchronized(unsentLogLines) {
                             unsentLogLines.add(line);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java
index d1c08b345c..26a2457ef0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java
@@ -1,12 +1,12 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.harvester; 
+package edu.cornell.mannlib.vitro.webapp.controller.harvester;
 
 import java.io.File;
 
 
 /**
- * Handles specifics of a file harvest.  
+ * Handles specifics of a file harvest.
  * @author mbarbieri
  *
  */
@@ -26,7 +26,7 @@ interface FileHarvestJob {
     String getTemplateFilePath();
 
     /**
-     * Gets the console script which can be used to run the harvest job. 
+     * Gets the console script which can be used to run the harvest job.
      * @return the console script which can be used to run the harvest job
      */
     String getScript();
@@ -44,30 +44,30 @@ interface FileHarvestJob {
     String getPageHeader();
 
     /**
-     * A heading to be shown above the area where links to profiles of newly-harvested entities are listed. 
+     * A heading to be shown above the area where links to profiles of newly-harvested entities are listed.
      * @return a heading to be shown above the area where links to profiles of newly-harvested entities are listed
      */
     String getLinkHeader();
-    
+
     /**
      * Get an array of fully-qualified rdf:type values.  When the harvest run is complete, any new entities which have an rdf:type represented
-     * in this array will have a link displayed on the page allowing the user to visit the new profile. 
+     * in this array will have a link displayed on the page allowing the user to visit the new profile.
      * @return an array of types to be used in links
      */
     String[] getRdfTypesForLinks();
-    
+
     /**
      * Get the HTML to be shown on the page immediately next to the "Download" button for the template.
      * @return the HTML to be shown on the page immediately next to the "Download" button for the template.
      */
     String getTemplateDownloadHelp();
-    
+
     /**
      * Get the HTML to be shown in the collapsible "Help" area in the "Fill in data" section of the page.
      * @return the HTML to be shown in the collapsible "Help" area in the "Fill in data" section of the page.
      */
     String getTemplateFillInHelp();
-    
+
     /**
      * Get the message to show to the user if there are no newly-harvested entities to show them.
      * @return the message to show to the user if there are no newly-harvested entities to show them
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java
index e0e4b44aab..37c96e4c7d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.harvester; 
+package edu.cornell.mannlib.vitro.webapp.controller.harvester;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,7 +47,7 @@
  * but that was troublesome for a few reasons, the most important being related to the simple fact that the
  * Harvester was designed to be used as a collection of command-line tools, and thus we have, for example, the
  * versatility of Score which would be very difficult to replicate without essentially allowing the user to
- * pass in a string to be parsed, which would defeat the purpose.   
+ * pass in a string to be parsed, which would defeat the purpose.
  *
  * @author mbarbieri
  *
@@ -81,7 +81,7 @@ public static void runPubmedFetch(Object ... args) {
     public static void runPubmedHTTPFetch(Object ... args) {
         PubmedHTTPFetch.main(stringsToArray(args));
     }
-    
+
     // qualify
     public static void runChangeNamespace(Object ... args) {
         ChangeNamespace.main(stringsToArray(args));
@@ -101,7 +101,7 @@ public static void runSmush(Object ... args) {
     public static void runSplitProperty(Object ... args) {
         SplitProperty.main(stringsToArray(args));
     }
-    
+
     // score
     public static void runMatch(Object ... args) {
         Match.main(stringsToArray(args));
@@ -112,12 +112,12 @@ public static void runPubmedScore(Object ... args) {
     public static void runScore(Object ... args) {
         Score.main(stringsToArray(args));
     }
-    
+
     // transfer
     public static void runTransfer(Object ... args) {
         Transfer.main(stringsToArray(args));
     }
-    
+
     // translate
     public static void runGlozeTranslator(Object ... args) {
         GlozeTranslator.main(stringsToArray(args));
@@ -153,21 +153,21 @@ public static void runXPathTool(Object ... args) {
     /**
      * Convenience method to expand the ability to use Java's "..." arg list.  Harvester scripts frequently declare sub-macros,
      * so for example you might have:
-     * 
+     *
      * SCOREINPUT="-i $H2MODEL -ImodelName=$MODELNAME -IdbUrl=$MODELDBURL -IcheckEmpty=$CHECKEMPTY"
      * SCOREDATA="-s $H2MODEL -SmodelName=$SCOREDATANAME -SdbUrl=$SCOREDATADBURL -ScheckEmpty=$CHECKEMPTY"
      * SCOREMODELS="$SCOREINPUT -v $VIVOCONFIG -VcheckEmpty=$CHECKEMPTY $SCOREDATA -t $TEMPCOPYDIR -b $SCOREBATCHSIZE"
      * $Score $SCOREMODELS -AGrantNumber=$EQTEST -WGrantNumber=1.0 -FGrantNumber=$GRANTIDNUM -PGrantNumber=$GRANTIDNUM -n ${BASEURI}grant/
-     * 
+     *
      * In order to mimic this functionality for easy use in Java, this method has been created.  It takes a "..." arg list of Object
      * objects, and returns an array of Strings.  For each object, if it's an array of Strings, each String is added to the output
      * array.  Otherwise, its toString() method is called and that value is added to the output array.
-     * 
-     * It is intended to be used with a combination of String and String[] values, in any arbitrary order.  
-     * 
+     *
+     * It is intended to be used with a combination of String and String[] values, in any arbitrary order.
+     *
      * All static Harvester methods in this class take an Object arg list rather than a String arg list, and automatically call
      * this method.
-     * 
+     *
      * @param args an array of objects, which ought to be a combination of String and String[] values, in any arbitrary order
      * @return all the strings put together as one array
      */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
index cf56ac9307..3c09301d49 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
@@ -40,73 +40,73 @@ public class AjaxVisualizationController extends FreemarkerHttpServlet {
 	public static final String URL_ENCODING_SCHEME = "UTF-8";
 
 	private static final Log log = LogFactory.getLog(AjaxVisualizationController.class.getName());
-	
+
     protected static final Syntax SYNTAX = Syntax.syntaxARQ;
-    
+
     public static ServletContext servletContext;
-    
+
     @Override
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
-    	
+
     	/*
-    	 * Based on the query parameters passed via URI get the appropriate visualization 
+    	 * Based on the query parameters passed via URI get the appropriate visualization
     	 * request handler.
     	 * */
-    	VisualizationRequestHandler visRequestHandler = 
+    	VisualizationRequestHandler visRequestHandler =
     			getVisualizationRequestHandler(vreq);
-    	
+
     	if (visRequestHandler != null) {
-    		
+
     		AuthorizationRequest requiredPrivileges = visRequestHandler.getRequiredPrivileges();
 			if (requiredPrivileges != null) {
     			return requiredPrivileges;
     		}
     	}
-    	
+
     	return super.requiredActions(vreq);
     }
-   
+
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
     		throws IOException, ServletException {
-    
+
 		VitroRequest vreq = new VitroRequest(request);
-		
+
 		Object ajaxResponse = processAjaxRequest(vreq);
-		
+
 		if (ajaxResponse instanceof TemplateResponseValues) {
-			
+
 			TemplateResponseValues trv = (TemplateResponseValues) ajaxResponse;
 			try {
                 writeTemplate(trv.getTemplateName(), trv.getMap(), vreq, response);
             } catch (TemplateProcessingException e) {
                 log.error(e.getMessage(), e);
             }
-			
+
 		} else {
 			response.getWriter().write(ajaxResponse.toString());
 		}
 	}
-    
+
     private Object processAjaxRequest(VitroRequest vreq) {
     	/*
-    	 * Based on the query parameters passed via URI get the appropriate visualization 
+    	 * Based on the query parameters passed via URI get the appropriate visualization
     	 * request handler.
     	 * */
-    	VisualizationRequestHandler visRequestHandler = 
+    	VisualizationRequestHandler visRequestHandler =
     			getVisualizationRequestHandler(vreq);
-    	
+
     	if (visRequestHandler != null) {
-    	
+
     		/*
-        	 * Pass the query to the selected visualization request handler & render the 
-        	 * visualization. Since the visualization content is directly added to the response 
+        	 * Pass the query to the selected visualization request handler & render the
+        	 * visualization. Since the visualization content is directly added to the response
         	 * object we are side-effecting this method.
         	 * */
             return renderVisualization(vreq, visRequestHandler);
-            
+
     	} else {
-    		
+
     		return UtilityFunctions.handleMalformedParameters(
     									"Visualization Query Error",
     									"Inappropriate query parameters were submitted.",
@@ -117,70 +117,70 @@ private Object processAjaxRequest(VitroRequest vreq) {
 
 	private Object renderVisualization(VitroRequest vitroRequest,
 									 VisualizationRequestHandler visRequestHandler) {
-		
+
 		Model model = vitroRequest.getJenaOntModel(); // getModel()
         if (model == null) {
-            
-            String errorMessage = "This service is not supporeted by the current " 
-            			+ "webapp configuration. A jena model is required in the " 
+
+            String errorMessage = "This service is not supporeted by the current "
+            			+ "webapp configuration. A jena model is required in the "
             			+ "servlet context.";
 
             log.error(errorMessage);
-            
-            return UtilityFunctions.handleMalformedParameters("Visualization Query Error", 
-            												  errorMessage, 
+
+            return UtilityFunctions.handleMalformedParameters("Visualization Query Error",
+            												  errorMessage,
             												  vitroRequest);
-			
+
         }
-		
+
 		Dataset dataset = setupJENADataSource(vitroRequest);
-        
+
 		if (dataset != null && visRequestHandler != null) {
-        	
+
         	try {
-				return visRequestHandler.generateAjaxVisualization(vitroRequest, 
-														log, 
+				return visRequestHandler.generateAjaxVisualization(vitroRequest,
+														log,
 														dataset);
 			} catch (JsonProcessingException|MalformedQueryParametersException e) {
 				return UtilityFunctions.handleMalformedParameters(
-						"Ajax Visualization Query Error - Individual Publication Count", 
-						e.getMessage(), 
+						"Ajax Visualization Query Error - Individual Publication Count",
+						e.getMessage(),
 						vitroRequest);
-				
+
 			}
-        	
+
         } else {
-        	
-    		String errorMessage = "Data Model Empty &/or Inappropriate " 
+
+    		String errorMessage = "Data Model Empty &/or Inappropriate "
     									+ "query parameters were submitted. ";
-    		
+
     		log.error(errorMessage);
-    		
-    		return UtilityFunctions.handleMalformedParameters("Visualization Query Error", 
-    														  errorMessage, 
+
+    		return UtilityFunctions.handleMalformedParameters("Visualization Query Error",
+    														  errorMessage,
     														  vitroRequest);
-    		
-			
+
+
         }
 	}
 
 	private VisualizationRequestHandler getVisualizationRequestHandler(
 				VitroRequest vitroRequest) {
-		
+
 		String visType = vitroRequest.getParameter(VisualizationFrameworkConstants
 																	.VIS_TYPE_KEY);
     	VisualizationRequestHandler visRequestHandler = null;
-    	
+
     	try {
     		visRequestHandler = VisualizationsDependencyInjector
 										.getVisualizationIDsToClassMap(
 												getServletContext()).get(visType);
-    		
+
     	} catch (NullPointerException nullKeyException) {
 
     		return null;
 		}
-    	
+
 		return visRequestHandler;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java
index bd5d4d03d8..8d05165416 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java
@@ -38,55 +38,55 @@ public class DataVisualizationController extends VitroHttpServlet {
 	public static final String URL_ENCODING_SCHEME = "UTF-8";
 
 	private static final Log log = LogFactory.getLog(DataVisualizationController.class.getName());
-	
+
     protected static final Syntax SYNTAX = Syntax.syntaxARQ;
-    
+
     public static final String FILE_CONTENT_TYPE_KEY = "fileContentType";
     public static final String FILE_CONTENT_KEY = "fileContent";
     public static final String FILE_NAME_KEY = "fileName";
-   
+
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
     throws IOException, ServletException {
-    	
+
 		VitroRequest vreq = new VitroRequest(request);
-	    	
+
     	/*
-    	 * Based on the query parameters passed via URI get the appropriate visualization 
+    	 * Based on the query parameters passed via URI get the appropriate visualization
     	 * request handler.
     	 * */
-    	VisualizationRequestHandler visRequestHandler = 
+    	VisualizationRequestHandler visRequestHandler =
     			getVisualizationRequestHandler(vreq);
-    	
-    	
+
+
     	if (visRequestHandler != null) {
-    		
+
     		if (visRequestHandler.getRequiredPrivileges() != null) {
     			if (!isAuthorizedToDisplayPage(request, response, visRequestHandler.getRequiredPrivileges())) {
                 	return;
                 }
     		}
-    		
+
     		/*
         	 * Pass the query to the selected visualization request handler & render the vis.
         	 * Since the visualization content is directly added to the response object we are side-
         	 * effecting this method.
         	 * */
             try {
-            	
+
             	Map<String, String> dataResponse = renderVisualization(vreq, visRequestHandler);
-            	
+
                 response.setContentType(dataResponse.get(FILE_CONTENT_TYPE_KEY));
-                
+
                 if (dataResponse.containsKey(FILE_NAME_KEY)) {
-                	response.setHeader("Content-Disposition", 
+                	response.setHeader("Content-Disposition",
                 					   "attachment;filename=" + dataResponse.get(FILE_NAME_KEY));
                 }
-                
+
         		response.getWriter().write(dataResponse.get(FILE_CONTENT_KEY));
-        		
+
 				return;
-				
+
 			} catch (MalformedQueryParametersException e) {
 
 	    		UtilityFunctions.handleMalformedParameters(e.getMessage(),
@@ -95,37 +95,37 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
 			}
 
         } else {
-    		
+
     		UtilityFunctions.handleMalformedParameters(
     								"Inappropriate query parameters were submitted.",
     								response,
     								log);
-    		
+
     	}
-    	
-        
+
+
     }
 
 
 	private Map<String, String> renderVisualization(
 			VitroRequest vitroRequest,
-			VisualizationRequestHandler visRequestHandler) 
+			VisualizationRequestHandler visRequestHandler)
 			throws MalformedQueryParametersException {
-		
+
 		Model model = vitroRequest.getJenaOntModel(); // getModel()
         if (model == null) {
-            
-            String errorMessage = "This service is not supporeted by the current " 
-            			+ "webapp configuration. A jena model is required in the " 
+
+            String errorMessage = "This service is not supporeted by the current "
+            			+ "webapp configuration. A jena model is required in the "
             			+ "servlet context.";
 
             log.error(errorMessage);
-            
+
             throw new MalformedQueryParametersException(errorMessage);
         }
-		
+
 		Dataset dataset = setupJENADataSource(vitroRequest);
-        
+
 		if (dataset != null && visRequestHandler != null) {
 			try {
 				return visRequestHandler.generateDataVisualization(vitroRequest,
@@ -134,7 +134,7 @@ private Map<String, String> renderVisualization(
 			} catch (JsonProcessingException e) {
 			}
         }
-        	
+
 		String errorMessage = "Data Model Empty &/or Inappropriate "
 									+ "query parameters were submitted. ";
 
@@ -143,21 +143,21 @@ private Map<String, String> renderVisualization(
 
 	private VisualizationRequestHandler getVisualizationRequestHandler(
 				VitroRequest vitroRequest) {
-		
+
 		String visType = vitroRequest.getParameter(VisualizationFrameworkConstants
 																	.VIS_TYPE_KEY);
     	VisualizationRequestHandler visRequestHandler = null;
-    	
+
     	try {
-    		
+
     		visRequestHandler = VisualizationsDependencyInjector
 									.getVisualizationIDsToClassMap(getServletContext())
 											.get(visType);
-    		
+
     	} catch (NullPointerException nullKeyException) {
     		return null;
 		}
-    	
+
 		return visRequestHandler;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
index 32ff3f9e5c..af028535bf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
@@ -29,7 +29,7 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
 
 /**
- * Services a standard visualization request, which involves templates. This will return a simple 
+ * Services a standard visualization request, which involves templates. This will return a simple
  * error message and a 501 if there is no jena Model.
  *
  * @author cdtank
@@ -41,22 +41,22 @@ public class ShortURLVisualizationController extends FreemarkerHttpServlet {
 	public static final String URL_ENCODING_SCHEME = "UTF-8";
 
 	private static final Log log = LogFactory.getLog(ShortURLVisualizationController.class.getName());
-	
+
     protected static final Syntax SYNTAX = Syntax.syntaxARQ;
-    
+
     public static ServletContext servletContext;
-    
+
     @Override
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	/*
-    	 * Based on the query parameters passed via URI get the appropriate visualization 
+    	 * Based on the query parameters passed via URI get the appropriate visualization
     	 * request handler.
     	 * */
-    	VisualizationRequestHandler visRequestHandler = 
+    	VisualizationRequestHandler visRequestHandler =
     			getVisualizationRequestHandler(vreq);
-    	
+
     	if (visRequestHandler != null) {
-    		
+
     		AuthorizationRequest requiredPrivileges = visRequestHandler.getRequiredPrivileges();
 			if (requiredPrivileges != null) {
     			return requiredPrivileges;
@@ -64,161 +64,161 @@ protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	}
     	return super.requiredActions(vreq);
     }
-   
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-        
+
     	/*
-    	 * Based on the query parameters passed via URI get the appropriate visualization 
+    	 * Based on the query parameters passed via URI get the appropriate visualization
     	 * request handler.
     	 * */
-    	VisualizationRequestHandler visRequestHandler = 
+    	VisualizationRequestHandler visRequestHandler =
     			getVisualizationRequestHandler(vreq);
-    	
+
     	servletContext = getServletContext();
-    	
+
     	if (visRequestHandler != null) {
-    	
+
     		/*
         	 * Pass the query to the selected visualization request handler & render the vis.
         	 * Since the visualization content is directly added to the response object we are side-
         	 * effecting this method.
         	 * */
             return renderVisualization(vreq, visRequestHandler);
-            
+
     	} else {
     		return UtilityFunctions.handleMalformedParameters(
-    									"Visualization Query Error", 
-    									"Inappropriate query parameters were submitted.", 
+    									"Visualization Query Error",
+    									"Inappropriate query parameters were submitted.",
     									vreq);
     	}
-    	
+
     }
 
 
 	private ResponseValues renderVisualization(VitroRequest vitroRequest,
 									 VisualizationRequestHandler visRequestHandler) {
-		
+
 		Model model = vitroRequest.getJenaOntModel(); // getModel()
         if (model == null) {
-            
-            String errorMessage = "This service is not supporeted by the current " 
-            			+ "webapp configuration. A jena model is required in the " 
+
+            String errorMessage = "This service is not supporeted by the current "
+            			+ "webapp configuration. A jena model is required in the "
             			+ "servlet context.";
 
             log.error(errorMessage);
-            
-            return UtilityFunctions.handleMalformedParameters("Visualization Query Error", 
-            												  errorMessage, 
+
+            return UtilityFunctions.handleMalformedParameters("Visualization Query Error",
+            												  errorMessage,
             												  vitroRequest);
         }
-        
+
 		Dataset dataset = setupJENADataSource(vitroRequest);
-		
+
 		if (dataset != null && visRequestHandler != null) {
-        	
+
         	try {
         		List<String> matchedPatternGroups = extractShortURLParameters(vitroRequest);
-        		
+
         		Map<String, String> parametersForVis = getParamatersForVis(matchedPatternGroups, vitroRequest);
-        		
+
 				return visRequestHandler.generateVisualizationForShortURLRequests(
 								parametersForVis,
 								vitroRequest,
 								log,
 								dataset);
-				
+
 			} catch (MalformedQueryParametersException e) {
 				return UtilityFunctions.handleMalformedParameters(
-						"Standard Visualization Query Error - Individual Publication Count", 
-						e.getMessage(), 
+						"Standard Visualization Query Error - Individual Publication Count",
+						e.getMessage(),
 						vitroRequest);
 			}
-        	
+
         } else {
-        	
-    		String errorMessage = "Data Model Empty &/or Inappropriate " 
+
+    		String errorMessage = "Data Model Empty &/or Inappropriate "
     									+ "query parameters were submitted. ";
-    		
+
     		log.error(errorMessage);
-    		
-    		return UtilityFunctions.handleMalformedParameters("Visualization Query Error", 
-    														  errorMessage, 
+
+    		return UtilityFunctions.handleMalformedParameters("Visualization Query Error",
+    														  errorMessage,
     														  vitroRequest);
         }
 	}
 
-	private Map<String, String> getParamatersForVis(List<String> matchedPatternGroups, 
+	private Map<String, String> getParamatersForVis(List<String> matchedPatternGroups,
 													VitroRequest vitroRequest) {
-		
+
 		Map<String, String> parameters = new HashMap<String, String>();
-		
+
 		/*
-		 * We need to convert the short-form URI into a long form. So we use the 
-		 * default namespace to construct one. 
-		 * Since VIVO allows non-default namespaces, there are chances that short URLs 
+		 * We need to convert the short-form URI into a long form. So we use the
+		 * default namespace to construct one.
+		 * Since VIVO allows non-default namespaces, there are chances that short URLs
 		 * will have a "uri" parameter instead of individual uri being part of the formal
 		 * url.
 		 * */
 		String subjectURI = null;
 		if (matchedPatternGroups.size() <= 1) {
-			
+
 			subjectURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-			
+
 		} else {
-			
-			subjectURI = vitroRequest.getWebappDaoFactory().getDefaultNamespace() 
+
+			subjectURI = vitroRequest.getWebappDaoFactory().getDefaultNamespace()
 							+ matchedPatternGroups.get(1);
 		}
-		
+
 		subjectURI = StringEscapeUtils.ESCAPE_HTML4.translate(subjectURI);
 		parameters.put(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, subjectURI);
 
 		if (VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL
 				.equalsIgnoreCase(matchedPatternGroups.get(0))) {
-			
-			parameters.put(VisualizationFrameworkConstants.VIS_MODE_KEY, 
+
+			parameters.put(VisualizationFrameworkConstants.VIS_MODE_KEY,
 						   VisualizationFrameworkConstants.COAUTHOR_VIS_MODE);
-			
+
 		} else if (VisualizationFrameworkConstants.COINVESTIGATOR_VIS_SHORT_URL
 				.equalsIgnoreCase(matchedPatternGroups.get(0))) {
-			
-			parameters.put(VisualizationFrameworkConstants.VIS_MODE_KEY, 
+
+			parameters.put(VisualizationFrameworkConstants.VIS_MODE_KEY,
 					   VisualizationFrameworkConstants.COPI_VIS_MODE);
 		} else {
-			
+
 			/*
-			 * Currently temporal vis for both grants & publications do not require use of 
-			 * vis_modes in their request handlers, so no need to provide anything other than 
+			 * Currently temporal vis for both grants & publications do not require use of
+			 * vis_modes in their request handlers, so no need to provide anything other than
 			 * the URI.
 			 * */
-			
+
 		}
-		
+
 		return parameters;
 	}
 
 
 	private VisualizationRequestHandler getVisualizationRequestHandler(
 				VitroRequest vitroRequest) {
-		
+
 		String visType = null;
-		
+
 		VisualizationRequestHandler visRequestHandler = null;
-		
+
 		List<String> matchedPatternGroups = extractShortURLParameters(vitroRequest);
 
 		if (matchedPatternGroups.size() > 0) {
-		
+
 //			System.out.println(matchedPatternGroups.get(0) + " --> " + matchedPatternGroups.get(1));
-//			
-//			System.out.println(vitroRequest.getRequestURI() 
+//
+//			System.out.println(vitroRequest.getRequestURI()
 //						+ " -- " + vitroRequest.getContextPath()
 //						+ " -- " + vitroRequest.getContextPath().length()
 //						+ " -- " + vitroRequest.getRequestURI().substring(vitroRequest.getContextPath().length()));
-			
+
 			visType = matchedPatternGroups.get(0);
- 
+
 	    	try {
 	    		visRequestHandler = VisualizationsDependencyInjector
 	    									.getVisualizationIDsToClassMap(getServletContext())
@@ -228,9 +228,9 @@ private VisualizationRequestHandler getVisualizationRequestHandler(
 	    		 * Let the default flow take care of returning a null.
 	    		 * */
 			}
-    	
+
 		}
-    	
+
 		return visRequestHandler;
 	}
 
@@ -244,15 +244,15 @@ private VisualizationRequestHandler getVisualizationRequestHandler(
 	 */
 	private List<String> extractShortURLParameters(VitroRequest vitroRequest) {
 
-		List<String> matchedGroups = new ArrayList<String>(); 
+		List<String> matchedGroups = new ArrayList<String>();
 		String subURIString = vitroRequest.getRequestURI().substring(vitroRequest.getContextPath().length()+1);
 		String[] urlParams = StringEscapeUtils.ESCAPE_HTML4.translate(subURIString).split("/");
-		
-		if (urlParams.length > 1 
+
+		if (urlParams.length > 1
 				&& urlParams[0].equalsIgnoreCase("vis")) {
 			matchedGroups.addAll(Arrays.asList(urlParams).subList(1, urlParams.length));
 		}
-		
+
 		return matchedGroups;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
index eec09bc6fe..7f061287c3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
@@ -22,7 +22,7 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
 
 /**
- * Services a standard visualization request, which involves templates. This will return a simple 
+ * Services a standard visualization request, which involves templates. This will return a simple
  * error message and a 501 if there is no jena Model.
  *
  * @author cdtank
@@ -34,22 +34,22 @@ public class StandardVisualizationController extends FreemarkerHttpServlet {
 	public static final String URL_ENCODING_SCHEME = "UTF-8";
 
 	private static final Log log = LogFactory.getLog(StandardVisualizationController.class.getName());
-	
+
     protected static final Syntax SYNTAX = Syntax.syntaxARQ;
-    
+
     public static ServletContext servletContext;
-    
+
     @Override
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	/*
-    	 * Based on the query parameters passed via URI get the appropriate visualization 
+    	 * Based on the query parameters passed via URI get the appropriate visualization
     	 * request handler.
     	 * */
-    	VisualizationRequestHandler visRequestHandler = 
+    	VisualizationRequestHandler visRequestHandler =
     			getVisualizationRequestHandler(vreq);
-    	
+
     	if (visRequestHandler != null) {
-    		
+
     		AuthorizationRequest requiredPrivileges = visRequestHandler.getRequiredPrivileges();
 			if (requiredPrivileges != null) {
     			return requiredPrivileges;
@@ -57,93 +57,93 @@ protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	}
     	return super.requiredActions(vreq);
     }
-   
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
     	/*
-    	 * Based on the query parameters passed via URI get the appropriate visualization 
+    	 * Based on the query parameters passed via URI get the appropriate visualization
     	 * request handler.
     	 * */
-    	VisualizationRequestHandler visRequestHandler = 
+    	VisualizationRequestHandler visRequestHandler =
     			getVisualizationRequestHandler(vreq);
-    	
+
     	servletContext = getServletContext();
-    	
+
     	if (visRequestHandler != null) {
-    	
+
     		/*
         	 * Pass the query to the selected visualization request handler & render the vis.
         	 * Since the visualization content is directly added to the response object we are side-
         	 * effecting this method.
         	 * */
             return renderVisualization(vreq, visRequestHandler);
-            
+
     	} else {
     		return UtilityFunctions.handleMalformedParameters(
-    									"Visualization Query Error", 
-    									"Inappropriate query parameters were submitted.", 
+    									"Visualization Query Error",
+    									"Inappropriate query parameters were submitted.",
     									vreq);
     	}
-    	
+
     }
 
 
 	private ResponseValues renderVisualization(VitroRequest vitroRequest,
 									 VisualizationRequestHandler visRequestHandler) {
-		
+
 		Model model = vitroRequest.getJenaOntModel(); // getModel()
         if (model == null) {
-            
-            String errorMessage = "This service is not supporeted by the current " 
-            			+ "webapp configuration. A jena model is required in the " 
+
+            String errorMessage = "This service is not supporeted by the current "
+            			+ "webapp configuration. A jena model is required in the "
             			+ "servlet context.";
 
             log.error(errorMessage);
-            
-            return UtilityFunctions.handleMalformedParameters("Visualization Query Error", 
-            												  errorMessage, 
+
+            return UtilityFunctions.handleMalformedParameters("Visualization Query Error",
+            												  errorMessage,
             												  vitroRequest);
-			
+
         }
-		
+
 		Dataset dataset = setupJENADataSource(vitroRequest);
-        
+
 		if (dataset != null && visRequestHandler != null) {
-        	
+
         	try {
-				return visRequestHandler.generateStandardVisualization(vitroRequest, 
-														log, 
+				return visRequestHandler.generateStandardVisualization(vitroRequest,
+														log,
 														dataset);
 			} catch (MalformedQueryParametersException e) {
 				return UtilityFunctions.handleMalformedParameters(
-						"Standard Visualization Query Error - Individual Publication Count", 
-						e.getMessage(), 
+						"Standard Visualization Query Error - Individual Publication Count",
+						e.getMessage(),
 						vitroRequest);
 			}
-        	
+
         } else {
-        	
-    		String errorMessage = "Data Model Empty &/or Inappropriate " 
+
+    		String errorMessage = "Data Model Empty &/or Inappropriate "
     									+ "query parameters were submitted. ";
-    		
+
     		log.error(errorMessage);
-    		
-    		return UtilityFunctions.handleMalformedParameters("Visualization Query Error", 
-    														  errorMessage, 
+
+    		return UtilityFunctions.handleMalformedParameters("Visualization Query Error",
+    														  errorMessage,
     														  vitroRequest);
-    		
-			
+
+
         }
 	}
 
 	private VisualizationRequestHandler getVisualizationRequestHandler(
 				VitroRequest vitroRequest) {
-		
+
 		String visType = vitroRequest.getParameter(VisualizationFrameworkConstants
 																	.VIS_TYPE_KEY);
     	VisualizationRequestHandler visRequestHandler = null;
-    	
-    	
+
+
     	try {
     		visRequestHandler = VisualizationsDependencyInjector
     									.getVisualizationIDsToClassMap(getServletContext())
@@ -152,7 +152,7 @@ private VisualizationRequestHandler getVisualizationRequestHandler(
 
     		return null;
 		}
-    	
+
 		return visRequestHandler;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
index 9c10079895..30b3143083 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
@@ -1,141 +1,141 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.visualization;
-
-import java.util.regex.Pattern;
-
-public class VisualizationFrameworkConstants {
-
-	/*
-	 * Contains the location of bean containing info on all the visualizations
-	 * available in that instance. Currently it is stored under
-	 * "productMods/WEB-INF..."
-	 */
-	public static final String RELATIVE_LOCATION_OF_VISUALIZATIONS_BEAN = 
-		"/WEB-INF/visualization/visualizations-beans-injection.xml";
-	
-	/*
-	 * Freemarker Version
-	 * */
-	public static final String RELATIVE_LOCATION_OF_FM_VISUALIZATIONS_BEAN = 
-		"/WEB-INF/visualization/visualizations-beans-injection-fm.xml";
-	
-	public static final String ERROR_TEMPLATE = "/visualization/visualizationError.ftl";
-
-	/*
-	 * Vis URL prefix that is seen by all the users
-	 */
-	public static final String VISUALIZATION_URL_PREFIX = "/visualization";
-	public static final String SHORT_URL_VISUALIZATION_REQUEST_PREFIX = "/vis";
-	
-	public static final String FREEMARKERIZED_VISUALIZATION_URL_PREFIX = "/visualization";
-	public static final String AJAX_VISUALIZATION_SERVICE_URL_PREFIX = "/visualizationAjax";
-	public static final String DATA_VISUALIZATION_SERVICE_URL_PREFIX = "/visualizationData";
-	
-	public static final String INDIVIDUAL_URL_PREFIX = "/individual";
-	
-	
-	public static final Pattern SHORT_URL_REQUEST_PATTERN = Pattern
-										.compile("^" 
-												 + SHORT_URL_VISUALIZATION_REQUEST_PREFIX 
-												 + "/([\\w-]+)/([^/]*)$");
-	
-
-	/*
-	 * These represent possible query keys in a URI for visualization purposes.
-	 * Examples, 
-	 * 		1. http://vivo.indiana.edu/visualization?uri=http://vivoweb.org/ontology/core/Person10979&vis=person_level&render_mode=standalone
-	 * 		2. http://vivo.indiana.edu/visualization?uri=http://vivoweb.org/ontology/core/Person72&vis=person_pub_count&render_mode=dynamic&container=vis_container
-	 * */
-	public static final String VIS_TYPE_KEY = "vis";
-	public static final String VIS_CONTAINER_KEY = "container";
-	public static final String INDIVIDUAL_URI_KEY = "uri";
-	public static final String VIS_MODE_KEY = "vis_mode";
-	public static final String RENDER_MODE_KEY = "render_mode";
-	public static final String OUTPUT_FORMAT_KEY = "output";
-	public static final String REQUESTING_TEMPLATE_KEY = "template"; /* tlw72 - added in 1.6 for multi-view support */
-
-	/*
-	 * These values represent possible render modes.
-	 * */
-	public static final String STANDALONE_RENDER_MODE = "standalone";
-	public static final String DYNAMIC_RENDER_MODE = "dynamic";
-	public static final String DATA_RENDER_MODE = "data";
-	public static final String PDF_RENDER_MODE = "pdf";
-
-	/*
-	 * These values represent possible sub-vis modes.
-	 * */
-	public static final String IMAGE_VIS_MODE = "image";
-	public static final String SHORT_SPARKLINE_VIS_MODE = "short";
-	public static final String FULL_SPARKLINE_VIS_MODE = "full";
-	public static final String COPI_VIS_MODE = "copi";
-	public static final String COAUTHOR_VIS_MODE = "coauthor";
-
-	/*
-	 * Vis modes for CoauthorshipRequest Handler
-	 * */
-	public static final String COAUTHORS_COUNT_PER_YEAR_VIS_MODE = "coauthors_count_per_year";
-	public static final String COAUTHORS_LIST_VIS_MODE = "coauthors";
-	public static final String COAUTHOR_NETWORK_STREAM_VIS_MODE = "coauthor_network_stream";
-	public static final String COAUTHOR_NETWORK_DOWNLOAD_VIS_MODE = "coauthor_network_download";
-	
-	/*
-	 * Vis modes for CoPIRequest Handler
-	 * */
-	public static final String COPIS_COUNT_PER_YEAR_VIS_MODE = "copis_count_per_year";
-	public static final String COPIS_LIST_VIS_MODE = "copis";
-	public static final String COPI_NETWORK_STREAM_VIS_MODE = "copi_network_stream";
-	public static final String COPI_NETWORK_DOWNLOAD_VIS_MODE = "copi_network_download";
-	
-	
-	/*
-	 * Vis modes for Map of Science Handler
-	 * */
-	public static final String DISCIPLINE_TO_ACTIVTY_VIS_MODE = "discipline";
-	public static final String SUBDISCIPLINE_TO_ACTIVTY_VIS_MODE = "subdiscipline";
-	public static final String SCIENCE_UNLOCATED_JOURNALS_VIS_MODE = "unlocated_journals";
-	
-	
-	/*
-	 * These values represent possible utilities vis modes.
-	 * */
-	public static final String PROFILE_INFO_UTILS_VIS_MODE = "PROFILE_INFO";
-	public static final String PROFILE_UTILS_VIS_MODE = "PROFILE_URL";
-	public static final String COAUTHOR_UTILS_VIS_MODE = "COAUTHORSHIP_URL";
-	public static final String PERSON_LEVEL_UTILS_VIS_MODE = "PERSON_LEVEL_URL";
-	public static final String COPI_UTILS_VIS_MODE = "COPI_URL";
-	public static final String IMAGE_UTILS_VIS_MODE = "IMAGE_URL";
-	public static final String ARE_PUBLICATIONS_AVAILABLE_UTILS_VIS_MODE = "SHOW_AUTHORSHIP_LINK";
-	public static final String ARE_GRANTS_AVAILABLE_UTILS_VIS_MODE = "SHOW_GRANTS_LINK";
-	public static final String UNIVERSITY_COMPARISON_VIS_MODE = "UNIVERSITY";
-	public static final String SCHOOL_COMPARISON_VIS_MODE = "SCHOOL";
-	public static final String DEPARTMENT_COMPARISON_VIS_MODE = "DEPARTMENT";
-	public static final String HIGHEST_LEVEL_ORGANIZATION_VIS_MODE = "HIGHEST_LEVEL_ORGANIZATION";
-
-	/*
-	 * These values represent possible visualizations provided as values to the "vis" url key.
-	 * */
-	public static final String PERSON_PUBLICATION_COUNT_VIS = "person_pub_count";
-	public static final String PERSON_GRANT_COUNT_VIS = "person_grant_count";
-	public static final String PDF_REPORT_VIS = "pdf_report";
-	public static final String COLLEGE_PUBLICATION_COUNT_VIS = "college_pub_count";
-	public static final String COAUTHORSHIP_VIS = "coauthorship";
-	public static final String PERSON_LEVEL_VIS = "person_level";
-	public static final String COAUTHORSHIP_VIS_SHORT_URL = "author-network";
-	public static final String COINVESTIGATOR_VIS_SHORT_URL = "investigator-network";
-	public static final String UTILITIES_VIS = "utilities";
-	public static final String ENTITY_COMPARISON_VIS = "entity_comparison";
-	public static final String PUBLICATION_TEMPORAL_VIS_SHORT_URL = "publication-graph";
-	public static final String MAP_OF_SCIENCE_VIS_SHORT_URL = "map-of-science";
-	public static final String GRANT_TEMPORAL_VIS_SHORT_URL = "grant-graph";
-	public static final String CO_PI_VIS = "coprincipalinvestigator";
-	
-	
-	/*
-	 * These values represent possible data serialization formats corresponding to 
-	 * output format key. 
-	 * */
-	public static final String JSON_OUTPUT_FORMAT = "json";
-	public static final String CSV_OUTPUT_FORMAT = "csv";
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.visualization;
+
+import java.util.regex.Pattern;
+
+public class VisualizationFrameworkConstants {
+
+	/*
+	 * Contains the location of bean containing info on all the visualizations
+	 * available in that instance. Currently it is stored under
+	 * "productMods/WEB-INF..."
+	 */
+	public static final String RELATIVE_LOCATION_OF_VISUALIZATIONS_BEAN =
+		"/WEB-INF/visualization/visualizations-beans-injection.xml";
+
+	/*
+	 * Freemarker Version
+	 * */
+	public static final String RELATIVE_LOCATION_OF_FM_VISUALIZATIONS_BEAN =
+		"/WEB-INF/visualization/visualizations-beans-injection-fm.xml";
+
+	public static final String ERROR_TEMPLATE = "/visualization/visualizationError.ftl";
+
+	/*
+	 * Vis URL prefix that is seen by all the users
+	 */
+	public static final String VISUALIZATION_URL_PREFIX = "/visualization";
+	public static final String SHORT_URL_VISUALIZATION_REQUEST_PREFIX = "/vis";
+
+	public static final String FREEMARKERIZED_VISUALIZATION_URL_PREFIX = "/visualization";
+	public static final String AJAX_VISUALIZATION_SERVICE_URL_PREFIX = "/visualizationAjax";
+	public static final String DATA_VISUALIZATION_SERVICE_URL_PREFIX = "/visualizationData";
+
+	public static final String INDIVIDUAL_URL_PREFIX = "/individual";
+
+
+	public static final Pattern SHORT_URL_REQUEST_PATTERN = Pattern
+										.compile("^"
+												 + SHORT_URL_VISUALIZATION_REQUEST_PREFIX
+												 + "/([\\w-]+)/([^/]*)$");
+
+
+	/*
+	 * These represent possible query keys in a URI for visualization purposes.
+	 * Examples,
+	 * 		1. http://vivo.indiana.edu/visualization?uri=http://vivoweb.org/ontology/core/Person10979&vis=person_level&render_mode=standalone
+	 * 		2. http://vivo.indiana.edu/visualization?uri=http://vivoweb.org/ontology/core/Person72&vis=person_pub_count&render_mode=dynamic&container=vis_container
+	 * */
+	public static final String VIS_TYPE_KEY = "vis";
+	public static final String VIS_CONTAINER_KEY = "container";
+	public static final String INDIVIDUAL_URI_KEY = "uri";
+	public static final String VIS_MODE_KEY = "vis_mode";
+	public static final String RENDER_MODE_KEY = "render_mode";
+	public static final String OUTPUT_FORMAT_KEY = "output";
+	public static final String REQUESTING_TEMPLATE_KEY = "template"; /* tlw72 - added in 1.6 for multi-view support */
+
+	/*
+	 * These values represent possible render modes.
+	 * */
+	public static final String STANDALONE_RENDER_MODE = "standalone";
+	public static final String DYNAMIC_RENDER_MODE = "dynamic";
+	public static final String DATA_RENDER_MODE = "data";
+	public static final String PDF_RENDER_MODE = "pdf";
+
+	/*
+	 * These values represent possible sub-vis modes.
+	 * */
+	public static final String IMAGE_VIS_MODE = "image";
+	public static final String SHORT_SPARKLINE_VIS_MODE = "short";
+	public static final String FULL_SPARKLINE_VIS_MODE = "full";
+	public static final String COPI_VIS_MODE = "copi";
+	public static final String COAUTHOR_VIS_MODE = "coauthor";
+
+	/*
+	 * Vis modes for CoauthorshipRequest Handler
+	 * */
+	public static final String COAUTHORS_COUNT_PER_YEAR_VIS_MODE = "coauthors_count_per_year";
+	public static final String COAUTHORS_LIST_VIS_MODE = "coauthors";
+	public static final String COAUTHOR_NETWORK_STREAM_VIS_MODE = "coauthor_network_stream";
+	public static final String COAUTHOR_NETWORK_DOWNLOAD_VIS_MODE = "coauthor_network_download";
+
+	/*
+	 * Vis modes for CoPIRequest Handler
+	 * */
+	public static final String COPIS_COUNT_PER_YEAR_VIS_MODE = "copis_count_per_year";
+	public static final String COPIS_LIST_VIS_MODE = "copis";
+	public static final String COPI_NETWORK_STREAM_VIS_MODE = "copi_network_stream";
+	public static final String COPI_NETWORK_DOWNLOAD_VIS_MODE = "copi_network_download";
+
+
+	/*
+	 * Vis modes for Map of Science Handler
+	 * */
+	public static final String DISCIPLINE_TO_ACTIVTY_VIS_MODE = "discipline";
+	public static final String SUBDISCIPLINE_TO_ACTIVTY_VIS_MODE = "subdiscipline";
+	public static final String SCIENCE_UNLOCATED_JOURNALS_VIS_MODE = "unlocated_journals";
+
+
+	/*
+	 * These values represent possible utilities vis modes.
+	 * */
+	public static final String PROFILE_INFO_UTILS_VIS_MODE = "PROFILE_INFO";
+	public static final String PROFILE_UTILS_VIS_MODE = "PROFILE_URL";
+	public static final String COAUTHOR_UTILS_VIS_MODE = "COAUTHORSHIP_URL";
+	public static final String PERSON_LEVEL_UTILS_VIS_MODE = "PERSON_LEVEL_URL";
+	public static final String COPI_UTILS_VIS_MODE = "COPI_URL";
+	public static final String IMAGE_UTILS_VIS_MODE = "IMAGE_URL";
+	public static final String ARE_PUBLICATIONS_AVAILABLE_UTILS_VIS_MODE = "SHOW_AUTHORSHIP_LINK";
+	public static final String ARE_GRANTS_AVAILABLE_UTILS_VIS_MODE = "SHOW_GRANTS_LINK";
+	public static final String UNIVERSITY_COMPARISON_VIS_MODE = "UNIVERSITY";
+	public static final String SCHOOL_COMPARISON_VIS_MODE = "SCHOOL";
+	public static final String DEPARTMENT_COMPARISON_VIS_MODE = "DEPARTMENT";
+	public static final String HIGHEST_LEVEL_ORGANIZATION_VIS_MODE = "HIGHEST_LEVEL_ORGANIZATION";
+
+	/*
+	 * These values represent possible visualizations provided as values to the "vis" url key.
+	 * */
+	public static final String PERSON_PUBLICATION_COUNT_VIS = "person_pub_count";
+	public static final String PERSON_GRANT_COUNT_VIS = "person_grant_count";
+	public static final String PDF_REPORT_VIS = "pdf_report";
+	public static final String COLLEGE_PUBLICATION_COUNT_VIS = "college_pub_count";
+	public static final String COAUTHORSHIP_VIS = "coauthorship";
+	public static final String PERSON_LEVEL_VIS = "person_level";
+	public static final String COAUTHORSHIP_VIS_SHORT_URL = "author-network";
+	public static final String COINVESTIGATOR_VIS_SHORT_URL = "investigator-network";
+	public static final String UTILITIES_VIS = "utilities";
+	public static final String ENTITY_COMPARISON_VIS = "entity_comparison";
+	public static final String PUBLICATION_TEMPORAL_VIS_SHORT_URL = "publication-graph";
+	public static final String MAP_OF_SCIENCE_VIS_SHORT_URL = "map-of-science";
+	public static final String GRANT_TEMPORAL_VIS_SHORT_URL = "grant-graph";
+	public static final String CO_PI_VIS = "coprincipalinvestigator";
+
+
+	/*
+	 * These values represent possible data serialization formats corresponding to
+	 * output format key.
+	 * */
+	public static final String JSON_OUTPUT_FORMAT = "json";
+	public static final String CSV_OUTPUT_FORMAT = "csv";
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java
index 29c686d12e..17ed0c8fc4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java
@@ -1,19 +1,19 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-package edu.cornell.mannlib.vitro.webapp.controller.visualization;
-
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
-
-public class VisualizationInjector {
-	private Map<String, VisualizationRequestHandler> visualizationIDToClass;
-
-	public Map<String, VisualizationRequestHandler> getVisualizationIDToClass() {
-		return visualizationIDToClass;
-	}
-
-	public void setVisualizations(Map<String, VisualizationRequestHandler> visualizationIDToClass) {
-		this.visualizationIDToClass = visualizationIDToClass;
-	}
-
+/* $This file is distributed under the terms of the license in LICENSE$ */
+package edu.cornell.mannlib.vitro.webapp.controller.visualization;
+
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
+
+public class VisualizationInjector {
+	private Map<String, VisualizationRequestHandler> visualizationIDToClass;
+
+	public Map<String, VisualizationRequestHandler> getVisualizationIDToClass() {
+		return visualizationIDToClass;
+	}
+
+	public void setVisualizations(Map<String, VisualizationRequestHandler> visualizationIDToClass) {
+		this.visualizationIDToClass = visualizationIDToClass;
+	}
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java
index 6c27572d17..a75936bcaa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java
@@ -12,18 +12,18 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
 
 public class VisualizationsDependencyInjector {
-	
+
 	private static Map<String, VisualizationRequestHandler> visualizationIDsToClass;
-	
+
 	/**
-	 * This method is used to inject vis dependencies i.e. the vis algorithms that are 
-     * being implemented into the vis controller. Modified Dependency Injection pattern is 
-     * used here. XML file containing the location of all the vis is saved in accessible folder. 
+	 * This method is used to inject vis dependencies i.e. the vis algorithms that are
+     * being implemented into the vis controller. Modified Dependency Injection pattern is
+     * used here. XML file containing the location of all the vis is saved in accessible folder.
 	 * @param servletContext Servlet context
 	 */
 	private synchronized static Map<String, VisualizationRequestHandler> initVisualizations(
 			ServletContext servletContext) {
-		
+
 		/*
 		 * A visualization request has already been made causing the visualizationIDsToClass to be
 		 * initiated & populated with visualization ids to its request handlers.
@@ -31,26 +31,26 @@ private synchronized static Map<String, VisualizationRequestHandler> initVisuali
 		if (visualizationIDsToClass != null) {
 			return visualizationIDsToClass;
 		}
-		
-		String resourcePath = 
+
+		String resourcePath =
 			servletContext
 				.getRealPath(VisualizationFrameworkConstants
 						.RELATIVE_LOCATION_OF_FM_VISUALIZATIONS_BEAN);
-		
+
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 											"file:" + resourcePath);
 
 		BeanFactory factory = context;
-		
-		VisualizationInjector visualizationInjector = 
+
+		VisualizationInjector visualizationInjector =
 				(VisualizationInjector) factory.getBean("visualizationInjector");
-		
+
 		visualizationIDsToClass = visualizationInjector.getVisualizationIDToClass();
-		
-		
+
+
 		return visualizationIDsToClass;
 	}
-	
+
 	public static Map<String, VisualizationRequestHandler> getVisualizationIDsToClassMap(
 			ServletContext servletContext) {
 		if (visualizationIDsToClass != null) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java
index 57959a414d..7db47779da 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java
@@ -15,25 +15,25 @@
 public class AutocompleteRequiredInputValidator implements N3ValidatorVTwo {
 
     private static String MISSING_LABEL_ERROR = "Please select an existing value or enter a new value in the Name field.";
-    
+
     private String uriReceiver;
     private String labelInput;
-    
+
     public AutocompleteRequiredInputValidator(String uriReceiver, String labelInput) {
         this.uriReceiver = uriReceiver;
         this.labelInput = labelInput;
     }
-    
+
     @Override
     public Map<String, String> validate(EditConfigurationVTwo editConfig,
             MultiValueEditSubmission editSub) {
         Map<String,List<String>> urisFromForm = editSub.getUrisFromForm();
         Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
 
-        Map<String,String> errors = new HashMap<String,String>();   
-        
+        Map<String,String> errors = new HashMap<String,String>();
+
         List<String> selectedUri = urisFromForm.get(uriReceiver);
-        
+
         // If there's a presentationUri, then we're done. If not, check to see if the label exists.
         // If that's null, too, it's an error.
         if (allListElementsEmpty(selectedUri) || selectedUri.contains(">SUBMITTED VALUE WAS BLANK<")) {
@@ -50,11 +50,11 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
             else {
                 errors.put(labelInput, MISSING_LABEL_ERROR);
             }
-        }        
+        }
 
         return errors.size() != 0 ? errors : null;
     }
-    
+
     private boolean allListElementsEmpty(List<String> checkList) {
     	if(checkList == null)
     		return true;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
index b4f829f812..6cf296548c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
@@ -18,19 +18,19 @@ public class FirstAndLastNameValidator implements N3ValidatorVTwo {
     private static String MISSING_LAST_NAME_ERROR = "You must enter a value in the Last Name field.";
     private static String MALFORMED_LAST_NAME_ERROR = "The last name field may not contain a comma. Please enter first name in First Name field.";
     private String uriReceiver;
-    
+
     public FirstAndLastNameValidator(String uriReceiver) {
         this.uriReceiver = uriReceiver;
     }
-    
+
     @Override
     public Map<String, String> validate(EditConfigurationVTwo editConfig,
             MultiValueEditSubmission editSub) {
         Map<String,List<String>> urisFromForm = editSub.getUrisFromForm();
         Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
 
-        Map<String,String> errors = new HashMap<String,String>();   
-        
+        Map<String,String> errors = new HashMap<String,String>();
+
         List<String> personUri = urisFromForm.get(uriReceiver);
         if (allListElementsEmpty(personUri) || personUri.contains(">SUBMITTED VALUE WAS BLANK<")) {
             personUri = null;
@@ -40,7 +40,7 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         if (personUri != null) {
             return null;
         }
-        
+
         //Expecting only one first name in this case
         //To Do: update logic if multiple first names considered
         Literal firstName = null;
@@ -48,8 +48,8 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         if(firstNameList != null && firstNameList.size() > 0) {
         	firstName = firstNameList.get(0);
         }
-        if( firstName != null && 
-        		firstName.getLexicalForm() != null && 
+        if( firstName != null &&
+        		firstName.getLexicalForm() != null &&
         		"".equals(firstName.getLexicalForm()) )
             firstName = null;
 
@@ -70,17 +70,17 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         if (lastName == null) {
             errors.put("lastName", MISSING_LAST_NAME_ERROR);
         // Don't reject space in the last name: de Vries, etc.
-        } else if (lastNameValue.contains(",")) {            
+        } else if (lastNameValue.contains(",")) {
             errors.put("lastName", MALFORMED_LAST_NAME_ERROR);
         }
-        
+
         if (firstName == null) {
             errors.put("firstName", MISSING_FIRST_NAME_ERROR);
-        }       
-        
+        }
+
         return errors.size() != 0 ? errors : null;
     }
-    
+
     private boolean allListElementsEmpty(List<String> checkList) {
     	if(checkList == null)
     		return true;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
index b4e45f2665..e0d7bbbc1a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
@@ -4,7 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class N3TransitionToV2Mapping extends HashMap<String, String>{        
+public class N3TransitionToV2Mapping extends HashMap<String, String>{
     public N3TransitionToV2Mapping(){
         Map<String,String> map = this;
 
@@ -13,7 +13,7 @@ public N3TransitionToV2Mapping(){
 
         // vivo forms:
 
-        map.put("addAuthorsToInformationResource.jsp",                
+        map.put("addAuthorsToInformationResource.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAuthorsToInformationResourceGenerator.class.getName());
         map.put("manageWebpagesForIndividual.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator.class.getName());
@@ -24,7 +24,7 @@ public N3TransitionToV2Mapping(){
         map.put("personHasEducationalTraining.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining.class.getName());
         map.put("personHasPositionHistory.jsp",
-                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator.class.getName());                
+                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator.class.getName());
         map.put("addGrantRoleToPerson.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator.class.getName());
         map.put("addEditWebpageForm.jsp",
@@ -34,12 +34,12 @@ public N3TransitionToV2Mapping(){
 
 //        map.put("terminologyAnnotation.jsp",
 //                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.TerminologyAnnotationGenerator.class.getName());
-//        
+//
 //        map.put("redirectToPublication.jsp",
 //                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RedirectToPublicationGenerator.class.getName());
 //        map.put("unsupportedBrowserMessage.jsp",
 //                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.UnsupportedBrowserMessage.class.getName());
-//        
+//
         // vivo 2 stage role forms:
 
         map.put("addAttendeeRoleToPerson.jsp",
@@ -57,7 +57,7 @@ public N3TransitionToV2Mapping(){
         map.put("addOutreachRoleToPerson.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator.class.getName());
         map.put("addPresenterRoleToPerson.jsp",
-                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator.class.getName());                
+                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator.class.getName());
         map.put("addResearcherRoleToPerson.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator.class.getName());
         map.put("addReviewerRoleToPerson.jsp",
@@ -68,6 +68,6 @@ public N3TransitionToV2Mapping(){
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator.class.getName());
         map.put("addTeacherRoleToPerson.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator.class.getName());
-    
+
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java
index 76cc439cd9..4acfde84ba 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java
@@ -22,7 +22,7 @@ public class PersonHasPublicationValidator implements N3ValidatorVTwo {
     private static String MISSING_FIRST_NAME_ERROR = "You must enter a value in the First Name field.";
     private static String MISSING_LAST_NAME_ERROR = "You must enter a value in the Last Name field.";
     private static String MALFORMED_LAST_NAME_ERROR = "The last name field may not contain a comma. Please enter first name in First Name field.";
-    
+
     @Override
     public Map<String, String> validate(EditConfigurationVTwo editConfig,
             MultiValueEditSubmission editSub) {
@@ -30,11 +30,11 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         Map<String,List<String>> urisFromForm = editSub.getUrisFromForm();
         Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
 
-        Map<String,String> errors = new HashMap<String,String>();   
-        
-        // The Editor field is optional for all publication subclasses. Validation is only necessary if the user only enters a 
+        Map<String,String> errors = new HashMap<String,String>();
+
+        // The Editor field is optional for all publication subclasses. Validation is only necessary if the user only enters a
         // last name or only enters a first name
-        
+
         //Expecting only one first name in this case
         //To Do: update logic if multiple first names considered
         List<Literal> firstNameList = literalsFromForm.get("firstName");
@@ -42,8 +42,8 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         if(firstNameList != null && firstNameList.size() > 0) {
     	    firstName = firstNameList.get(0);
         }
-        if ( firstName != null && 
-    		    firstName.getLexicalForm() != null && 
+        if ( firstName != null &&
+    		    firstName.getLexicalForm() != null &&
     		    "".equals(firstName.getLexicalForm()) )
                 firstName = null;
 
@@ -67,22 +67,22 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         else if ( firstName == null && lastName != null) {
             errors.put("firstName", MISSING_FIRST_NAME_ERROR);
         }
-        else if (lastNameValue.contains(",")) {            
+        else if (lastNameValue.contains(",")) {
             errors.put("lastName", MALFORMED_LAST_NAME_ERROR);
         }
         else {
             return null;
-        }               
-        
+        }
+
         return errors.size() != 0 ? errors : null;
     }
-    
+
     private Object getFirstElement(List checkList) {
     	if(checkList == null || checkList.size() == 0) {
     		return null;
     	}
     	return checkList.get(0);
     }
-    
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
index 3780076ccb..ba6e28a17c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
@@ -19,19 +19,19 @@ public class PublicationHasAuthorValidator implements N3ValidatorVTwo {
     private static String MISSING_FIRST_NAME_ERROR = "Must specify the author's first name.";
     private static String MISSING_LAST_NAME_ERROR = "Must specify the author's last name.";
     private static String MALFORMED_LAST_NAME_ERROR = "Last name may not contain a comma. Please enter first name in first name field.";
-;    
+;
     @Override
     public Map<String, String> validate(EditConfigurationVTwo editConfig,
             MultiValueEditSubmission editSub) {
         Map<String,List<String>> urisFromForm = editSub.getUrisFromForm();
         Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
 
-        Map<String,String> errors = new HashMap<String,String>();   
-        
+        Map<String,String> errors = new HashMap<String,String>();
+
         List<String> personUri = urisFromForm.get("personUri");
         List<String> orgUri = urisFromForm.get("orgUri");
         List<Literal> orgNameList = literalsFromForm.get("orgName");
-        
+
         if (allListElementsEmpty(personUri)) {
             personUri = null;
         }
@@ -47,7 +47,7 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         if (personUri != null || orgUri != null || orgName != null ) {
             return null;
         }
-        
+
         //Expecting only one first name in this case
         //To Do: update logic if multiple first names considered
         Literal firstName = null;
@@ -55,8 +55,8 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         if(firstNameList != null && firstNameList.size() > 0) {
         	firstName = firstNameList.get(0);
         }
-        if( firstName != null && 
-        		firstName.getLexicalForm() != null && 
+        if( firstName != null &&
+        		firstName.getLexicalForm() != null &&
         		"".equals(firstName.getLexicalForm()) )
             firstName = null;
 
@@ -77,17 +77,17 @@ public Map<String, String> validate(EditConfigurationVTwo editConfig,
         if (lastName == null) {
             errors.put("lastName", MISSING_LAST_NAME_ERROR);
         // Don't reject space in the last name: de Vries, etc.
-        } else if (lastNameValue.contains(",")) {            
+        } else if (lastNameValue.contains(",")) {
             errors.put("lastName", MALFORMED_LAST_NAME_ERROR);
         }
-        
+
         if (firstName == null) {
             errors.put("firstName", MISSING_FIRST_NAME_ERROR);
-        }       
-        
+        }
+
         return errors.size() != 0 ? errors : null;
     }
-    
+
     private boolean allListElementsEmpty(List<String> checkList) {
     	if(checkList == null)
     		return true;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
index aca5545c6f..66c7d0ff65 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
@@ -1,569 +1,569 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.ontology.OntModel;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.vocabulary.RDF;
-import org.apache.jena.vocabulary.RDFS;
-import org.apache.jena.vocabulary.XSD;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.AddAssociatedConceptsPreprocessor;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ConceptSemanticTypesPreprocessor;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService.ConceptSearchServiceUtils;
-/**
- * Generates the edit configuration for importing concepts from external
- * search services, e.g. UMLS etc.      
- * 
- * Since editing/deletion is handled by separate custom code, this generator always assumes
- * property addition mode. 
- */
-public class AddAssociatedConceptGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator {
-	
-	private Log log = LogFactory.getLog(AddAssociatedConceptGenerator.class);
-	private String template = "addAssociatedConcept.ftl";
-	//TODO: Set this to a dynamic mechanism
-	private static String VIVOCore = "http://vivoweb.org/ontology/core#";
-	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";	
-	private static String SKOSBroaderURI = "http://www.w3.org/2004/02/skos/core#broader";
-	private static String SKOSNarrowerURI = "http://www.w3.org/2004/02/skos/core#narrower";
-    @Override
-    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
-    	EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
-		initBasics(editConfiguration, vreq);
-		initPropertyParameters(vreq, session, editConfiguration);
-		initObjectPropForm(editConfiguration, vreq);
-		editConfiguration.setTemplate(template);
-
-		setVarNames(editConfiguration);
-
-		// Assumes this is a simple case of subject predicate var
-		editConfiguration.setN3Required(this.generateN3Required(vreq));
-
-		// n3 optional
-		editConfiguration.setN3Optional(this.generateN3Optional());
-
-		editConfiguration.setNewResources(generateNewResources(vreq));
-		// In scope
-		this.setUrisAndLiteralsInScope(editConfiguration, vreq);
-
-		// on Form
-		this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
-
-		editConfiguration.setFilesOnForm(new ArrayList<String>());
-
-		// Sparql queries
-		this.setSparqlQueries(editConfiguration, vreq);
-
-		// set fields
-		setFields(editConfiguration, vreq, EditConfigurationUtils
-				.getPredicateUri(vreq));
-
-		setTemplate(editConfiguration, vreq);
-		// No validators required here
-		// Add preprocessors
-		//Passing from servlet context for now but will have to see if there's a way to pass vreq
-		addPreprocessors(editConfiguration);
-		// Adding additional data, specifically edit mode
-		addFormSpecificData(editConfiguration, vreq);
-		// One override for basic functionality, changing url pattern
-		// and entity
-		// Adding term should return to this same page, not the subject
-		// Return takes the page back to the individual form
-		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils
-				.getFormUrlWithoutContext(vreq));
-
-		editConfiguration.addValidator(new AntiXssValidation());
-
-		// prepare
-		prepare(vreq, editConfiguration);
-		return editConfiguration;
-    }
-    
-    //In this case, the generator is not equipped to handle any deletion
-    //Editing in the usual sense does not exist for this form
-    //So we will disable editing
-    @Override
-    void initObjectPropForm(EditConfigurationVTwo editConfiguration,VitroRequest vreq) {                      
-        editConfiguration.setObject( null );        
-    }    
-    
-    //Ensuring that editing property logic does not get executed on processing
-    //since form's deletions are handled separately
-    @Override
-    void prepare(VitroRequest vreq, EditConfigurationVTwo editConfig) {
-    	Model model = vreq.getJenaOntModel();
-        //Set subject and predicate uri
-        if( editConfig.getSubjectUri() == null)
-            editConfig.setSubjectUri( EditConfigurationUtils.getSubjectUri(vreq));
-        if( editConfig.getPredicateUri() == null )
-            editConfig.setPredicateUri( EditConfigurationUtils.getPredicateUri(vreq));
-        //Always set creation
-        editConfig.prepareForNonUpdate(model);
-        
-    }
-    
-
-	private void setVarNames(EditConfigurationVTwo editConfiguration) {
-		  editConfiguration.setVarNameForSubject("subject");
-	      editConfiguration.setVarNameForPredicate("predicate");
-	      //We are not including concept node here since
-	      //we never actually "edit" using this form
-	      //the n3 required and optional will still be evaluated based on the form
-	      editConfiguration.setVarNameForObject("object");
-	}
-
-	protected void setTemplate(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-    	editConfiguration.setTemplate(template);
-		
-	}
-   
-   
-    
-   /*
-    * N3 Required and Optional Generators as well as supporting methods 
-    */
-	
-	private String getPrefixesString() {
-		//TODO: Include dynamic way of including this
-		return "@prefix core: <http://vivoweb.org/ontology/core#> .";
-	}
-	
-	//The only string always required is that linking the subject to the concept node
-	//Since the concept node from an external vocabulary may already be in the system
-	//The label and is defined by may already be defined and don't require re-saving
-    private List<String> generateN3Required(VitroRequest vreq) {
-    	List<String> n3Required = list(    	            	        
-    	        getPrefixesString() + "\n" +
-    	        "?subject ?predicate ?conceptNode .\n" + 
-    	        "?conceptNode <" + RDF.type.getURI() + "> <" + this.SKOSConceptType + "> ."
-    	);
-        //"?conceptNode <" + RDF.type.getURI() + "> <http://www.w3.org/2002/07/owl#Thing> ."
-
-    	List<String> inversePredicate = getInversePredicate(vreq);
-		//Adding inverse predicate if it exists
-		if(inversePredicate.size() > 0) {
-			n3Required.add("?conceptNode <" + inversePredicate.get(0) + "> ?subject .");
-		}
-		return n3Required;
-    }
-    
-   //Optional N3, includes possibility of semantic type which may or may not be included
-    //label and source are independent of semantic type
-    //concept semantic type uri is a placeholder which is actually processed in the sparql update preprocessor
-	private List<String> generateN3Optional() {
-		return list("?conceptNode <" + RDFS.label.getURI() + "> ?conceptLabel .\n" + 
-    	        "?conceptNode <" + RDFS.isDefinedBy.getURI() + "> ?conceptSource .", 
-				"?conceptNode <" + RDF.type + "> ?conceptSemanticTypeURI ." +  
-    	        "?conceptSemanticTypeURI <" + RDFS.label.getURI() + "> ?conceptSemanticTypeLabel ." + 
-    	        "?conceptSemanticTypeURI <" + RDFS.subClassOf + "> <" + SKOSConceptType + "> .",
-    	        "?conceptNode <" + this.SKOSNarrowerURI + "> ?conceptNarrowerURI ." + 
-    	        "?conceptNarrowerURI <" + this.SKOSBroaderURI + "> ?conceptNode .",
-    	        "?conceptNode <" + this.SKOSBroaderURI + "> ?conceptBroaderURI ." + 
-    	    	"?conceptBroaderURI <" + this.SKOSNarrowerURI + "> ?conceptNode ."
-    	);
-    }
-	
-	
-  
-	
-	/*
-	 * Get new resources
-	 */
-	 private Map<String, String> generateNewResources(VitroRequest vreq) {
-			HashMap<String, String> newResources = new HashMap<String, String>();
-			//There are no new resources here, the concept node uri doesn't
-			//get created but already exists, and vocab uri should already exist as well
-			//Adding concept semantic type uri just to test - note this isn't really on the form at all
-			newResources.put("conceptSemanticTypeURI", null);
-			return newResources;
-		}
-    
-
-	
-	
-	/*
-	 * Set URIS and Literals In Scope and on form and supporting methods
-	 */
-    
-    private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
-    	//note that at this point the subject, predicate, and object var parameters have already been processed
-    	//these two were always set when instantiating an edit configuration object from json,
-    	//although the json itself did not specify subject/predicate as part of uris in scope
-    	urisInScope.put(editConfiguration.getVarNameForSubject(), 
-    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
-    			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
-    	//Setting inverse role predicate
-    	urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
-    	
-    	
-    	editConfiguration.setUrisInScope(urisInScope);
-    	//Uris in scope include subject, predicate, and object var
-    	//literals in scope empty initially, usually populated by code in prepare for update
-    	//with existing values for variables
-    	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
-    }
-    
-    private List<String> getInversePredicate(VitroRequest vreq) {
-		List<String> inversePredicateArray = new ArrayList<String>();
-		ObjectProperty op = EditConfigurationUtils.getObjectProperty(vreq);
-		if(op != null && op.getURIInverse() != null) {
-			inversePredicateArray.add(op.getURIInverse());
-		}
-		return inversePredicateArray;
-	}
-
-	//n3 should look as follows
-    //?subject ?predicate ?objectVar 
-    
-    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	List<String> urisOnForm = new ArrayList<String>();
-    	List<String> literalsOnForm = new ArrayList<String>();
-    	//The URI of the node that defines the concept
-    	urisOnForm.add("conceptNode");
-    	urisOnForm.add("conceptSource");
-    	urisOnForm.add("conceptSemanticTypeURI");
-    	urisOnForm.add("conceptBroaderURI");
-    	urisOnForm.add("conceptNarrowerURI");
-    	editConfiguration.setUrisOnform(urisOnForm);
-    	//Also need to add the label of the concept
-    	literalsOnForm.add("conceptLabel");
-    	literalsOnForm.add("conceptSemanticTypeLabel");
-
-    	editConfiguration.setLiteralsOnForm(literalsOnForm);
-    }
-    
-    
-    /**
-     * Set SPARQL Queries and supporting methods
-     */
-    
-    
-    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	//Sparql queries defining retrieval of literals etc.
-    	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
-    	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
-      	editConfiguration.setSparqlForExistingLiterals(new HashMap<String, String>());
-    	editConfiguration.setSparqlForExistingUris(new HashMap<String, String>());
-    }
-    
-
-	/**
-	 * 
-	 * Set Fields and supporting methods
-	 */
-	
-	private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
-    	setConceptNodeField(editConfiguration, vreq);
-    	setConceptLabelField(editConfiguration, vreq);
-    	setVocabURIField(editConfiguration, vreq);
-    	setConceptSemanticTypeURIField(editConfiguration,vreq);
-    	setConceptSemanticTypeLabelField(editConfiguration,vreq);
-    	setConceptBroaderURIField(editConfiguration, vreq);
-    	setConceptNarrowerURIField(editConfiguration, vreq);
-    }
-    
-	private void setConceptNarrowerURIField(
-			EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptNarrowerURI"));		
-	}
-
-	private void setConceptBroaderURIField(
-			EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptBroaderURI"));		
-		
-	}
-
-	//this field will be hidden and include the concept node URI
-	private void setConceptNodeField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptNode").
-				setValidators(list("nonempty")));		
-	}
-
-
-
-	private void setVocabURIField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptSource"));
-	}
-
-
-
-	private void setConceptLabelField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptLabel").
-				setRangeDatatypeUri(XSD.xstring.toString())
-				);
-	}
-	
-	//This will also be a URI
-	private void setConceptSemanticTypeURIField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptSemanticTypeURI")
-				);
-	}
-	
-	private void setConceptSemanticTypeLabelField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptSemanticTypeLabel").
-				setRangeDatatypeUri(XSD.xstring.toString())
-				);
-	}
-    
-   
-    //Add preprocessor
-	
-   private void addPreprocessors(EditConfigurationVTwo editConfiguration) {
-	  //An Edit submission preprocessor for enabling addition of multiple terms for a single search
-	   //TODO: Check if this is the appropriate way of getting model
-	 
-	   //Passing model to check for any URIs that are present
-	   
-	   editConfiguration.addEditSubmissionPreprocessor(
-			   new AddAssociatedConceptsPreprocessor(editConfiguration));
-	   editConfiguration.addModelChangePreprocessor(new ConceptSemanticTypesPreprocessor());
-	  
-	}
-     
-   
-	//Form specific data
-	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
-		//These are the concepts that already exist currently
-		formSpecificData.put("existingConcepts", getExistingConcepts(vreq));
-		//Return url for adding user defined concept
-		formSpecificData.put("userDefinedConceptUrl", getUserDefinedConceptUrl(vreq));
-		//Add URIs and labels for different services
-		formSpecificData.put("searchServices", ConceptSearchServiceUtils.getVocabSources());
-		List<String> inversePredicate = getInversePredicate(vreq);
-		if(inversePredicate.size() > 0) {
-			formSpecificData.put("inversePredicate", inversePredicate.get(0));
-		} else {
-			formSpecificData.put("inversePredicate", "");
-		}
-		editConfiguration.setFormSpecificData(formSpecificData);
-	}
-	
-	
-	//
-	private Object getUserDefinedConceptUrl(VitroRequest vreq) {
-		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
-		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-		String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddUserDefinedConceptGenerator";
-		String editUrl = EditConfigurationUtils.getEditUrl(vreq);
-		
-		return editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) + 
-		"&predicateUri=" + UrlBuilder.urlEncode(predicateUri) + 
-		"&editForm=" + UrlBuilder.urlEncode(generatorName);
-	}
-
-	private List<AssociatedConceptInfo> getExistingConcepts(VitroRequest vreq) {
-		Individual individual = EditConfigurationUtils.getSubjectIndividual(vreq);
-	    List<Individual> concepts = individual.getRelatedIndividuals(
-	    		EditConfigurationUtils.getPredicateUri(vreq));  
-		List<AssociatedConceptInfo> associatedConcepts = getAssociatedConceptInfo(concepts, vreq);
-		sortConcepts(associatedConcepts);
-		return associatedConcepts;
-	}
-	
-	
-	private void sortConcepts(List<AssociatedConceptInfo> concepts) {
-	    concepts.sort(new AssociatedConceptInfoComparator());
-	    log.debug("Concepts should be sorted now" + concepts.toString());
-	}
-	
-    
-	//To determine whether or not a concept is a user generated or one from an external vocab source.
-	//we cannot rely on whether or not it is a skos concept because incorporating UMLS semantic network classes as
-	//SKOS concept subclasses means that even concepts from an external vocab source might be considered SKOS concepts
-	//Instead, we will simply determine whether a concept is defined by an external vocabulary source and use that
-	//as the primary indicator of whether a concept is from an external vocabulary source or a user generated concept
-	private List<AssociatedConceptInfo> getAssociatedConceptInfo(
-			List<Individual> concepts, VitroRequest vreq) {
-		List<AssociatedConceptInfo> info = new ArrayList<AssociatedConceptInfo>();
-		 for ( Individual conceptIndividual : concepts ) {
-			 	boolean userGenerated = true;
-			 	//Note that this isn't technically 
-			 	String conceptUri =  conceptIndividual.getURI();
-			 	String conceptLabel = conceptIndividual.getName();
-
-			 	//Check if defined by an external vocabulary source
-		 		List<ObjectPropertyStatement> vocabList = conceptIndividual.getObjectPropertyStatements(RDFS.isDefinedBy.getURI());
-		 		String vocabSource = null;
-		 		String vocabLabel = null;
-		 		if(vocabList != null && vocabList.size() > 0) {
-		 			userGenerated = false;
-		 			vocabSource = vocabList.get(0).getObjectURI();
-		 			Individual sourceIndividual = EditConfigurationUtils.getIndividual(vreq, vocabSource);
-		 			//Assuming name will get label
-		 			vocabLabel = sourceIndividual.getName();
-		 		}
-		 		
-			 	
-			 	
-			 	if(userGenerated) {
-			 		//if the concept in question is skos - which would imply a user generated concept
-			 		info.add(new AssociatedConceptInfo(conceptLabel, conceptUri, null, null, SKOSConceptType, null, null));
-			 	} else {
-			 		String conceptSemanticTypeURI = null;
-			 		String conceptSemanticTypeLabel = null;
-			 		//Can a concept have multiple semantic types?  Currently we are only returning the first one
-			 		//TODO: Change this into a sparql query that returns all types for the concept that are subclasses of SKOS concepts
-			 		HashMap<String, String> typeAndLabel = this.getConceptSemanticTypeQueryResults(conceptIndividual.getURI(), ModelAccess.on(vreq).getOntModel());
-			 		if(typeAndLabel.containsKey("semanticTypeURI")) {
-			 			conceptSemanticTypeURI = typeAndLabel.get("semanticTypeURI");
-			 		}
-			 		if(typeAndLabel.containsKey("semanticTypeLabel")) {
-			 			conceptSemanticTypeLabel = typeAndLabel.get("semanticTypeLabel");
-			 		}
-
-			 		//Assuming this is from an external vocabulary source
-			 		info.add(new AssociatedConceptInfo(conceptLabel, conceptUri, vocabSource, vocabLabel, null, conceptSemanticTypeURI, conceptSemanticTypeLabel));
-
-			 	}
-		 }
-		 return info;
-	}
-	
-	private HashMap<String, String> getConceptSemanticTypeQueryResults(String conceptURI, OntModel ontModel) {
-		HashMap<String, String> typeAndLabel = new HashMap<String, String>();
-		String queryStr = "SELECT ?semanticTypeURI ?semanticTypeLabel WHERE { " + 
-				"<" + conceptURI + "> <" + RDF.type.getURI() + "> ?semanticTypeURI . " + 
-				"?semanticTypeURI <" + RDFS.subClassOf.getURI() + "> <" + this.SKOSConceptType + ">.  " + 
-				"?semanticTypeURI <" + RDFS.label.getURI() + "> ?semanticTypeLabel ." + 
-				"}";
-		 QueryExecution qe = null;
-	        try{
-	            Query query = QueryFactory.create(queryStr);
-	            qe = QueryExecutionFactory.create(query, ontModel);
-                ResultSet results = null;
-                results = qe.execSelect();
-                
-                while( results.hasNext()){
-                	QuerySolution qs = results.nextSolution();
-                	if(qs.get("semanticTypeURI") != null) {
-                		Resource semanticTypeURI = qs.getResource("semanticTypeURI");
-                		log.debug("Semantic Type URI returned " + semanticTypeURI.getURI());
-                		typeAndLabel.put("semanticTypeURI", semanticTypeURI.getURI());
-                	}
-                	if(qs.get("semanticTypeLabel") != null) {
-                		Literal semanticTypeLabel = qs.getLiteral("semanticTypeLabel");
-                		log.debug("Semantic Type label returned " + semanticTypeLabel.getString());
-                		typeAndLabel.put("semanticTypeLabel", semanticTypeLabel.getString());
-                	}
-                	
-                	
-                }
-	        }catch(Exception ex){
-	            throw new Error("Error in executing query string: \n" + queryStr + '\n' + ex.getMessage());
-	        }finally{
-	            if( qe != null)
-	                qe.close();
-	        }
-		return typeAndLabel;
-	}
-
-	public class AssociatedConceptInfo {
-		private String conceptLabel;
-		private String conceptURI;
-		private String vocabURI;
-		private String vocabLabel;
-		private String type; //In case of SKOS concept, will have skos concept type
-		private String conceptSemanticTypeURI; //For some services, such as UMLS, we have a semantic type associated
-		private String conceptSemanticTypeLabel;
-		public AssociatedConceptInfo(String inputLabel, String inputURI, String inputVocabURI, String inputVocabLabel, String inputType, String inputConceptSemanticTypeURI, String inputConceptSemanticTypeLabel) {
-			this.conceptLabel = inputLabel;
-			this.conceptURI = inputURI;
-			this.vocabURI = inputVocabURI;
-			this.vocabLabel = inputVocabLabel;
-			this.type = inputType;
-			this.conceptSemanticTypeURI = inputConceptSemanticTypeURI;
-			this.conceptSemanticTypeLabel = inputConceptSemanticTypeLabel;
-		}
-		
-		//Getters
-		public String getConceptLabel() {
-			return conceptLabel;
-		}
-		
-		public  String getConceptURI() {
-			return conceptURI;
-		}
-		
-		public  String getVocabURI() {
-			return vocabURI;
-		}
-		
-		public  String getVocabLabel(){
-			return vocabLabel;
-		}
-		
-		public  String getType(){
-			return type;
-		}
-		
-		public  String getConceptSemanticTypeURI(){
-			return conceptSemanticTypeURI;
-		}
-		
-		public  String getConceptSemanticTypeLabel(){
-			return conceptSemanticTypeLabel;
-		}
-		
-	}
-	
-	public class AssociatedConceptInfoComparator implements Comparator<AssociatedConceptInfo>{
-		public int compare(AssociatedConceptInfo concept1, AssociatedConceptInfo concept2) {
-	    	String concept1Label = concept1.getConceptLabel().toLowerCase();
-	    	String concept2Label = concept2.getConceptLabel().toLowerCase();
-	    	return concept1Label.compareTo(concept2Label);
-	    }
-	}
-	
-	
-	
-	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
+import org.apache.jena.vocabulary.XSD;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.AddAssociatedConceptsPreprocessor;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ConceptSemanticTypesPreprocessor;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService.ConceptSearchServiceUtils;
+/**
+ * Generates the edit configuration for importing concepts from external
+ * search services, e.g. UMLS etc.
+ *
+ * Since editing/deletion is handled by separate custom code, this generator always assumes
+ * property addition mode.
+ */
+public class AddAssociatedConceptGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator {
+
+	private Log log = LogFactory.getLog(AddAssociatedConceptGenerator.class);
+	private String template = "addAssociatedConcept.ftl";
+	//TODO: Set this to a dynamic mechanism
+	private static String VIVOCore = "http://vivoweb.org/ontology/core#";
+	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";
+	private static String SKOSBroaderURI = "http://www.w3.org/2004/02/skos/core#broader";
+	private static String SKOSNarrowerURI = "http://www.w3.org/2004/02/skos/core#narrower";
+    @Override
+    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
+    	EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
+		initBasics(editConfiguration, vreq);
+		initPropertyParameters(vreq, session, editConfiguration);
+		initObjectPropForm(editConfiguration, vreq);
+		editConfiguration.setTemplate(template);
+
+		setVarNames(editConfiguration);
+
+		// Assumes this is a simple case of subject predicate var
+		editConfiguration.setN3Required(this.generateN3Required(vreq));
+
+		// n3 optional
+		editConfiguration.setN3Optional(this.generateN3Optional());
+
+		editConfiguration.setNewResources(generateNewResources(vreq));
+		// In scope
+		this.setUrisAndLiteralsInScope(editConfiguration, vreq);
+
+		// on Form
+		this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
+
+		editConfiguration.setFilesOnForm(new ArrayList<String>());
+
+		// Sparql queries
+		this.setSparqlQueries(editConfiguration, vreq);
+
+		// set fields
+		setFields(editConfiguration, vreq, EditConfigurationUtils
+				.getPredicateUri(vreq));
+
+		setTemplate(editConfiguration, vreq);
+		// No validators required here
+		// Add preprocessors
+		//Passing from servlet context for now but will have to see if there's a way to pass vreq
+		addPreprocessors(editConfiguration);
+		// Adding additional data, specifically edit mode
+		addFormSpecificData(editConfiguration, vreq);
+		// One override for basic functionality, changing url pattern
+		// and entity
+		// Adding term should return to this same page, not the subject
+		// Return takes the page back to the individual form
+		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils
+				.getFormUrlWithoutContext(vreq));
+
+		editConfiguration.addValidator(new AntiXssValidation());
+
+		// prepare
+		prepare(vreq, editConfiguration);
+		return editConfiguration;
+    }
+
+    //In this case, the generator is not equipped to handle any deletion
+    //Editing in the usual sense does not exist for this form
+    //So we will disable editing
+    @Override
+    void initObjectPropForm(EditConfigurationVTwo editConfiguration,VitroRequest vreq) {
+        editConfiguration.setObject( null );
+    }
+
+    //Ensuring that editing property logic does not get executed on processing
+    //since form's deletions are handled separately
+    @Override
+    void prepare(VitroRequest vreq, EditConfigurationVTwo editConfig) {
+    	Model model = vreq.getJenaOntModel();
+        //Set subject and predicate uri
+        if( editConfig.getSubjectUri() == null)
+            editConfig.setSubjectUri( EditConfigurationUtils.getSubjectUri(vreq));
+        if( editConfig.getPredicateUri() == null )
+            editConfig.setPredicateUri( EditConfigurationUtils.getPredicateUri(vreq));
+        //Always set creation
+        editConfig.prepareForNonUpdate(model);
+
+    }
+
+
+	private void setVarNames(EditConfigurationVTwo editConfiguration) {
+		  editConfiguration.setVarNameForSubject("subject");
+	      editConfiguration.setVarNameForPredicate("predicate");
+	      //We are not including concept node here since
+	      //we never actually "edit" using this form
+	      //the n3 required and optional will still be evaluated based on the form
+	      editConfiguration.setVarNameForObject("object");
+	}
+
+	protected void setTemplate(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+    	editConfiguration.setTemplate(template);
+
+	}
+
+
+
+   /*
+    * N3 Required and Optional Generators as well as supporting methods
+    */
+
+	private String getPrefixesString() {
+		//TODO: Include dynamic way of including this
+		return "@prefix core: <http://vivoweb.org/ontology/core#> .";
+	}
+
+	//The only string always required is that linking the subject to the concept node
+	//Since the concept node from an external vocabulary may already be in the system
+	//The label and is defined by may already be defined and don't require re-saving
+    private List<String> generateN3Required(VitroRequest vreq) {
+    	List<String> n3Required = list(
+    	        getPrefixesString() + "\n" +
+    	        "?subject ?predicate ?conceptNode .\n" +
+    	        "?conceptNode <" + RDF.type.getURI() + "> <" + this.SKOSConceptType + "> ."
+    	);
+        //"?conceptNode <" + RDF.type.getURI() + "> <http://www.w3.org/2002/07/owl#Thing> ."
+
+    	List<String> inversePredicate = getInversePredicate(vreq);
+		//Adding inverse predicate if it exists
+		if(inversePredicate.size() > 0) {
+			n3Required.add("?conceptNode <" + inversePredicate.get(0) + "> ?subject .");
+		}
+		return n3Required;
+    }
+
+   //Optional N3, includes possibility of semantic type which may or may not be included
+    //label and source are independent of semantic type
+    //concept semantic type uri is a placeholder which is actually processed in the sparql update preprocessor
+	private List<String> generateN3Optional() {
+		return list("?conceptNode <" + RDFS.label.getURI() + "> ?conceptLabel .\n" +
+    	        "?conceptNode <" + RDFS.isDefinedBy.getURI() + "> ?conceptSource .",
+				"?conceptNode <" + RDF.type + "> ?conceptSemanticTypeURI ." +
+    	        "?conceptSemanticTypeURI <" + RDFS.label.getURI() + "> ?conceptSemanticTypeLabel ." +
+    	        "?conceptSemanticTypeURI <" + RDFS.subClassOf + "> <" + SKOSConceptType + "> .",
+    	        "?conceptNode <" + this.SKOSNarrowerURI + "> ?conceptNarrowerURI ." +
+    	        "?conceptNarrowerURI <" + this.SKOSBroaderURI + "> ?conceptNode .",
+    	        "?conceptNode <" + this.SKOSBroaderURI + "> ?conceptBroaderURI ." +
+    	    	"?conceptBroaderURI <" + this.SKOSNarrowerURI + "> ?conceptNode ."
+    	);
+    }
+
+
+
+
+	/*
+	 * Get new resources
+	 */
+	 private Map<String, String> generateNewResources(VitroRequest vreq) {
+			HashMap<String, String> newResources = new HashMap<String, String>();
+			//There are no new resources here, the concept node uri doesn't
+			//get created but already exists, and vocab uri should already exist as well
+			//Adding concept semantic type uri just to test - note this isn't really on the form at all
+			newResources.put("conceptSemanticTypeURI", null);
+			return newResources;
+		}
+
+
+
+
+	/*
+	 * Set URIS and Literals In Scope and on form and supporting methods
+	 */
+
+    private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
+    	//note that at this point the subject, predicate, and object var parameters have already been processed
+    	//these two were always set when instantiating an edit configuration object from json,
+    	//although the json itself did not specify subject/predicate as part of uris in scope
+    	urisInScope.put(editConfiguration.getVarNameForSubject(),
+    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
+    	urisInScope.put(editConfiguration.getVarNameForPredicate(),
+    			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
+    	//Setting inverse role predicate
+    	urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
+
+
+    	editConfiguration.setUrisInScope(urisInScope);
+    	//Uris in scope include subject, predicate, and object var
+    	//literals in scope empty initially, usually populated by code in prepare for update
+    	//with existing values for variables
+    	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
+    }
+
+    private List<String> getInversePredicate(VitroRequest vreq) {
+		List<String> inversePredicateArray = new ArrayList<String>();
+		ObjectProperty op = EditConfigurationUtils.getObjectProperty(vreq);
+		if(op != null && op.getURIInverse() != null) {
+			inversePredicateArray.add(op.getURIInverse());
+		}
+		return inversePredicateArray;
+	}
+
+	//n3 should look as follows
+    //?subject ?predicate ?objectVar
+
+    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	List<String> urisOnForm = new ArrayList<String>();
+    	List<String> literalsOnForm = new ArrayList<String>();
+    	//The URI of the node that defines the concept
+    	urisOnForm.add("conceptNode");
+    	urisOnForm.add("conceptSource");
+    	urisOnForm.add("conceptSemanticTypeURI");
+    	urisOnForm.add("conceptBroaderURI");
+    	urisOnForm.add("conceptNarrowerURI");
+    	editConfiguration.setUrisOnform(urisOnForm);
+    	//Also need to add the label of the concept
+    	literalsOnForm.add("conceptLabel");
+    	literalsOnForm.add("conceptSemanticTypeLabel");
+
+    	editConfiguration.setLiteralsOnForm(literalsOnForm);
+    }
+
+
+    /**
+     * Set SPARQL Queries and supporting methods
+     */
+
+
+    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	//Sparql queries defining retrieval of literals etc.
+    	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
+    	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
+      	editConfiguration.setSparqlForExistingLiterals(new HashMap<String, String>());
+    	editConfiguration.setSparqlForExistingUris(new HashMap<String, String>());
+    }
+
+
+	/**
+	 *
+	 * Set Fields and supporting methods
+	 */
+
+	private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
+    	setConceptNodeField(editConfiguration, vreq);
+    	setConceptLabelField(editConfiguration, vreq);
+    	setVocabURIField(editConfiguration, vreq);
+    	setConceptSemanticTypeURIField(editConfiguration,vreq);
+    	setConceptSemanticTypeLabelField(editConfiguration,vreq);
+    	setConceptBroaderURIField(editConfiguration, vreq);
+    	setConceptNarrowerURIField(editConfiguration, vreq);
+    }
+
+	private void setConceptNarrowerURIField(
+			EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptNarrowerURI"));
+	}
+
+	private void setConceptBroaderURIField(
+			EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptBroaderURI"));
+
+	}
+
+	//this field will be hidden and include the concept node URI
+	private void setConceptNodeField(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptNode").
+				setValidators(list("nonempty")));
+	}
+
+
+
+	private void setVocabURIField(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptSource"));
+	}
+
+
+
+	private void setConceptLabelField(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptLabel").
+				setRangeDatatypeUri(XSD.xstring.toString())
+				);
+	}
+
+	//This will also be a URI
+	private void setConceptSemanticTypeURIField(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptSemanticTypeURI")
+				);
+	}
+
+	private void setConceptSemanticTypeLabelField(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptSemanticTypeLabel").
+				setRangeDatatypeUri(XSD.xstring.toString())
+				);
+	}
+
+
+    //Add preprocessor
+
+   private void addPreprocessors(EditConfigurationVTwo editConfiguration) {
+	  //An Edit submission preprocessor for enabling addition of multiple terms for a single search
+	   //TODO: Check if this is the appropriate way of getting model
+
+	   //Passing model to check for any URIs that are present
+
+	   editConfiguration.addEditSubmissionPreprocessor(
+			   new AddAssociatedConceptsPreprocessor(editConfiguration));
+	   editConfiguration.addModelChangePreprocessor(new ConceptSemanticTypesPreprocessor());
+
+	}
+
+
+	//Form specific data
+	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
+		//These are the concepts that already exist currently
+		formSpecificData.put("existingConcepts", getExistingConcepts(vreq));
+		//Return url for adding user defined concept
+		formSpecificData.put("userDefinedConceptUrl", getUserDefinedConceptUrl(vreq));
+		//Add URIs and labels for different services
+		formSpecificData.put("searchServices", ConceptSearchServiceUtils.getVocabSources());
+		List<String> inversePredicate = getInversePredicate(vreq);
+		if(inversePredicate.size() > 0) {
+			formSpecificData.put("inversePredicate", inversePredicate.get(0));
+		} else {
+			formSpecificData.put("inversePredicate", "");
+		}
+		editConfiguration.setFormSpecificData(formSpecificData);
+	}
+
+
+	//
+	private Object getUserDefinedConceptUrl(VitroRequest vreq) {
+		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
+		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+		String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddUserDefinedConceptGenerator";
+		String editUrl = EditConfigurationUtils.getEditUrl(vreq);
+
+		return editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) +
+		"&predicateUri=" + UrlBuilder.urlEncode(predicateUri) +
+		"&editForm=" + UrlBuilder.urlEncode(generatorName);
+	}
+
+	private List<AssociatedConceptInfo> getExistingConcepts(VitroRequest vreq) {
+		Individual individual = EditConfigurationUtils.getSubjectIndividual(vreq);
+	    List<Individual> concepts = individual.getRelatedIndividuals(
+	    		EditConfigurationUtils.getPredicateUri(vreq));
+		List<AssociatedConceptInfo> associatedConcepts = getAssociatedConceptInfo(concepts, vreq);
+		sortConcepts(associatedConcepts);
+		return associatedConcepts;
+	}
+
+
+	private void sortConcepts(List<AssociatedConceptInfo> concepts) {
+	    concepts.sort(new AssociatedConceptInfoComparator());
+	    log.debug("Concepts should be sorted now" + concepts.toString());
+	}
+
+
+	//To determine whether or not a concept is a user generated or one from an external vocab source.
+	//we cannot rely on whether or not it is a skos concept because incorporating UMLS semantic network classes as
+	//SKOS concept subclasses means that even concepts from an external vocab source might be considered SKOS concepts
+	//Instead, we will simply determine whether a concept is defined by an external vocabulary source and use that
+	//as the primary indicator of whether a concept is from an external vocabulary source or a user generated concept
+	private List<AssociatedConceptInfo> getAssociatedConceptInfo(
+			List<Individual> concepts, VitroRequest vreq) {
+		List<AssociatedConceptInfo> info = new ArrayList<AssociatedConceptInfo>();
+		 for ( Individual conceptIndividual : concepts ) {
+			 	boolean userGenerated = true;
+			 	//Note that this isn't technically
+			 	String conceptUri =  conceptIndividual.getURI();
+			 	String conceptLabel = conceptIndividual.getName();
+
+			 	//Check if defined by an external vocabulary source
+		 		List<ObjectPropertyStatement> vocabList = conceptIndividual.getObjectPropertyStatements(RDFS.isDefinedBy.getURI());
+		 		String vocabSource = null;
+		 		String vocabLabel = null;
+		 		if(vocabList != null && vocabList.size() > 0) {
+		 			userGenerated = false;
+		 			vocabSource = vocabList.get(0).getObjectURI();
+		 			Individual sourceIndividual = EditConfigurationUtils.getIndividual(vreq, vocabSource);
+		 			//Assuming name will get label
+		 			vocabLabel = sourceIndividual.getName();
+		 		}
+
+
+
+			 	if(userGenerated) {
+			 		//if the concept in question is skos - which would imply a user generated concept
+			 		info.add(new AssociatedConceptInfo(conceptLabel, conceptUri, null, null, SKOSConceptType, null, null));
+			 	} else {
+			 		String conceptSemanticTypeURI = null;
+			 		String conceptSemanticTypeLabel = null;
+			 		//Can a concept have multiple semantic types?  Currently we are only returning the first one
+			 		//TODO: Change this into a sparql query that returns all types for the concept that are subclasses of SKOS concepts
+			 		HashMap<String, String> typeAndLabel = this.getConceptSemanticTypeQueryResults(conceptIndividual.getURI(), ModelAccess.on(vreq).getOntModel());
+			 		if(typeAndLabel.containsKey("semanticTypeURI")) {
+			 			conceptSemanticTypeURI = typeAndLabel.get("semanticTypeURI");
+			 		}
+			 		if(typeAndLabel.containsKey("semanticTypeLabel")) {
+			 			conceptSemanticTypeLabel = typeAndLabel.get("semanticTypeLabel");
+			 		}
+
+			 		//Assuming this is from an external vocabulary source
+			 		info.add(new AssociatedConceptInfo(conceptLabel, conceptUri, vocabSource, vocabLabel, null, conceptSemanticTypeURI, conceptSemanticTypeLabel));
+
+			 	}
+		 }
+		 return info;
+	}
+
+	private HashMap<String, String> getConceptSemanticTypeQueryResults(String conceptURI, OntModel ontModel) {
+		HashMap<String, String> typeAndLabel = new HashMap<String, String>();
+		String queryStr = "SELECT ?semanticTypeURI ?semanticTypeLabel WHERE { " +
+				"<" + conceptURI + "> <" + RDF.type.getURI() + "> ?semanticTypeURI . " +
+				"?semanticTypeURI <" + RDFS.subClassOf.getURI() + "> <" + this.SKOSConceptType + ">.  " +
+				"?semanticTypeURI <" + RDFS.label.getURI() + "> ?semanticTypeLabel ." +
+				"}";
+		 QueryExecution qe = null;
+	        try{
+	            Query query = QueryFactory.create(queryStr);
+	            qe = QueryExecutionFactory.create(query, ontModel);
+                ResultSet results = null;
+                results = qe.execSelect();
+
+                while( results.hasNext()){
+                	QuerySolution qs = results.nextSolution();
+                	if(qs.get("semanticTypeURI") != null) {
+                		Resource semanticTypeURI = qs.getResource("semanticTypeURI");
+                		log.debug("Semantic Type URI returned " + semanticTypeURI.getURI());
+                		typeAndLabel.put("semanticTypeURI", semanticTypeURI.getURI());
+                	}
+                	if(qs.get("semanticTypeLabel") != null) {
+                		Literal semanticTypeLabel = qs.getLiteral("semanticTypeLabel");
+                		log.debug("Semantic Type label returned " + semanticTypeLabel.getString());
+                		typeAndLabel.put("semanticTypeLabel", semanticTypeLabel.getString());
+                	}
+
+
+                }
+	        }catch(Exception ex){
+	            throw new Error("Error in executing query string: \n" + queryStr + '\n' + ex.getMessage());
+	        }finally{
+	            if( qe != null)
+	                qe.close();
+	        }
+		return typeAndLabel;
+	}
+
+	public class AssociatedConceptInfo {
+		private String conceptLabel;
+		private String conceptURI;
+		private String vocabURI;
+		private String vocabLabel;
+		private String type; //In case of SKOS concept, will have skos concept type
+		private String conceptSemanticTypeURI; //For some services, such as UMLS, we have a semantic type associated
+		private String conceptSemanticTypeLabel;
+		public AssociatedConceptInfo(String inputLabel, String inputURI, String inputVocabURI, String inputVocabLabel, String inputType, String inputConceptSemanticTypeURI, String inputConceptSemanticTypeLabel) {
+			this.conceptLabel = inputLabel;
+			this.conceptURI = inputURI;
+			this.vocabURI = inputVocabURI;
+			this.vocabLabel = inputVocabLabel;
+			this.type = inputType;
+			this.conceptSemanticTypeURI = inputConceptSemanticTypeURI;
+			this.conceptSemanticTypeLabel = inputConceptSemanticTypeLabel;
+		}
+
+		//Getters
+		public String getConceptLabel() {
+			return conceptLabel;
+		}
+
+		public  String getConceptURI() {
+			return conceptURI;
+		}
+
+		public  String getVocabURI() {
+			return vocabURI;
+		}
+
+		public  String getVocabLabel(){
+			return vocabLabel;
+		}
+
+		public  String getType(){
+			return type;
+		}
+
+		public  String getConceptSemanticTypeURI(){
+			return conceptSemanticTypeURI;
+		}
+
+		public  String getConceptSemanticTypeLabel(){
+			return conceptSemanticTypeLabel;
+		}
+
+	}
+
+	public class AssociatedConceptInfoComparator implements Comparator<AssociatedConceptInfo>{
+		public int compare(AssociatedConceptInfo concept1, AssociatedConceptInfo concept2) {
+	    	String concept1Label = concept1.getConceptLabel().toLowerCase();
+	    	String concept2Label = concept2.getConceptLabel().toLowerCase();
+	    	return concept1Label.compareTo(concept2Label);
+	    }
+	}
+
+
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java
index be52c3d17e..69ad742275 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java
@@ -1,67 +1,67 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-
-public class AddAttendeeRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-    
-    private static String TEMPLATE = "addAttendeeRoleToPerson.ftl";
-
-    @Override
-    String getTemplate(){ return TEMPLATE; }
-
-    @Override
-    String getRoleType() {
-        return "http://vivoweb.org/ontology/core#AttendeeRole";
-    }
-            
-    /** Editor role involves hard-coded options for the "right side" of the role or activity. */
-    @Override
-    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-        return new ConstantFieldOptions(
-        "", "Select type",
-        "http://purl.org/NET/c4dm/event.owl#Event", "Event",
-        "http://vivoweb.org/ontology/core#Competition", "Competition",
-        "http://purl.org/ontology/bibo/Conference", "Conference",
-        "http://vivoweb.org/ontology/core#Course", "Course",
-        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
-        "http://purl.org/ontology/bibo/Hearing", "Hearing",
-        "http://purl.org/ontology/bibo/Interview", "Interview",
-        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
-        "http://purl.org/ontology/bibo/Performance", "Performance",
-        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
-        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
-        "http://purl.org/ontology/bibo/Workshop", "Workshop",
-        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
-        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
-        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
-        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series"
-        );
-    }
-    
-    @Override   
-    boolean isShowRoleLabelField() { 
-        return false;  
-    }
-
-       /* 
-        * Use the methods below to change the date/time precision in the
-        * custom form associated with this generator. When not used, the
-        * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
-        * MINUTE, TIME and NONE.
-        */
-    /*
-        public String getStartDatePrecision() {
-            String precision = VitroVocabulary.Precision.MONTH.uri();
-    	    return precision;
-        }
-
-        public String getEndDatePrecision() {
-            String precision = VitroVocabulary.Precision.DAY.uri();
-    	    return precision;
-        }
-    */    
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+
+public class AddAttendeeRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+
+    private static String TEMPLATE = "addAttendeeRoleToPerson.ftl";
+
+    @Override
+    String getTemplate(){ return TEMPLATE; }
+
+    @Override
+    String getRoleType() {
+        return "http://vivoweb.org/ontology/core#AttendeeRole";
+    }
+
+    /** Editor role involves hard-coded options for the "right side" of the role or activity. */
+    @Override
+    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+        return new ConstantFieldOptions(
+        "", "Select type",
+        "http://purl.org/NET/c4dm/event.owl#Event", "Event",
+        "http://vivoweb.org/ontology/core#Competition", "Competition",
+        "http://purl.org/ontology/bibo/Conference", "Conference",
+        "http://vivoweb.org/ontology/core#Course", "Course",
+        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
+        "http://purl.org/ontology/bibo/Hearing", "Hearing",
+        "http://purl.org/ontology/bibo/Interview", "Interview",
+        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
+        "http://purl.org/ontology/bibo/Performance", "Performance",
+        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
+        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
+        "http://purl.org/ontology/bibo/Workshop", "Workshop",
+        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
+        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
+        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
+        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series"
+        );
+    }
+
+    @Override
+    boolean isShowRoleLabelField() {
+        return false;
+    }
+
+       /*
+        * Use the methods below to change the date/time precision in the
+        * custom form associated with this generator. When not used, the
+        * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
+        * MINUTE, TIME and NONE.
+        */
+    /*
+        public String getStartDatePrecision() {
+            String precision = VitroVocabulary.Precision.MONTH.uri();
+    	    return precision;
+        }
+
+        public String getEndDatePrecision() {
+            String precision = VitroVocabulary.Precision.DAY.uri();
+    	    return precision;
+        }
+    */
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
index baf0b552dc..837626778d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
@@ -35,9 +35,9 @@
 
 /**
  * This is a slightly unusual generator that is used by Manage Authors on
- * information resources. 
+ * information resources.
  *
- * It is intended to always be an add, and never an update. 
+ * It is intended to always be an add, and never an update.
  */
 public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator implements EditConfigurationGenerator {
     public static Log log = LogFactory.getLog(AddAuthorsToInformationResourceGenerator.class);
@@ -45,7 +45,7 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) {
-        EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();    	    	
+        EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
         initBasics(editConfiguration, vreq);
         initPropertyParameters(vreq, session, editConfiguration);
 
@@ -53,22 +53,22 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         setUrlToReturnTo(editConfiguration, vreq);
 
         //set variable names
-        editConfiguration.setVarNameForSubject("infoResource");               
-        editConfiguration.setVarNameForPredicate("predicate");      
-        editConfiguration.setVarNameForObject("authorshipUri");                          
+        editConfiguration.setVarNameForSubject("infoResource");
+        editConfiguration.setVarNameForPredicate("predicate");
+        editConfiguration.setVarNameForObject("authorshipUri");
 
         // Required N3
-        editConfiguration.setN3Required( list( getN3NewAuthorship() ) );    
+        editConfiguration.setN3Required( list( getN3NewAuthorship() ) );
 
-        // Optional N3 
-        editConfiguration.setN3Optional( generateN3Optional());	
+        // Optional N3
+        editConfiguration.setN3Optional( generateN3Optional());
 
         editConfiguration.addNewResource("authorshipUri", DEFAULT_NS_TOKEN);
         editConfiguration.addNewResource("newPerson", DEFAULT_NS_TOKEN);
         editConfiguration.addNewResource("newOrg", DEFAULT_NS_TOKEN);
         editConfiguration.addNewResource("vcardPerson", DEFAULT_NS_TOKEN);
         editConfiguration.addNewResource("vcardName", DEFAULT_NS_TOKEN);
-        
+
         //In scope
         setUrisAndLiteralsInScope(editConfiguration, vreq);
 
@@ -88,121 +88,121 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
         //Adding additional data, specifically edit mode
         addFormSpecificData(editConfiguration, vreq);
-        
+
         editConfiguration.addValidator(new AntiXssValidation());
-        
-        //NOITCE this generator does not run prepare() since it 
+
+        //NOITCE this generator does not run prepare() since it
         //is never an update and has no SPARQL for existing
-        
+
         return editConfiguration;
     }
-		
+
 	private void setUrlToReturnTo(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));		
+		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));
 	}
-	
+
 	/***N3 strings both required and optional***/
-	
+
 	public String getN3PrefixString() {
-		return "@prefix core: <" + vivoCore + "> .\n" + 
+		return "@prefix core: <" + vivoCore + "> .\n" +
 		 "@prefix foaf: <" + foaf + "> .  \n"   ;
 	}
-	
+
 	private String getN3NewAuthorship() {
-		return getN3PrefixString() + 
-		"?authorshipUri a core:Authorship ;\n" + 
-        "  core:relates ?infoResource .\n" + 
+		return getN3PrefixString() +
+		"?authorshipUri a core:Authorship ;\n" +
+        "  core:relates ?infoResource .\n" +
         "?infoResource core:relatedBy ?authorshipUri .";
 	}
-	
+
 	private String getN3AuthorshipRank() {
-		return getN3PrefixString() +   
+		return getN3PrefixString() +
         "?authorshipUri core:rank ?rank .";
 	}
-	
+
 	//first name, middle name, last name, and new perseon for new author being created, and n3 for existing person
 	//if existing person selected as author
 	public List<String> generateN3Optional() {
 		return list(
 		        getN3NewPersonFirstName() ,
                 getN3NewPersonMiddleName(),
-                getN3NewPersonLastName(),                
+                getN3NewPersonLastName(),
                 getN3NewPerson(),
                 getN3AuthorshipRank(),
                 getN3ForExistingPerson(),
                 getN3NewOrg(),
                 getN3ForExistingOrg());
-		
+
 	}
-	
-	
+
+
 	private String getN3NewPersonFirstName() {
-		return getN3PrefixString() + 
+		return getN3PrefixString() +
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
             "?vcardName vcard:givenName ?firstName .";
 	}
-	
+
 	private String getN3NewPersonMiddleName() {
-		return getN3PrefixString() +  
+		return getN3PrefixString() +
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a vcard:Individual . \n" + 
+            "?vcardPerson a vcard:Individual . \n" +
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a vcard:Name . \n" +   
+            "?vcardName a vcard:Name . \n" +
             "?vcardName <http://vivoweb.org/ontology/core#middleName> ?middleName .";
 	}
-	
+
 	private String getN3NewPersonLastName() {
-		return getN3PrefixString() + 
+		return getN3PrefixString() +
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
             "?vcardName vcard:familyName ?lastName .";
 	}
-	
+
 	private String getN3NewPerson() {
-		return  getN3PrefixString() + 
-        "?newPerson a foaf:Person ;\n" + 
-        "<" + RDFS.label.getURI() + "> ?label .\n" + 
-        "?authorshipUri core:relates ?newPerson .\n" + 
+		return  getN3PrefixString() +
+        "?newPerson a foaf:Person ;\n" +
+        "<" + RDFS.label.getURI() + "> ?label .\n" +
+        "?authorshipUri core:relates ?newPerson .\n" +
         "?newPerson core:relatedBy ?authorshipUri . ";
 	}
-	
+
 	private String getN3ForExistingPerson() {
-		return getN3PrefixString() + 
-		"?authorshipUri core:relates ?personUri .\n" + 
+		return getN3PrefixString() +
+		"?authorshipUri core:relates ?personUri .\n" +
 		"?personUri core:relatedBy ?authorshipUri .";
 	}
-	
+
 	private String getN3NewOrg() {
-		return  getN3PrefixString() + 
-        "?newOrg a foaf:Organization ;\n" + 
-        "<" + RDFS.label.getURI() + "> ?orgName .\n" + 
-        "?authorshipUri core:relates ?newOrg .\n" + 
+		return  getN3PrefixString() +
+        "?newOrg a foaf:Organization ;\n" +
+        "<" + RDFS.label.getURI() + "> ?orgName .\n" +
+        "?authorshipUri core:relates ?newOrg .\n" +
         "?newOrg core:relatedBy ?authorshipUri . ";
 	}
-	
+
 	private String getN3ForExistingOrg() {
-		return getN3PrefixString() + 
-		"?authorshipUri core:relates ?orgUri .\n" + 
+		return getN3PrefixString() +
+		"?authorshipUri core:relates ?orgUri .\n" +
 		"?orgUri core:relatedBy ?authorshipUri .";
 	}
 	/**  Get new resources	 */
 	//A new authorship uri will always be created when an author is added
 	//A new person may be added if a person not in the system will be added as author
-	 private Map<String, String> generateNewResources(VitroRequest vreq) {					
-			
-			
-			HashMap<String, String> newResources = new HashMap<String, String>();			
+	 private Map<String, String> generateNewResources(VitroRequest vreq) {
+
+
+			HashMap<String, String> newResources = new HashMap<String, String>();
 			newResources.put("authorshipUri", DEFAULT_NS_TOKEN);
 			newResources.put("newPerson", DEFAULT_NS_TOKEN);
 			newResources.put("vcardPerson", DEFAULT_NS_TOKEN);
@@ -210,26 +210,26 @@ private Map<String, String> generateNewResources(VitroRequest vreq) {
 			newResources.put("newOrg", DEFAULT_NS_TOKEN);
 			return newResources;
 		}
-	
-	/** Set URIS and Literals In Scope and on form and supporting methods	 */   
+
+	/** Set URIS and Literals In Scope and on form and supporting methods	 */
     private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	//Uris in scope always contain subject and predicate
     	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
-    	urisInScope.put(editConfiguration.getVarNameForSubject(), 
+    	urisInScope.put(editConfiguration.getVarNameForSubject(),
     			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
+    	urisInScope.put(editConfiguration.getVarNameForPredicate(),
     			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
     	editConfiguration.setUrisInScope(urisInScope);
-    	//no literals in scope    	    
+    	//no literals in scope
     }
-	
+
     public void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	List<String> urisOnForm = new ArrayList<String>();    	
+    	List<String> urisOnForm = new ArrayList<String>();
     	//If an existing person is being used as an author, need to get the person uri
     	urisOnForm.add("personUri");
     	urisOnForm.add("orgUri");
     	editConfiguration.setUrisOnform(urisOnForm);
-    	
+
     	//for person who is not in system, need to add first name, last name and middle name
     	//Also need to store authorship rank and label of author
     	List<String> literalsOnForm = list("firstName",
@@ -239,10 +239,10 @@ public void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, Vi
     			"orgName",
     			"label");
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
-    }   
-    
-    /** Set SPARQL Queries and supporting methods. */        
-    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {        
+    }
+
+    /** Set SPARQL Queries and supporting methods. */
+    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
         //Sparql queries are all empty for existing values
     	//This form is different from the others that it gets multiple authors on the same page
     	//and that information will be queried and stored in the additional form specific data
@@ -252,12 +252,12 @@ private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequ
     	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
     	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
     }
-    
+
     /**
-	 * 
+	 *
 	 * Set Fields and supporting methods
 	 */
-	
+
 	public void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
     	setLabelField(editConfiguration);
     	setFirstNameField(editConfiguration);
@@ -268,7 +268,7 @@ public void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq
     	setOrgUriField(editConfiguration);
     	setOrgNameField(editConfiguration);
     }
-	
+
 	private void setLabelField(EditConfigurationVTwo editConfiguration) {
 		editConfiguration.addField(new FieldVTwo().
 				setName("label").
@@ -333,7 +333,7 @@ private void setOrgNameField(EditConfigurationVTwo editConfiguration) {
 				setRangeDatatypeUri(XSD.xstring.toString())
 				);
 	}
-	
+
 	//Form specific data
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
@@ -418,27 +418,27 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
         + "WHERE { { \n"
         + "  ?subject core:relatedBy ?authorshipURI . \n"
         + "  ?authorshipURI a core:Authorship . \n"
-        + "  ?authorshipURI core:relates ?authorURI . \n" 
+        + "  ?authorshipURI core:relates ?authorURI . \n"
         + "  ?authorURI a foaf:Agent . \n"
         + "  OPTIONAL { ?authorURI rdfs:label ?authorName } \n"
-        + "  OPTIONAL { ?authorshipURI core:rank ?rank } \n" 
-	    + "} UNION {  \n" 
-	    + "	 ?subject core:relatedBy ?authorshipURI .  \n" 
-	    + "	 ?authorshipURI a core:Authorship .  \n" 
-	    + "	 ?authorshipURI core:relates ?authorURI .  \n" 
-	    + "	 ?authorURI a vcard:Individual .  \n" 
-	    + "	 ?authorURI vcard:hasName ?vName . \n" 
-	    + "	 ?vName vcard:givenName ?firstName . \n" 
-	    + "	 ?vName vcard:familyName ?lastName . \n" 
-	    + "	 OPTIONAL { ?vName core:middleName ?middleName . } \n" 
-	    + "	 OPTIONAL { ?authorshipURI core:rank ?rank }  \n" 
-	    + "	 bind ( COALESCE(?firstName, \"\") As ?firstName1) . \n" 
-	    + "	 bind ( COALESCE(?middleName, \"\") As ?middleName1) . \n" 
-	    + "	 bind ( COALESCE(?lastName, \"\") As ?lastName1) . \n" 
-	    + "	 bind (concat(str(?lastName1 + \", \"),str(?middleName1 + \" \"),str(?firstName1)) as ?authorName) . \n" 
+        + "  OPTIONAL { ?authorshipURI core:rank ?rank } \n"
+	    + "} UNION {  \n"
+	    + "	 ?subject core:relatedBy ?authorshipURI .  \n"
+	    + "	 ?authorshipURI a core:Authorship .  \n"
+	    + "	 ?authorshipURI core:relates ?authorURI .  \n"
+	    + "	 ?authorURI a vcard:Individual .  \n"
+	    + "	 ?authorURI vcard:hasName ?vName . \n"
+	    + "	 ?vName vcard:givenName ?firstName . \n"
+	    + "	 ?vName vcard:familyName ?lastName . \n"
+	    + "	 OPTIONAL { ?vName core:middleName ?middleName . } \n"
+	    + "	 OPTIONAL { ?authorshipURI core:rank ?rank }  \n"
+	    + "	 bind ( COALESCE(?firstName, \"\") As ?firstName1) . \n"
+	    + "	 bind ( COALESCE(?middleName, \"\") As ?middleName1) . \n"
+	    + "	 bind ( COALESCE(?lastName, \"\") As ?lastName1) . \n"
+	    + "	 bind (concat(str(?lastName1 + \", \"),str(?middleName1 + \" \"),str(?firstName1)) as ?authorName) . \n"
         + "} } ORDER BY ?rank";
-    
-       
+
+
     private List<AuthorshipInfo> getExistingAuthorships(String subjectUri, VitroRequest vreq) {
 		RDFService rdfService = vreq.getRDFService();
 
@@ -448,7 +448,7 @@ private List<AuthorshipInfo> getExistingAuthorships(String subjectUri, VitroRequ
 
 			Model constructedModel = ModelFactory.createDefaultModel();
 			rdfService.sparqlConstructQuery(constructStr, constructedModel);
-          
+
 			String queryStr = QueryUtils.subUriForQueryVar(this.getAuthorshipsQuery(), "subject", subjectUri);
 			log.debug("Query string is: " + queryStr);
 
@@ -467,7 +467,7 @@ private List<AuthorshipInfo> getExistingAuthorships(String subjectUri, VitroRequ
 			}
         } catch (Exception e) {
             log.error(e, e);
-        }    
+        }
         authorships = QueryUtils.removeDuplicatesMapsFromList(authorships, "authorShipURI", "authorURI");
         log.debug("authorships = " + authorships);
         return getAuthorshipInfo(authorships);
@@ -480,22 +480,22 @@ private List<AuthorshipInfo> getExistingAuthorships(String subjectUri, VitroRequ
         + "    ?authorship a core:Authorship . \n"
         + "    ?authorship core:rank ?rank .\n"
         + "} ORDER BY DESC(?rank) LIMIT 1";
-        
+
     private int getMaxRank(String subjectUri, VitroRequest vreq) {
 
-        int maxRank = 0; // default value 
+        int maxRank = 0; // default value
         String queryStr = QueryUtils.subUriForQueryVar(this.getMaxRankQueryStr(), "subject", subjectUri);
         log.debug("maxRank query string is: " + queryStr);
         try {
             ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
             if (results != null && results.hasNext()) { // there is at most one result
-                QuerySolution soln = results.next(); 
+                QuerySolution soln = results.next();
                 RDFNode node = soln.get("rank");
                 if (node != null && node.isLiteral()) {
-                    // node.asLiteral().getInt() won't return an xsd:string that 
+                    // node.asLiteral().getInt() won't return an xsd:string that
                     // can be parsed as an int.
                     int rank = Integer.parseInt(node.asLiteral().getLexicalForm());
-                    if (rank > maxRank) {  
+                    if (rank > maxRank) {
                         log.debug("setting maxRank to " + rank);
                         maxRank = rank;
                     }
@@ -549,8 +549,8 @@ public class AuthorshipInfo {
 		//Author information for authorship node
 		private String authorUri;
 		private String authorName;
-		
-		public AuthorshipInfo(String inputAuthorshipUri, 
+
+		public AuthorshipInfo(String inputAuthorshipUri,
 				String inputAuthorshipName,
 				String inputAuthorUri,
 				String inputAuthorName) {
@@ -560,25 +560,25 @@ public AuthorshipInfo(String inputAuthorshipUri,
 			authorName = inputAuthorName;
 
 		}
-		
+
 		//Getters - specifically required for Freemarker template's access to POJO
 		public String getAuthorshipUri() {
 			return authorshipUri;
 		}
-		
+
 		public String getAuthorshipName() {
 			return authorshipName;
 		}
-		
+
 		public String getAuthorUri() {
 			return authorUri;
 		}
-		
+
 		public String getAuthorName() {
 			return authorName;
 		}
 	}
-	
+
 	static final String DEFAULT_NS_TOKEN=null; //null forces the default NS
 
     protected String getMaxRankQueryStr() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java
index 3d086a644d..1586860f8e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java
@@ -7,28 +7,28 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddClinicalRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-		
+
 	private static String template = "addClinicalRoleToPerson.ftl";
-	
+
     //Should this be overridden
 	@Override
-	String getTemplate() { 
-	    return template; 
+	String getTemplate() {
+	    return template;
 	}
 
 	@Override
 	String getRoleType() {
 		return "http://vivoweb.org/ontology/core#ClinicalRole";
 	}
-	
+
 	/** Clinical role involves hard-coded options for the "right side" of the role or activity. */
     @Override
-    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {        
+    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
 		return new ConstantFieldOptions(
-		        "",  "Select one", 
-		        "http://vivoweb.org/ontology/core#Project", "Project", 
+		        "",  "Select one",
+		        "http://vivoweb.org/ontology/core#Project", "Project",
 		        "http://purl.obolibrary.org/obo/ERO_0000005", "Service"
-		);		
+		);
 	}
 
 	//isShowRoleLabelField remains true for this so doesn't need to be overwritten
@@ -38,7 +38,7 @@ boolean isShowRoleLabelField(){
 	}
 
 
-       /* 
+       /*
         * Use the methods below to change the date/time precision in the
         * custom form associated with this generator. When not used, the
         * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -54,6 +54,6 @@ public String getEndDatePrecision() {
             String precision = VitroVocabulary.Precision.DAY.uri();
     	    return precision;
         }
-    */    
-    
+    */
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
index 6f27292be5..4f08141552 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
@@ -22,14 +22,14 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSearchQueryOptions;
 
 /**
- * This generator is for the case where a new concept is being added for an object property other than research/subject areas where the 
+ * This generator is for the case where a new concept is being added for an object property other than research/subject areas where the
  * default object property form generator would work instead of the generator for managing concepts.
  * In this case, we don't want the dropdown list for types for "add a new item of this type" to show concept subclasses, so we are overriding
  * the fields to just include the Concept class.
  */
 public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPropertyFormGenerator implements EditConfigurationGenerator {
 
-	private Log log = LogFactory.getLog(AddConceptThroughObjectPropertyGenerator.class);	
+	private Log log = LogFactory.getLog(AddConceptThroughObjectPropertyGenerator.class);
 
 	@Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
@@ -44,7 +44,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 		}
 		return editConfig;
 	}
-	
+
 	private HashMap<String, String> getCreateNewTypesOptions(VitroRequest vreq) {
 		HashMap<String, String> options = new HashMap<String, String>();
 		List<VClass> rangeTypes = getRangeTypes(vreq);
@@ -53,7 +53,7 @@ private HashMap<String, String> getCreateNewTypesOptions(VitroRequest vreq) {
 		}
 		return options;
 	}
-	
+
     //We will override range types as well so that autocomplete and other fields dependent on range
     //will only consider the main concept type to be the range type
     @Override
@@ -73,44 +73,44 @@ protected List<VClass> getRangeTypes(VitroRequest vreq) {
    		if (rangeUri != null) {
    		    VClass rangeVClass = ctxDaoFact.getVClassDao().getVClassByURI(rangeUri);
    		    if (!rangeVClass.isUnion()) {
-   		        types.add(rangeVClass);    
+   		        types.add(rangeVClass);
    		    } else {
 				types.addAll(rangeVClass.getUnionComponents());
    		    }
 	        return types;
    		} else {
-   			//This should never happen 
+   			//This should never happen
    			log.warn("Range not found for this property so employing SKOS concept class");
    			String vclassURI = "http://www.w3.org/2004/02/skos/core#Concept";
    			VClass rangeVClass = ctxDaoFact.getVClassDao().getVClassByURI(vclassURI);
    			types.add(rangeVClass);
    		}
-   		
+
         return types;
-	}	
-    
+	}
+
     //Should override the method in default object property
     private String getTemplate(
 			VitroRequest vreq) {
-    	
+
     	String acObjectPropertyTemplate = "addConceptThroughObjectPropertyAutoComplete.ftl";
     	String objectPropertyTemplate = "addConceptThroughObjectPropertyForm.ftl";
     	String template = objectPropertyTemplate;
 		if( doAutoComplete )
 			template = acObjectPropertyTemplate;
 		return template;
-		
+
 	}
-    
+
     @Override
     protected void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri, List<VClass> rangeTypes) throws Exception {
 		FieldVTwo field = new FieldVTwo();
-    	field.setName("objectVar");    	
-    	
+    	field.setName("objectVar");
+
     	List<String> validators = new ArrayList<String>();
     	validators.add("nonempty");
     	field.setValidators(validators);
-    	    	
+
     	if( ! doAutoComplete ){
     		List<String> types = new ArrayList<String>();
     		for(VClass v: rangeTypes) {
@@ -125,11 +125,11 @@ protected void setFields(EditConfigurationVTwo editConfiguration, VitroRequest v
     	}else{
     		field.setOptions(null);
     	}
-    	
+
     	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
-    	fields.put(field.getName(), field);    	
-    	    	    	
+    	fields.put(field.getName(), field);
+
     	editConfiguration.setFields(fields);
-    }       
+    }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
index 9fd9cc6026..e5ddfc96ee 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
@@ -24,8 +24,8 @@
 /**
 
 Custom form for adding or editing a webpage associated with an individual. The primary page,
-ManageWebpagesForIndividual, should forward to this page if: (a) we are adding a new page, or 
-(b) an edit link in the Manage Webpages view has been clicked. But right now (a) is not implemented. 
+ManageWebpagesForIndividual, should forward to this page if: (a) we are adding a new page, or
+(b) an edit link in the Manage Webpages view has been clicked. But right now (a) is not implemented.
 
 
 */
@@ -40,41 +40,41 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         prepare(vreq, config);
         return config;
     }
- 
+
     //Have broken this method down into two portions to allow for overriding of edit configuration
     //without having to copy the entire method and before prepare is called
-    
-    protected EditConfigurationVTwo setupConfig(VitroRequest vreq, HttpSession session) throws Exception{ 
-    		
+
+    protected EditConfigurationVTwo setupConfig(VitroRequest vreq, HttpSession session) throws Exception{
+
     	EditConfigurationVTwo config = new EditConfigurationVTwo();
-    
+
 	    config.setTemplate(this.getTemplate());
-	    
+
 	    initBasics(config, vreq);
 	    initPropertyParameters(vreq, session, config);
-	    initObjectPropForm(config, vreq);       
+	    initObjectPropForm(config, vreq);
 	    String linkUri = getLinkUri(vreq);
 	    String domainUri = vreq.getParameter("domainUri");
 	    String vcardIndividualType = "http://www.w3.org/2006/vcard/ns#Kind";
 
-	            
+
 	    config.setVarNameForSubject("subject");
 	    config.setVarNameForObject("vcard");
-	
+
 	    config.addNewResource("vcard", DEFAULT_NS_FOR_NEW_RESOURCE);
 	    config.addNewResource("link", DEFAULT_NS_FOR_NEW_RESOURCE);
-	    
+
 	    config.setN3Required(list( this.getN3ForWebpage(), N3_FOR_URLTYPE ));
 	    config.setN3Optional(list( N3_FOR_ANCHOR, N3_FOR_RANK));
-	    
+
 	    config.addUrisInScope("webpageProperty",     list( "http://purl.obolibrary.org/obo/ARG_2000028" ));
 	    config.addUrisInScope("inverseProperty",     list( "http://purl.obolibrary.org/obo/ARG_2000029" ));
 	    config.addUrisInScope("linkUrlPredicate",             list( "http://www.w3.org/2006/vcard/ns#url" ));
 	    config.addUrisInScope("linkLabelPredicate",  list( "http://www.w3.org/2000/01/rdf-schema#label" ));
 	    config.addUrisInScope("rankPredicate",       list( core + "rank"));
 	    config.addUrisInScope("vcardType",       list( vcardIndividualType ));
-	    
-	    
+
+
 	    if ( config.isUpdate() ) {
 	        config.addUrisInScope("link",  list( linkUri ));
 	    }
@@ -87,45 +87,45 @@ else if ( domainUri.equals("http://xmlns.com/foaf/0.1/Organization") ) {
 	        }
 	    }
 	    config.addSparqlForAdditionalUrisInScope("vcard", individualVcardQuery);
-	    
+
 	    config.setUrisOnForm("urlType");
 	    config.setLiteralsOnForm(list("url","label","rank"));
-	
+
 	    config.addSparqlForExistingLiteral("url",    URL_QUERY);
 	    config.addSparqlForExistingLiteral("label", ANCHOR_QUERY);
 	    config.addSparqlForExistingLiteral("rank",   MAX_RANK_QUERY);
 	    config.addSparqlForExistingUris("urlType", URLTYPE_QUERY);
-	        
+
 	    config.addField(new FieldVTwo().
 	            setName("url").
 	            setValidators(list("nonempty", "datatype:"+XSD.anyURI.toString(), "httpUrl")).
 	            setRangeDatatypeUri(XSD.anyURI.toString()));
-	    
+
 	    config.addField( new FieldVTwo().
 	            setName("urlType").
 	            setValidators( list("nonempty") ).
-	            setOptions( 
+	            setOptions(
 	                new ChildVClassesWithParent("http://www.w3.org/2006/vcard/ns#URL")));
-	
+
 	    config.addField(new FieldVTwo().
 	            setName("label"));
-	    
+
 	    config.addField(new FieldVTwo().
 	            setName("rank").
 	            setRangeDatatypeUri(XSD.xint.toString()));
-	    
-	    config.addFormSpecificData("newRank", 
-	            getMaxRank( EditConfigurationUtils.getObjectUri(vreq), 
+
+	    config.addFormSpecificData("newRank",
+	            getMaxRank( EditConfigurationUtils.getObjectUri(vreq),
 	                        EditConfigurationUtils.getSubjectUri(vreq), vreq )
 	                    + 1 );
-	            
+
 	    config.addValidator(new AntiXssValidation());
-	    
+
 	    //might be null
 	    config.addFormSpecificData("subjectName", getName( config, vreq));
     	return config;
     }
-    
+
     /** may be null */
     private Object getName(EditConfigurationVTwo config, VitroRequest vreq) {
         Individual ind = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(config.getSubjectUri());
@@ -136,40 +136,40 @@ private Object getName(EditConfigurationVTwo config, VitroRequest vreq) {
     }
 
     /* ********* N3 Assertions *********** */
-    static String N3_FOR_WEBPAGE = 
+    static String N3_FOR_WEBPAGE =
         "?subject ?webpageProperty ?vcard . \n"+
         "?vcard ?inverseProperty ?subject . \n"+
         "?vcard a ?vcardType . \n" +
         "?vcard <http://www.w3.org/2006/vcard/ns#hasURL> ?link ."+
         "?link a <http://www.w3.org/2006/vcard/ns#URL> . \n" +
-        "?link ?linkUrlPredicate ?url .";    
-    
+        "?link ?linkUrlPredicate ?url .";
+
     static String N3_FOR_URLTYPE =
         "?link a ?urlType .";
 
     static String N3_FOR_ANCHOR =
         "?link ?linkLabelPredicate ?label .";
-    
-    static String N3_FOR_RANK = 
+
+    static String N3_FOR_RANK =
         "?link ?rankPredicate ?rank .";
 
     /* *********** SPARQL queries for existing values ************** */
-    
-    static String URL_QUERY = 
+
+    static String URL_QUERY =
         "SELECT ?urlExisting WHERE { ?link ?linkUrlPredicate ?urlExisting }";
-    
-    static String URLTYPE_QUERY = 
+
+    static String URLTYPE_QUERY =
         "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
         "SELECT ?linkClassExisting WHERE { ?link vitro:mostSpecificType ?linkClassExisting }";
-    
-    static String ANCHOR_QUERY = 
+
+    static String ANCHOR_QUERY =
         "SELECT ?labelExisting WHERE { ?link ?linkLabelPredicate ?labelExisting }";
 
     static String RANK_QUERY =
         "SELECT ?rankExisting WHERE { ?link ?rankPredicate ?rankExisting }";
-    
+
     static String core = "http://vivoweb.org/ontology/core#";
-    
+
     static String individualVcardQuery =
         "SELECT ?existingVcard WHERE { \n" +
         "?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?existingVcard . \n" +
@@ -177,7 +177,7 @@ private Object getName(EditConfigurationVTwo config, VitroRequest vreq) {
 
     /* Note on ordering by rank in sparql: if there is a non-integer value on a link, that will be returned,
      * since it's ranked highest. Preventing that would require getting all the ranks and sorting in Java,
-     * throwing out non-int values. 
+     * throwing out non-int values.
      */
     private static String MAX_RANK_QUERY = ""
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
@@ -187,23 +187,23 @@ private Object getName(EditConfigurationVTwo config, VitroRequest vreq) {
         + "    ?vcard vcard:hasURL ?link . \n"
         + "    ?link core:rank ?rank .\n"
         + "} ORDER BY DESC(?rank) LIMIT 1";
-        
+
     private int getMaxRank(String objectUri, String subjectUri, VitroRequest vreq) {
 
-        int maxRank = 0; // default value 
-        if (objectUri == null) { // adding new webpage   
+        int maxRank = 0; // default value
+        if (objectUri == null) { // adding new webpage
             String queryStr = QueryUtils.subUriForQueryVar(this.getMaxRankQueryStr(), "subject", subjectUri);
             log.debug("Query string is: " + queryStr);
             try {
                 ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
                 if (results != null && results.hasNext()) { // there is at most one result
-                    QuerySolution soln = results.next(); 
+                    QuerySolution soln = results.next();
                     RDFNode node = soln.get("rank");
                     if (node != null && node.isLiteral()) {
-                        // node.asLiteral().getInt() won't return an xsd:string that 
+                        // node.asLiteral().getInt() won't return an xsd:string that
                         // can be parsed as an int.
                         int rank = Integer.parseInt(node.asLiteral().getLexicalForm());
-                        if (rank > maxRank) {  
+                        if (rank > maxRank) {
                             log.debug("setting maxRank to " + rank);
                             maxRank = rank;
                         }
@@ -217,11 +217,11 @@ private int getMaxRank(String objectUri, String subjectUri, VitroRequest vreq) {
         }
         return maxRank;
     }
-    
+
     protected String getTemplate() {
     	return formTemplate;
     }
-    
+
     protected String getMaxRankQueryStr() {
     	return MAX_RANK_QUERY;
     }
@@ -238,8 +238,8 @@ private String getUrlPatternToReturnTo(VitroRequest vreq) {
 		String rangeUri = (String) vreq.getParameter("rangeUri");
 		String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator";
 		String editUrl = EditConfigurationUtils.getEditUrlWithoutContext(vreq);
-		String returnPath =  editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) + 
-		"&predicateUri=" + UrlBuilder.urlEncode(predicateUri) + 
+		String returnPath =  editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) +
+		"&predicateUri=" + UrlBuilder.urlEncode(predicateUri) +
 		"&editForm=" + UrlBuilder.urlEncode(generatorName);
 		if(domainUri != null && !domainUri.isEmpty()) {
 			returnPath += "&domainUri=" + UrlBuilder.urlEncode(domainUri);
@@ -248,12 +248,12 @@ private String getUrlPatternToReturnTo(VitroRequest vreq) {
 			returnPath += "&rangeUri=" + UrlBuilder.urlEncode(rangeUri);
 		}
 		return returnPath;
-		
+
 	}
 
 	private String getLinkUri(VitroRequest vreq) {
-	    String linkUri = vreq.getParameter("linkUri"); 
-        
+	    String linkUri = vreq.getParameter("linkUri");
+
 		return linkUri;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java
index 4563bfdb18..fcfc66a85c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java
@@ -6,36 +6,36 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 /**
- * Generates the edit configuration for adding a Role to a Person.  
-  
-  Stage one is selecting the type of the non-person thing 
-  associated with the Role with the intention of reducing the 
+ * Generates the edit configuration for adding a Role to a Person.
+
+  Stage one is selecting the type of the non-person thing
+  associated with the Role with the intention of reducing the
   number of Individuals that the user has to select from.
   Stage two is selecting the non-person Individual to associate
-  with the Role. 
+  with the Role.
 
   This is intended to create a set of statements like:
 
   ?person  core:hasResearchActivityRole ?newRole.
-  ?newRole rdf:type core:ResearchActivityRole ;         
+  ?newRole rdf:type core:ResearchActivityRole ;
            roleToActivityPredicate ?someActivity .
   ?someActivity rdf:type core:ResearchActivity .
   ?someActivity rdfs:label "activity title" .
-  
-  
+
+
   Each subclass of the abstract two stage Generator class will have the option of overriding certain
   methods, and must always implement the following methods:
   getRoleType
   getRoleActivityTypeOptionsType
   getRoleActivityTypeObjectClassUri
   getRoleActivityTypeLiteralOptions
-     
+
  *
  */
 public class AddEditorRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
 	private static String TEMPLATE = "addEditorRoleToPerson.ftl";
 	private static String OPTION_CLASS_URI = "http://purl.org/ontology/bibo/Collection";
-	
+
 	@Override
 	String getTemplate(){ return TEMPLATE; }
 
@@ -49,12 +49,12 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
         return new ChildVClassesOptions(OPTION_CLASS_URI)
             .setDefaultOptionLabel("Select type");
     }
-    
+
 	/** Do not show the role label field for the AddEditorRoleToPerson form */
-	@Override	
+	@Override
 	boolean isShowRoleLabelField() { return true;	}
 
-   /* 
+   /*
     * Use the methods below to change the date/time precision in the
     * custom form associated with this generator. When not used, the
     * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -70,5 +70,5 @@ public String getEndDatePrecision() {
         String precision = VitroVocabulary.Precision.DAY.uri();
 	    return precision;
     }
-*/    
+*/
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
index dad9147f83..a794651749 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
@@ -35,9 +35,9 @@
 
 /**
  * This is a slightly unusual generator that is used by Manage Editors on
- * information resources. 
+ * information resources.
  *
- * It is intended to always be an add, and never an update. 
+ * It is intended to always be an add, and never an update.
  */
 public class AddEditorsToInformationResourceGenerator extends VivoBaseGenerator implements EditConfigurationGenerator {
     public static Log log = LogFactory.getLog(AddEditorsToInformationResourceGenerator.class);
@@ -45,7 +45,7 @@ public class AddEditorsToInformationResourceGenerator extends VivoBaseGenerator
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) {
-        EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();    	    	
+        EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
         initBasics(editConfiguration, vreq);
         initPropertyParameters(vreq, session, editConfiguration);
 
@@ -53,21 +53,21 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         setUrlToReturnTo(editConfiguration, vreq);
 
         //set variable names
-        editConfiguration.setVarNameForSubject("infoResource");               
-        editConfiguration.setVarNameForPredicate("predicate");      
-        editConfiguration.setVarNameForObject("editorshipUri");                          
+        editConfiguration.setVarNameForSubject("infoResource");
+        editConfiguration.setVarNameForPredicate("predicate");
+        editConfiguration.setVarNameForObject("editorshipUri");
 
         // Required N3
-        editConfiguration.setN3Required( list( getN3NewEditorship() ) );    
+        editConfiguration.setN3Required( list( getN3NewEditorship() ) );
 
-        // Optional N3 
-        editConfiguration.setN3Optional( generateN3Optional());	
+        // Optional N3
+        editConfiguration.setN3Optional( generateN3Optional());
 
         editConfiguration.addNewResource("editorshipUri", DEFAULT_NS_TOKEN);
         editConfiguration.addNewResource("newPerson", DEFAULT_NS_TOKEN);
         editConfiguration.addNewResource("vcardPerson", DEFAULT_NS_TOKEN);
         editConfiguration.addNewResource("vcardName", DEFAULT_NS_TOKEN);
-        
+
         //In scope
         setUrisAndLiteralsInScope(editConfiguration, vreq);
 
@@ -87,130 +87,130 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
         //Adding additional data, specifically edit mode
         addFormSpecificData(editConfiguration, vreq);
-        
+
         editConfiguration.addValidator(new AntiXssValidation());
-        
-        //NOITCE this generator does not run prepare() since it 
+
+        //NOITCE this generator does not run prepare() since it
         //is never an update and has no SPARQL for existing
-        
+
         return editConfiguration;
     }
-		
+
 	private void setUrlToReturnTo(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));		
+		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));
 	}
-	
+
 	/***N3 strings both required and optional***/
-	
+
 	public String getN3PrefixString() {
-		return "@prefix core: <" + vivoCore + "> .\n" + 
+		return "@prefix core: <" + vivoCore + "> .\n" +
 		 "@prefix foaf: <" + foaf + "> .  \n"   ;
 	}
-	
+
 	private String getN3NewEditorship() {
-		return getN3PrefixString() + 
-		"?editorshipUri a core:Editorship ;\n" + 
-        "  core:relates ?infoResource .\n" + 
+		return getN3PrefixString() +
+		"?editorshipUri a core:Editorship ;\n" +
+        "  core:relates ?infoResource .\n" +
         "?infoResource core:relatedBy ?editorshipUri .";
 	}
-	
+
 	private String getN3EditorshipRank() {
-		return getN3PrefixString() +   
+		return getN3PrefixString() +
         "?editorshipUri core:editorRank ?rank .";
 	}
-	
+
 	//first name, middle name, last name, and new perseon for new editor being created, and n3 for existing person
 	//if existing person selected as editor
 	public List<String> generateN3Optional() {
 		return list(
 		        getN3NewPersonFirstName() ,
                 getN3NewPersonMiddleName(),
-                getN3NewPersonLastName(),                
+                getN3NewPersonLastName(),
                 getN3NewPerson(),
                 getN3EditorshipRank(),
                 getN3ForExistingPerson());
 	}
-	
-	
+
+
 	private String getN3NewPersonFirstName() {
-		return getN3PrefixString() + 
+		return getN3PrefixString() +
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
             "?vcardName vcard:givenName ?firstName .";
 	}
-	
+
 	private String getN3NewPersonMiddleName() {
-		return getN3PrefixString() +  
+		return getN3PrefixString() +
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a vcard:Individual . \n" + 
+            "?vcardPerson a vcard:Individual . \n" +
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a vcard:Name . \n" +   
+            "?vcardName a vcard:Name . \n" +
             "?vcardName <http://vivoweb.org/ontology/core#middleName> ?middleName .";
 	}
-	
+
 	private String getN3NewPersonLastName() {
-		return getN3PrefixString() + 
+		return getN3PrefixString() +
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
             "?vcardName vcard:familyName ?lastName .";
 	}
-	
+
 	private String getN3NewPerson() {
-		return  getN3PrefixString() + 
-        "?newPerson a foaf:Person ;\n" + 
-        "<" + RDFS.label.getURI() + "> ?label .\n" + 
-        "?editorshipUri core:relates ?newPerson .\n" + 
+		return  getN3PrefixString() +
+        "?newPerson a foaf:Person ;\n" +
+        "<" + RDFS.label.getURI() + "> ?label .\n" +
+        "?editorshipUri core:relates ?newPerson .\n" +
         "?newPerson core:relatedBy ?editorshipUri . ";
 	}
-	
+
 	private String getN3ForExistingPerson() {
-		return getN3PrefixString() + 
-		"?editorshipUri core:relates ?personUri .\n" + 
+		return getN3PrefixString() +
+		"?editorshipUri core:relates ?personUri .\n" +
 		"?personUri core:relatedBy ?editorshipUri .";
 	}
-	
+
 	/**  Get new resources	 */
 	//A new editorship uri will always be created when an editor is added
 	//A new person may be added if a person not in the system will be added as editor
-	 private Map<String, String> generateNewResources(VitroRequest vreq) {					
-			
-			
-			HashMap<String, String> newResources = new HashMap<String, String>();			
+	 private Map<String, String> generateNewResources(VitroRequest vreq) {
+
+
+			HashMap<String, String> newResources = new HashMap<String, String>();
 			newResources.put("editorshipUri", DEFAULT_NS_TOKEN);
 			newResources.put("newPerson", DEFAULT_NS_TOKEN);
 			newResources.put("vcardPerson", DEFAULT_NS_TOKEN);
 			newResources.put("vcardName", DEFAULT_NS_TOKEN);
 			return newResources;
 		}
-	
-	/** Set URIS and Literals In Scope and on form and supporting methods	 */   
+
+	/** Set URIS and Literals In Scope and on form and supporting methods	 */
     private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	//Uris in scope always contain subject and predicate
     	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
-    	urisInScope.put(editConfiguration.getVarNameForSubject(), 
+    	urisInScope.put(editConfiguration.getVarNameForSubject(),
     			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
+    	urisInScope.put(editConfiguration.getVarNameForPredicate(),
     			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
     	editConfiguration.setUrisInScope(urisInScope);
-    	//no literals in scope    	    
+    	//no literals in scope
     }
-	
+
     public void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	List<String> urisOnForm = new ArrayList<String>();    	
+    	List<String> urisOnForm = new ArrayList<String>();
     	//If an existing person is being used as an editor, need to get the person uri
     	urisOnForm.add("personUri");
     	editConfiguration.setUrisOnform(urisOnForm);
-    	
+
     	//for person who is not in system, need to add first name, last name and middle name
     	//Also need to store editorship rank and label of editor
     	List<String> literalsOnForm = list("firstName",
@@ -219,10 +219,10 @@ public void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, Vi
     			"rank",
     			"label");
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
-    }   
-    
-    /** Set SPARQL Queries and supporting methods. */        
-    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {        
+    }
+
+    /** Set SPARQL Queries and supporting methods. */
+    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
         //Sparql queries are all empty for existing values
     	//This form is different from the others that it gets multiple editors on the same page
     	//and that information will be queried and stored in the additional form specific data
@@ -232,12 +232,12 @@ private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequ
     	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
     	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
     }
-    
+
     /**
-	 * 
+	 *
 	 * Set Fields and supporting methods
 	 */
-	
+
 	public void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
     	setLabelField(editConfiguration);
     	setFirstNameField(editConfiguration);
@@ -246,7 +246,7 @@ public void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq
     	setRankField(editConfiguration);
     	setPersonUriField(editConfiguration);
     }
-	
+
 	private void setLabelField(EditConfigurationVTwo editConfiguration) {
 		editConfiguration.addField(new FieldVTwo().
 				setName("label").
@@ -352,13 +352,13 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
         + "WHERE { \n"
         + "?subject core:relatedBy ?editorshipURI . \n"
         + "?editorshipURI a core:Editorship . \n"
-        + "?editorshipURI core:relates ?editorURI . \n" 
+        + "?editorshipURI core:relates ?editorURI . \n"
         + "?editorURI a foaf:Person . \n"
         + "OPTIONAL { ?editorURI rdfs:label ?editorName } \n"
-        + "OPTIONAL { ?editorshipURI core:rank ?rank } \n" 
+        + "OPTIONAL { ?editorshipURI core:rank ?rank } \n"
         + "} ORDER BY ?rank";
-    
-       
+
+
     private List<EditorshipInfo> getExistingEditorships(String subjectUri, VitroRequest vreq) {
 		RDFService rdfService = vreq.getRDFService();
 
@@ -387,7 +387,7 @@ private List<EditorshipInfo> getExistingEditorships(String subjectUri, VitroRequ
 			}
         } catch (Exception e) {
             log.error(e, e);
-        }    
+        }
         log.debug("editorships = " + editorships);
         return getEditorshipInfo(editorships);
     }
@@ -399,22 +399,22 @@ private List<EditorshipInfo> getExistingEditorships(String subjectUri, VitroRequ
         + "    ?editorship a core:Editorship . \n"
         + "    ?editorship core:rank ?rank .\n"
         + "} ORDER BY DESC(?rank) LIMIT 1";
-        
+
     private int getMaxRank(String subjectUri, VitroRequest vreq) {
 
-        int maxRank = 0; // default value 
+        int maxRank = 0; // default value
         String queryStr = QueryUtils.subUriForQueryVar(this.getMaxRankQueryStr(), "subject", subjectUri);
         log.debug("maxRank query string is: " + queryStr);
         try {
             ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
             if (results != null && results.hasNext()) { // there is at most one result
-                QuerySolution soln = results.next(); 
+                QuerySolution soln = results.next();
                 RDFNode node = soln.get("rank");
                 if (node != null && node.isLiteral()) {
-                    // node.asLiteral().getInt() won't return an xsd:string that 
+                    // node.asLiteral().getInt() won't return an xsd:string that
                     // can be parsed as an int.
                     int rank = Integer.parseInt(node.asLiteral().getLexicalForm());
-                    if (rank > maxRank) {  
+                    if (rank > maxRank) {
                         log.debug("setting maxRank to " + rank);
                         maxRank = rank;
                     }
@@ -468,8 +468,8 @@ public class EditorshipInfo {
 		//Editor information for editorship node
 		private String editorUri;
 		private String editorName;
-		
-		public EditorshipInfo(String inputEditorshipUri, 
+
+		public EditorshipInfo(String inputEditorshipUri,
 				String inputEditorshipName,
 				String inputEditorUri,
 				String inputEditorName) {
@@ -479,25 +479,25 @@ public EditorshipInfo(String inputEditorshipUri,
 			editorName = inputEditorName;
 
 		}
-		
+
 		//Getters - specifically required for Freemarker template's access to POJO
 		public String getEditorshipUri() {
 			return editorshipUri;
 		}
-		
+
 		public String getEditorshipName() {
 			return editorshipName;
 		}
-		
+
 		public String getEditorUri() {
 			return editorUri;
 		}
-		
+
 		public String getEditorName() {
 			return editorName;
 		}
 	}
-	
+
 	static final String DEFAULT_NS_TOKEN=null; //null forces the default NS
 
     protected String getMaxRankQueryStr() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
index 127cd4b6ab..41cea1395f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
@@ -32,12 +32,12 @@
 
 public class AddEditorshipToPersonGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
-    
+
     public AddEditorshipToPersonGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
-     
+
      if( EditConfigurationUtils.getObjectUri(vreq) == null ){
          return doAddNew(vreq,session);
      }else{
@@ -47,7 +47,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 
     private EditConfigurationVTwo doSkipToDocument(VitroRequest vreq) {
         Individual editorshipNode = EditConfigurationUtils.getObjectIndividual(vreq);
-        
+
         //try to get the document
         String documentQueryStr = "SELECT ?obj \n" +
                              "WHERE { <" + editorshipNode.getURI() + "> <http://vivoweb.org/ontology/core#relates> ?obj . \n" +
@@ -60,8 +60,8 @@ private EditConfigurationVTwo doSkipToDocument(VitroRequest vreq) {
                 return doBadEditorshipNoPub( vreq );
             }else if( rs.size() > 1 ){
                 return doBadEditorshipMultiplePubs(vreq);
-            }else{ 
-                //skip to document 
+            }else{
+                //skip to document
                 RDFNode objNode = rs.next().get("obj");
                 if (!objNode.isResource() || objNode.isAnon()) {
                     return doBadEditorshipNoPub( vreq );
@@ -77,38 +77,38 @@ private EditConfigurationVTwo doSkipToDocument(VitroRequest vreq) {
 
     protected EditConfigurationVTwo doAddNew(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("addEditorshipToPerson.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("editorship");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewEditorship ) );
         conf.setN3Optional( Arrays.asList( n3ForNewDocumentAssertion,
                                            n3ForExistingDocumentAssertion ) );
-        
+
         conf.addNewResource("editorship", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newDocument", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
+
         conf.setUrisOnform(Arrays.asList("existingDocument", "documentType"));
         conf.setLiteralsOnForm(Arrays.asList("documentLabel", "documentLabelDisplay" ));
-        
+
         conf.addSparqlForExistingLiteral("documentLabel", documentLabelQuery);
-        
+
         conf.addSparqlForExistingUris("documentType", documentTypeQuery);
         conf.addSparqlForExistingUris("existingDocument", existingDocumentQuery);
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("documentType").
                 setValidators( list("nonempty") ).
-                setOptions( new ConstantFieldOptions("documentType", getDocumentTypeLiteralOptions() ))                                
+                setOptions( new ConstantFieldOptions("documentType", getDocumentTypeLiteralOptions() ))
                 );
 
         conf.addField( new FieldVTwo().
@@ -123,61 +123,61 @@ protected EditConfigurationVTwo doAddNew(VitroRequest vreq,
 
         conf.addValidator(new AntiXssValidation());
         addFormSpecificData(conf, vreq);
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewEditorship = 
-        "@prefix vivo: <" + vivoCore + "> . \n" +   
+    final static String n3ForNewEditorship =
+        "@prefix vivo: <" + vivoCore + "> . \n" +
         "?person ?predicate ?editorship . \n" +
-        "?editorship a  vivo:Editorship . \n" +              
+        "?editorship a  vivo:Editorship . \n" +
         "?editorship vivo:relates ?person . " ;
-    
-    final static String n3ForNewDocumentAssertion  =      
-        "@prefix vivo: <" + vivoCore + "> . \n" +   
-        "?editorship vivo:relates ?newDocument . \n" +              
-        "?newDocument vivo:editedBy ?editorship . \n" +              
-        "?newDocument a ?documentType . \n" +              
+
+    final static String n3ForNewDocumentAssertion  =
+        "@prefix vivo: <" + vivoCore + "> . \n" +
+        "?editorship vivo:relates ?newDocument . \n" +
+        "?newDocument vivo:editedBy ?editorship . \n" +
+        "?newDocument a ?documentType . \n" +
         "?newDocument <" + label + "> ?documentLabel. " ;
-    
-    final static String n3ForExistingDocumentAssertion  =      
-        "@prefix vivo: <" + vivoCore + "> . \n" +   
-        "?editorship vivo:relates ?existingDocument . \n" +              
-        "?existingDocument vivo:editedBy ?editorship . \n" +              
+
+    final static String n3ForExistingDocumentAssertion  =
+        "@prefix vivo: <" + vivoCore + "> . \n" +
+        "?editorship vivo:relates ?existingDocument . \n" +
+        "?existingDocument vivo:editedBy ?editorship . \n" +
         "?existingDocument a ?documentType . " ;
 
     /* Queries for editing an existing entry */
 
     final static String documentTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "PREFIX vivo: <" + vivoCore + "> . \n" +   
-        "PREFIX bibo: <http://purl.org/ontology/bibo/> . \n" +   
-        "SELECT ?documentType WHERE { \n" + 
-        "  ?editorship vivo:relates ?existingDocument . \n" + 
-        "  ?existingDocument a <http://purl.obolibrary.org/obo/IAO_0000030> . \n" + 
-        "  ?existingDocument vitro:mostSpecificType ?documentType . \n" + 
+        "PREFIX vivo: <" + vivoCore + "> . \n" +
+        "PREFIX bibo: <http://purl.org/ontology/bibo/> . \n" +
+        "SELECT ?documentType WHERE { \n" +
+        "  ?editorship vivo:relates ?existingDocument . \n" +
+        "  ?existingDocument a <http://purl.obolibrary.org/obo/IAO_0000030> . \n" +
+        "  ?existingDocument vitro:mostSpecificType ?documentType . \n" +
         "}";
 
-    final static String documentLabelQuery  =      
+    final static String documentLabelQuery  =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "PREFIX vivo: <" + vivoCore + "> . \n" +   
-        "PREFIX bibo: <http://purl.org/ontology/bibo/> . \n" +   
-        "SELECT ?documentLabel WHERE { \n" + 
-        "  ?editorship vivo:relates ?existingDocument . \n" + 
-        "  ?existingDocument a <http://purl.obolibrary.org/obo/IAO_0000030> . \n" + 
-        "  ?existingDocument <" + label + "> ?documentLabel . \n" + 
+        "PREFIX vivo: <" + vivoCore + "> . \n" +
+        "PREFIX bibo: <http://purl.org/ontology/bibo/> . \n" +
+        "SELECT ?documentLabel WHERE { \n" +
+        "  ?editorship vivo:relates ?existingDocument . \n" +
+        "  ?existingDocument a <http://purl.obolibrary.org/obo/IAO_0000030> . \n" +
+        "  ?existingDocument <" + label + "> ?documentLabel . \n" +
         "}";
 
-    final static String existingDocumentQuery  =      
+    final static String existingDocumentQuery  =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "PREFIX vivo: <" + vivoCore + "> . \n" +   
-        "PREFIX bibo: <http://purl.org/ontology/bibo/> . \n" +   
-        "SELECT existingDocument WHERE { \n" + 
-        "  ?editorship vivo:relates ?existingDocument . \n" + 
-        "  ?existingDocument a <http://purl.obolibrary.org/obo/IAO_0000030> . \n" + 
+        "PREFIX vivo: <" + vivoCore + "> . \n" +
+        "PREFIX bibo: <http://purl.org/ontology/bibo/> . \n" +
+        "SELECT existingDocument WHERE { \n" +
+        "  ?editorship vivo:relates ?existingDocument . \n" +
+        "  ?existingDocument a <http://purl.obolibrary.org/obo/IAO_0000030> . \n" +
         "}";
 
     //Adding form specific data such as edit mode
@@ -202,7 +202,7 @@ private EditConfigurationVTwo doBadEditorshipNoPub(VitroRequest vreq) {
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     private List<List<String>> getDocumentTypeLiteralOptions() {
         List<List<String>> literalOptions = new ArrayList<List<String>>();
         literalOptions.add(list("http://purl.org/ontology/bibo/Book", "Book"));
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java
index 87007f905f..43cf55063c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java
@@ -21,95 +21,95 @@
 public class AddFullNameToPersonGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
     private Log log = LogFactory.getLog(AddFullNameToPersonGenerator.class);
-       
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);  
-        String fullNameUri = getFullNameUri(vreq); 
-        
+        initObjectPropForm(conf, vreq);
+        String fullNameUri = getFullNameUri(vreq);
+
         conf.setTemplate("addFullNameToPerson.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("individualVcard");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewName ) );
         conf.setN3Optional( Arrays.asList( firstNameAssertion, middleNameAssertion, lastNameAssertion, suffixAssertion, prefixAssertion ) );
-        
+
         conf.addNewResource("fullName", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("individualVcard", DEFAULT_NS_FOR_NEW_RESOURCE);
-                
+
         conf.setLiteralsOnForm(Arrays.asList("firstName", "middleName", "lastName", "suffix", "prefix" ));
-        
+
         conf.addSparqlForExistingLiteral("firstName", firstNameQuery);
         conf.addSparqlForExistingLiteral("middleName", middleNameQuery);
         conf.addSparqlForExistingLiteral("lastName", lastNameQuery);
         conf.addSparqlForExistingLiteral("suffix", suffixQuery);
         conf.addSparqlForExistingLiteral("prefix", prefixQuery);
         conf.addSparqlForAdditionalUrisInScope("individualVcard", individualVcardQuery);
-        
+
         if ( conf.isUpdate() ) {
             HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
             urisInScope.put("fullName", Arrays.asList(new String[]{fullNameUri}));
             conf.addUrisInScope(urisInScope);
         }
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("firstName")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("middleName")
                 .setRangeDatatypeUri( XSD.xstring.toString()) );
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("lastName")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("suffix")
                 .setRangeDatatypeUri( XSD.xstring.toString()) );
 
-            conf.addField( new FieldVTwo().                        
+            conf.addField( new FieldVTwo().
                 setName("prefix")
                 .setRangeDatatypeUri( XSD.xstring.toString()) );
 
         conf.addValidator(new AntiXssValidation());
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewName = 
+    final static String n3ForNewName =
         "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?person . \n" +
         "?individualVcard <http://www.w3.org/2006/vcard/ns#hasName> ?fullName . \n" +
-        "?fullName a <http://www.w3.org/2006/vcard/ns#Name> . " ;    
-    
-    final static String firstNameAssertion  =      
+        "?fullName a <http://www.w3.org/2006/vcard/ns#Name> . " ;
+
+    final static String firstNameAssertion  =
         "?fullName <http://www.w3.org/2006/vcard/ns#givenName> ?firstName .";
-    
-    final static String middleNameAssertion  =      
+
+    final static String middleNameAssertion  =
         "?fullName <http://vivoweb.org/ontology/core#middleName> ?middleName .";
 
-    final static String lastNameAssertion  =      
+    final static String lastNameAssertion  =
         "?fullName <http://www.w3.org/2006/vcard/ns#familyName> ?lastName .";
 
-    final static String suffixAssertion  =      
+    final static String suffixAssertion  =
         "?fullName <http://www.w3.org/2006/vcard/ns#honorificSuffix> ?suffix .";
 
-    final static String prefixAssertion  =      
+    final static String prefixAssertion  =
         "?fullName <http://www.w3.org/2006/vcard/ns#honorificPrefix> ?prefix .";
 
     /* Queries for editing an existing entry */
@@ -119,29 +119,29 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?existingIndividualVcard . \n" +
         "}";
 
-    final static String firstNameQuery  =      
+    final static String firstNameQuery  =
         "SELECT ?existingFirstName WHERE {\n"+
         "?fullName <http://www.w3.org/2006/vcard/ns#givenName> ?existingFirstName . }";
 
-    final static String middleNameQuery  =      
+    final static String middleNameQuery  =
         "SELECT ?existingMiddleName WHERE {\n"+
         "?fullName <http://vivoweb.org/ontology/core#middleName> ?existingMiddleName . }";
 
-    final static String lastNameQuery  =      
+    final static String lastNameQuery  =
         "SELECT ?existingLastName WHERE {\n"+
         "?fullName <http://www.w3.org/2006/vcard/ns#familyName> ?existingLastName . }";
 
-    final static String suffixQuery  =      
+    final static String suffixQuery  =
         "SELECT ?existingSuffix WHERE {\n"+
         "?fullName <http://www.w3.org/2006/vcard/ns#honorificSuffix> ?existingSuffix . }";
 
-    final static String prefixQuery  =      
+    final static String prefixQuery  =
         "SELECT ?existingPrefix WHERE {\n"+
         "?fullName <http://www.w3.org/2006/vcard/ns#honorificPrefix> ?existingPrefix . }";
 
 	private String getFullNameUri(VitroRequest vreq) {
-        String fullNameUri = vreq.getParameter("fullNameUri"); 
-        
+        String fullNameUri = vreq.getParameter("fullNameUri");
+
 		return fullNameUri;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
index f17faf2430..888d33e4b0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
@@ -37,60 +37,60 @@
 /**
  *  Custom form for adding a grant to an person for the predicates hasCo-PrincipalInvestigatorRole
      and hasPrincipalInvestigatorRole.
-     
+
  *
  */
 public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator {
-	
+
 	private Log log = LogFactory.getLog(AddGrantRoleToPersonGenerator.class);
 	private String subjectUri = null;
 	private String predicateUri = null;
 	private String objectUri = null;
 	private String template = "addGrantRoleToPerson.ftl";
-	
+
 	//Types of options to populate drop-down for types for the "right side" of the role
 	public static enum RoleActivityOptionTypes {
 		VCLASSGROUP,
 		CHILD_VCLASSES,
 		HARDCODED_LITERALS
 	}
-	
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
     	EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
-    	
+
     	//process subject, predicate, object parameters
     	this.initProcessParameters(vreq, session, editConfiguration);
-    	
+
       	//Assumes this is a simple case of subject predicate var
     	editConfiguration.setN3Required(this.generateN3Required(vreq));
-    	    	
+
     	//n3 optional
     	editConfiguration.setN3Optional(this.generateN3Optional(vreq));
-    	
+
     	//Todo: what do new resources depend on here?
     	//In original form, these variables start off empty
     	editConfiguration.setNewResources(generateNewResources(vreq));
     	//In scope
     	this.setUrisAndLiteralsInScope(editConfiguration, vreq);
-    	
+
     	//on Form
     	this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
-    	
+
     	editConfiguration.setFilesOnForm(new ArrayList<String>());
-    	
+
     	//Sparql queries
     	this.setSparqlQueries(editConfiguration, vreq);
-    	
+
     	//set fields
     	setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq));
-    	
+
     //	No need to put in session here b/c put in session within edit request dispatch controller instead
     	//placing in session depends on having edit key which is handled in edit request dispatch controller
     //	editConfiguration.putConfigInSession(editConfiguration, session);
 
     	prepareForUpdate(vreq, session, editConfiguration);
-    	
+
     	//Form title and submit label now moved to edit configuration template
     	//TODO: check if edit configuration template correct place to set those or whether
     	//additional methods here should be used and reference instead, e.g. edit configuration template could call
@@ -99,7 +99,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
     	setTemplate(editConfiguration, vreq);
     	//Set edit key
     	setEditKey(editConfiguration, vreq);
-    	
+
     	//Add validators
         editConfiguration.addValidator(new DateTimeIntervalValidationVTwo("startField","endField") );
         editConfiguration.addValidator(new AntiXssValidation());
@@ -109,18 +109,18 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         addFormSpecificData(editConfiguration, vreq);
     	return editConfiguration;
     }
-    
- 
+
+
 
 	private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
+    	String editKey = EditConfigurationUtils.getEditKey(vreq);
     	editConfiguration.setEditKey(editKey);
     }
-    
+
 	protected void setTemplate(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq) {
     	editConfiguration.setTemplate(template);
-		
+
 	}
 
 	//Initialize setup: process parameters
@@ -131,11 +131,11 @@ private void initProcessParameters(VitroRequest vreq, HttpSession session, EditC
 
     	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
     	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    
+
     	editConfiguration.setFormUrl(formUrl);
-    	
+
     	editConfiguration.setUrlPatternToReturnTo("/individual");
-    	
+
     	editConfiguration.setVarNameForSubject("person");
     	editConfiguration.setSubjectUri(subjectUri);
     	editConfiguration.setEntityToReturnTo(subjectUri);
@@ -143,28 +143,28 @@ private void initProcessParameters(VitroRequest vreq, HttpSession session, EditC
     	editConfiguration.setPredicateUri(predicateUri);
     	//by definition, this is an object property
     	objectUri = EditConfigurationUtils.getObjectUri(vreq);
-    	
-		this.processObjectPropForm(vreq, editConfiguration);    	
-    }    
+
+		this.processObjectPropForm(vreq, editConfiguration);
+    }
 
 	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	editConfiguration.setVarNameForObject("role");    	
+    	editConfiguration.setVarNameForObject("role");
     	editConfiguration.setObject(objectUri);
     	//this needs to be set for the editing to be triggered properly, otherwise the 'prepare' method
     	//pretends this is a data property editing statement and throws an error
-    	//TODO: Check if null in case no object uri exists but this is still an object property    	
+    	//TODO: Check if null in case no object uri exists but this is still an object property
     }
-   
-    
+
+
    /*
-    * N3 Required and Optional Generators as well as supporting methods 
+    * N3 Required and Optional Generators as well as supporting methods
     */
-	
+
 	private String getPrefixesString() {
 		//TODO: Include dynamic way of including this
 		return "@prefix core: <http://vivoweb.org/ontology/core#> .";
 	}
-	
+
 	//TODO: Check if single string or multiple strings - check rdfslabel form etc. for prefix
 	//processing
     private List<String> generateN3Required(VitroRequest vreq) {
@@ -173,8 +173,8 @@ private List<String> generateN3Required(VitroRequest vreq) {
     	n3ForEdit.add(editString);
     	return n3ForEdit;
     }
-    
-   
+
+
 	private List<String> generateN3Optional(VitroRequest vreq) {
     	List<String> n3Optional = new ArrayList<String>();
     	//n3 for new grant
@@ -187,61 +187,61 @@ private List<String> generateN3Optional(VitroRequest vreq) {
 		n3Optional.addAll(getN3ForStart());
 		//N3 For End
 		n3Optional.addAll(getN3ForEnd());
-    	return n3Optional;	
+    	return n3Optional;
     }
-	
+
 	public String getN3ForGrantRole(VitroRequest vreq) {
     	String editString = getPrefixesString();
     	editString += "?person ?rolePredicate ?role .";
     	editString += "?role a <" + getRoleType(vreq) + "> .";
     	return editString;
 	}
-	
+
 	public String getN3ForNewGrant(VitroRequest vreq) {
     	String editString = getPrefixesString();
     	editString += "?role <" + getRoleToGrantPredicate(vreq) + "> ?grant .";
     	editString += "?grant a core:Grant . ";
-    	editString += "?person core:relatedBy ?grant . "; 
-    	editString += "?grant core:relates ?person . "; 
+    	editString += "?person core:relatedBy ?grant . ";
+    	editString += "?grant core:relates ?person . ";
     	editString += "?grant <" + getGrantToRolePredicate(vreq) + "> ?role .";
     	editString += "?grant <" + RDFS.label.getURI() + "> ?grantLabel .";
     	return editString;
 	}
-	
+
 	public String getN3ForExistingGrant(VitroRequest vreq) {
     	String editString = getPrefixesString();
-    	editString += "?person core:relatedBy ?existingGrant . "; 
-    	editString += "?existingGrant core:relates ?person . "; 
-    	editString += "?role <" + getRoleToGrantPredicate(vreq) + "> ?existingGrant . "; 
+    	editString += "?person core:relatedBy ?existingGrant . ";
+    	editString += "?existingGrant core:relates ?person . ";
+    	editString += "?role <" + getRoleToGrantPredicate(vreq) + "> ?existingGrant . ";
     	editString += "?existingGrant <" + getGrantToRolePredicate(vreq) + "> ?role .";
     	return editString;
 	}
-	
+
 	//Method b/c used in two locations, n3 optional and n3 assertions
 	private List<String> getN3ForStart() {
 		List<String> n3ForStart = new ArrayList<String>();
-		n3ForStart.add("?role  <" + getRoleToIntervalURI() + "> ?intervalNode ." +     
-			    "?intervalNode  <" + RDF.type.getURI() + "> <" + getIntervalTypeURI() + "> ." + 
-			    "?intervalNode <" + getIntervalToStartURI() + "> ?startNode ." +     
-			    "?startNode  <" + RDF.type.getURI() + "> <" + getDateTimeValueTypeURI() + "> ." + 
-			    "?startNode  <" + getDateTimeValueURI() + "> ?startField-value ." + 
+		n3ForStart.add("?role  <" + getRoleToIntervalURI() + "> ?intervalNode ." +
+			    "?intervalNode  <" + RDF.type.getURI() + "> <" + getIntervalTypeURI() + "> ." +
+			    "?intervalNode <" + getIntervalToStartURI() + "> ?startNode ." +
+			    "?startNode  <" + RDF.type.getURI() + "> <" + getDateTimeValueTypeURI() + "> ." +
+			    "?startNode  <" + getDateTimeValueURI() + "> ?startField-value ." +
 			    "?startNode  <" + getDateTimePrecisionURI() + "> ?startField-precision .");
 		return n3ForStart;
 	}
-	
+
 	private List<String> getN3ForEnd() {
 		List<String> n3ForEnd = new ArrayList<String>();
-		n3ForEnd.add("?role      <" + getRoleToIntervalURI() + "> ?intervalNode .  " +   
-			    "?intervalNode  <" + RDF.type.getURI() + "> <" + getIntervalTypeURI() + "> ." + 
-			    "?intervalNode <" + getIntervalToEndURI() + "> ?endNode ." + 
-			    "?endNode  <" + RDF.type.getURI() + "> <" + getDateTimeValueTypeURI() + "> ." + 
-			    "?endNode  <" + getDateTimeValueURI() + "> ?endField-value ." + 
+		n3ForEnd.add("?role      <" + getRoleToIntervalURI() + "> ?intervalNode .  " +
+			    "?intervalNode  <" + RDF.type.getURI() + "> <" + getIntervalTypeURI() + "> ." +
+			    "?intervalNode <" + getIntervalToEndURI() + "> ?endNode ." +
+			    "?endNode  <" + RDF.type.getURI() + "> <" + getDateTimeValueTypeURI() + "> ." +
+			    "?endNode  <" + getDateTimeValueURI() + "> ?endField-value ." +
 			    "?endNode  <" + getDateTimePrecisionURI() + "> ?endField-precision .");
 		return n3ForEnd;
-		
+
 	}
-	
-	
+
+
 	/*
 	 * Get new resources
 	 */
@@ -256,22 +256,22 @@ private Map<String, String> generateNewResources(VitroRequest vreq) {
 			newResources.put("endNode", defaultNamespace + "individual");
 			return newResources;
 		}
-	
+
 	/*
 	 * Set URIS and Literals In Scope and on form and supporting methods
 	 */
-    
+
     private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
     	//note that at this point the subject, predicate, and object var parameters have already been processed
     	//these two were always set when instantiating an edit configuration object from json,
     	//although the json itself did not specify subject/predicate as part of uris in scope
-    	urisInScope.put(editConfiguration.getVarNameForSubject(), 
+    	urisInScope.put(editConfiguration.getVarNameForSubject(),
     			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
+    	urisInScope.put(editConfiguration.getVarNameForPredicate(),
     			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
     	//Setting role type
-    	urisInScope.put("roleType", 
+    	urisInScope.put("roleType",
     			Arrays.asList(new String[]{getRoleType(vreq)}));
     	//Setting inverse role predicate
         urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
@@ -281,7 +281,7 @@ private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration,
     	//with existing values for variables
     	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
     }
-    
+
     private List<String> getInversePredicate(VitroRequest vreq) {
 		List<String> inversePredicateArray = new ArrayList<String>();
 		ObjectProperty op = EditConfigurationUtils.getObjectProperty(vreq);
@@ -292,8 +292,8 @@ private List<String> getInversePredicate(VitroRequest vreq) {
 	}
 
 	//n3 should look as follows
-    //?subject ?predicate ?objectVar 
-    
+    //?subject ?predicate ?objectVar
+
     private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	List<String> urisOnForm = new ArrayList<String>();
     	List<String> literalsOnForm = new ArrayList<String>();
@@ -306,25 +306,25 @@ private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, V
     	literalsOnForm.add("grantLabelDisplay");
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
     }
-    
-    
+
+
     /**
      * Set SPARQL Queries and supporting methods
      */
-    
-    
+
+
     private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	//Sparql queries defining retrieval of literals etc.
     	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
-    	
+
     	Map<String, String> urisInScope = new HashMap<String, String>();
     	editConfiguration.setSparqlForAdditionalUrisInScope(urisInScope);
-    	
+
     	editConfiguration.setSparqlForExistingLiterals(generateSparqlForExistingLiterals(vreq));
     	editConfiguration.setSparqlForExistingUris(generateSparqlForExistingUris(vreq));
     }
-    
-    
+
+
     //Get page uri for object
     private HashMap<String, String> generateSparqlForExistingUris(VitroRequest vreq) {
     	HashMap<String, String> map = new HashMap<String, String>();
@@ -337,7 +337,7 @@ private HashMap<String, String> generateSparqlForExistingUris(VitroRequest vreq)
     	map.put("endField-precision", getEndPrecisionQuery(vreq));
     	return map;
     }
-   
+
 
 
 	private String getEndPrecisionQuery(VitroRequest vreq) {
@@ -345,7 +345,7 @@ private String getEndPrecisionQuery(VitroRequest vreq) {
 		      "?role <" + getRoleToIntervalURI() + "> ?intervalNode ." +
 		    	      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> ." +
 		    	      "?intervalNode <" + getIntervalToEndURI() + "> ?endNode ." +
-		    	      "?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .  " +        
+		    	      "?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .  " +
 		    	      "?endNode <" + getDateTimePrecisionURI() + "> ?existingEndPrecision . }";
 		return query;
 	}
@@ -355,7 +355,7 @@ private String getStartPrecisionQuery(VitroRequest vreq) {
 	      "?role <" + getRoleToIntervalURI() + "> ?intervalNode ." +
 	    	      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> ." +
 	    	      "?intervalNode <" + getIntervalToStartURI() + "> ?startNode ." +
-	    	      "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .  " +        
+	    	      "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .  " +
 	    	      "?startNode <" + getDateTimePrecisionURI() + "> ?existingStartPrecision . }";
 		return query;
 	}
@@ -365,27 +365,27 @@ private String getEndNodeQuery(VitroRequest vreq) {
 		      "?role <" + getRoleToIntervalURI() + "> ?intervalNode ."+
 		    	      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> ."+
 		    	     " ?intervalNode <" + getIntervalToEndURI() + "> ?existingEndNode . "+
-		    	      "?existingEndNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .}";      
+		    	      "?existingEndNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .}";
 		return query;
 	}
 
 	private String getStartNodeQuery(VitroRequest vreq) {
-		String query =  "SELECT ?existingStartNode WHERE {"+ 
-		      "?role <" + getRoleToIntervalURI() + "> ?intervalNode ."+ 
-		      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> ."+ 
-		      "?intervalNode <" + getIntervalToStartURI() + "> ?existingStartNode . "+ 
-		      "?existingStartNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .}";      
+		String query =  "SELECT ?existingStartNode WHERE {"+
+		      "?role <" + getRoleToIntervalURI() + "> ?intervalNode ."+
+		      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> ."+
+		      "?intervalNode <" + getIntervalToStartURI() + "> ?existingStartNode . "+
+		      "?existingStartNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .}";
 		return query;
 	}
 
 	private String getIntervalNodeQuery(VitroRequest vreq) {
-		String query =  "SELECT ?existingIntervalNode WHERE { " + 
-	          "?role <" + getRoleToIntervalURI() + "> ?existingIntervalNode . " + 
+		String query =  "SELECT ?existingIntervalNode WHERE { " +
+	          "?role <" + getRoleToIntervalURI() + "> ?existingIntervalNode . " +
 	          " ?existingIntervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> . }";
 		return query;
 	}
 
-	
+
 
 	private HashMap<String, String> generateSparqlForExistingLiterals(VitroRequest vreq) {
     	HashMap<String, String> map = new HashMap<String, String>();
@@ -395,55 +395,55 @@ private HashMap<String, String> generateSparqlForExistingLiterals(VitroRequest v
     	map.put("endField-value", getExistingEndDateQuery(vreq));
     	return map;
     }
-    
+
     private String getGrantLabelQuery(VitroRequest vreq) {
-		String query =  "PREFIX core: <" + getVivoCoreNamespace() + ">" + 
+		String query =  "PREFIX core: <" + getVivoCoreNamespace() + ">" +
 		"PREFIX rdfs: <" + RDFS.getURI() + "> \n";
 
 		String roleToGrantPredicate = getRoleToGrantPredicate(vreq);
-		query +=  "SELECT ?existingGrantLabel WHERE { \n" + 
-	        "?role  <" + roleToGrantPredicate + "> ?existingGrant . \n" +		
+		query +=  "SELECT ?existingGrantLabel WHERE { \n" +
+	        "?role  <" + roleToGrantPredicate + "> ?existingGrant . \n" +
 	        "?existingGrant rdfs:label ?existingGrantLabel . }";
-		 
+
 		return query;
 	}
 
     private String getExistingGrantQuery(VitroRequest vreq) {
-		String query =  "PREFIX core: <" + getVivoCoreNamespace() + ">" + 
+		String query =  "PREFIX core: <" + getVivoCoreNamespace() + ">" +
 		"PREFIX rdfs: <" + RDFS.getURI() + "> \n";
 
 		String roleToGrantPredicate = getRoleToGrantPredicate(vreq);
-		query +=  "SELECT ?existingGrant WHERE { \n" + 
+		query +=  "SELECT ?existingGrant WHERE { \n" +
 	        "?role  <" + roleToGrantPredicate + "> ?existingGrant .  }";
 		return query;
 	}
 
 	private String getExistingEndDateQuery(VitroRequest vreq) {
-    	String query = " SELECT ?existingEndDate WHERE {\n" + 
-    		"?role <" + getRoleToIntervalURI() + "> ?intervalNode .\n" + 
-    		"?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> .\n" + 
-    		"?intervalNode <" + getIntervalToEndURI() + "> ?endNode .\n" + 
-    		"?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .\n" + 
+    	String query = " SELECT ?existingEndDate WHERE {\n" +
+    		"?role <" + getRoleToIntervalURI() + "> ?intervalNode .\n" +
+    		"?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> .\n" +
+    		"?intervalNode <" + getIntervalToEndURI() + "> ?endNode .\n" +
+    		"?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .\n" +
     		"?endNode <" + getDateTimeValueURI() + "> ?existingEndDate . }";
     	return query;
 	}
 
 	private String getExistingStartDateQuery(VitroRequest vreq) {
-		String query = "SELECT ?existingDateStart WHERE {\n" + 
-	     "?role <" + getRoleToIntervalURI() + "> ?intervalNode .\n" + 
-	     "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> .\n" + 
-	     "?intervalNode <" +  getIntervalToStartURI() + "> ?startNode .\n" + 
-	     "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .\n" + 
+		String query = "SELECT ?existingDateStart WHERE {\n" +
+	     "?role <" + getRoleToIntervalURI() + "> ?intervalNode .\n" +
+	     "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + getIntervalTypeURI() + "> .\n" +
+	     "?intervalNode <" +  getIntervalToStartURI() + "> ?startNode .\n" +
+	     "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + getDateTimeValueTypeURI() + "> .\n" +
 	     "?startNode <" +  getDateTimeValueURI() + "> ?existingDateStart . }";
 
 	return query;
 	}
 
 	/**
-	 * 
+	 *
 	 * Set Fields and supporting methods
 	 */
-	
+
 	private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
     	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
     	//Multiple fields
@@ -455,20 +455,20 @@ private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vre
     	getEndField(editConfiguration, vreq, fields);
     	editConfiguration.setFields(fields);
     }
-	
+
 	private void getGrantField(EditConfigurationVTwo editConfiguration,
 		VitroRequest vreq, Map<String, FieldVTwo> fields) {
 		String fieldName = "grant";
-		
+
 		FieldVTwo field = new FieldVTwo();
     	field.setName(fieldName);
     	//queryForExisting is not being used anywhere in Field
-    	
+
     	List<String> validators = new ArrayList<String>();
-    	field.setValidators(validators);    	    	    
-    	
-    	fields.put(field.getName(), field);	
-		
+    	field.setValidators(validators);
+
+    	fields.put(field.getName(), field);
+
 	}
 
 	private void getGrantLabelField(EditConfigurationVTwo editConfiguration,
@@ -476,45 +476,45 @@ private void getGrantLabelField(EditConfigurationVTwo editConfiguration,
 		String fieldName = "grantLabel";
 		//get range data type uri and range language
 		String stringDatatypeUri = XSD.xstring.toString();
-		
+
 		FieldVTwo field = new FieldVTwo();
     	field.setName(fieldName);
     	//queryForExisting is not being used anywhere in Field
-    	
+
     	//Not really interested in validators here
     	List<String> validators = new ArrayList<String>();
     	validators.add("datatype:" + stringDatatypeUri);
-    	field.setValidators(validators);    	    	
+    	field.setValidators(validators);
+
+    	fields.put(field.getName(), field);
 
-    	fields.put(field.getName(), field);	
-		
 	}
-	
+
 	private void getGrantLabelDisplayField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
-	    
+
 	    FieldVTwo field = new FieldVTwo();
-	    
-		String fieldName = "grantLabelDisplay";					
+
+		String fieldName = "grantLabelDisplay";
     	field.setName(fieldName);
-    	
+
     	String stringDatatypeUri = XSD.xstring.toString();
-    	field.setRangeDatatypeUri(null);    	
+    	field.setRangeDatatypeUri(null);
+
+    	fields.put(field.getName(), field);
 
-    	fields.put(field.getName(), field);	
-		
 	}
 	//Need if returning from an invalid submission
 	private void getExistingGrantField(
 			EditConfigurationVTwo editConfiguration, VitroRequest vreq,
 			Map<String, FieldVTwo> fields) {
 		String fieldName = "existingGrant";
-		
+
 		FieldVTwo field = new FieldVTwo();
-    	field.setName(fieldName);    	
+    	field.setName(fieldName);
     	//queryForExisting is not being used anywhere in Field
-    	
-    	fields.put(field.getName(), field);	
+
+    	fields.put(field.getName(), field);
 	}
 
 	private void getStartField(EditConfigurationVTwo editConfiguration,
@@ -522,16 +522,16 @@ private void getStartField(EditConfigurationVTwo editConfiguration,
 		String fieldName = "startField";
 
 		FieldVTwo field = new FieldVTwo();
-    	field.setName(fieldName);    	        	
-   
+    	field.setName(fieldName);
+
     	//This logic was originally after edit configuration object created from json in original jsp
     	field.setEditElement(
-                new DateTimeWithPrecisionVTwo(field, 
+                new DateTimeWithPrecisionVTwo(field,
                         VitroVocabulary.Precision.YEAR.uri(),
-                        VitroVocabulary.Precision.NONE.uri()));   
-    	
+                        VitroVocabulary.Precision.NONE.uri()));
+
     	fields.put(field.getName(), field);
-		
+
 	}
 
 	private void getEndField(EditConfigurationVTwo editConfiguration,
@@ -539,19 +539,19 @@ private void getEndField(EditConfigurationVTwo editConfiguration,
 		String fieldName = "endField";
 
 		FieldVTwo field = new FieldVTwo();
-    	field.setName(fieldName);    	
-    	
+    	field.setName(fieldName);
+
     	List<String> validators = new ArrayList<String>();
     	field.setValidators(validators);
 
     	//Set edit element
     	 field.setEditElement(
-                 new DateTimeWithPrecisionVTwo(field, 
+                 new DateTimeWithPrecisionVTwo(field,
                          VitroVocabulary.Precision.YEAR.uri(),
                          VitroVocabulary.Precision.NONE.uri()));
-    	
+
     	fields.put(field.getName(), field);
-		
+
 	}
 
 	/**
@@ -560,9 +560,9 @@ private void getEndField(EditConfigurationVTwo editConfiguration,
 	 * @param session - the HTTP session
 	 * @param editConfiguration - Edit configuration
 	 */
-	
+
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
+    	//Here, retrieve model from
 		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
     	//Object property by definition
     	String objectUri = EditConfigurationUtils.getObjectUri(vreq);
@@ -574,9 +574,9 @@ private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfig
             editConfiguration.prepareForNonUpdate( model );
         }
     }
-    
+
 	/**Methods for checking edit mode **
-	 * 
+	 *
 	 */
 	public EditMode getEditMode(VitroRequest vreq) {
 		List<String> roleToGrantPredicates = getPossibleRoleToGrantPredicates();
@@ -586,15 +586,15 @@ public EditMode getEditMode(VitroRequest vreq) {
 	private boolean isAddMode(VitroRequest vreq) {
     	return EditModeUtils.isAddMode(getEditMode(vreq));
     }
-    
+
     private boolean isEditMode(VitroRequest vreq) {
     	return EditModeUtils.isEditMode(getEditMode(vreq));
     }
-    
+
     private boolean isRepairMode(VitroRequest vreq) {
     	return EditModeUtils.isRepairMode(getEditMode(vreq));
     }
-        
+
     /**
      * Methods that are REQUIRED to be implemented in subclasses
      **/
@@ -606,12 +606,12 @@ public String getRoleType(VitroRequest vreq) {
 		}
 		else if(rangeUri.equals(getCoPrincipalInvestigatorURI())) {
 			return getVivoOntologyCoreNamespace() + "CoPrincipalInvestigatorRole";
-		} 
+		}
 		else {
 			return getVivoOntologyCoreNamespace() + "InvestigatorRole";
 		}
 	}
-	
+
 	private Object getCoPrincipalInvestigatorURI() {
 		return getVivoOntologyCoreNamespace() + "CoPrincipalInvestigatorRole";
 	}
@@ -631,27 +631,27 @@ private Object getPrincipalInvestigatorURI() {
 	 * Methods with default values that may be overwritten when required by a subclass
 	 * Both Default value and method that can be overwritten are included below
 	 **/
-    
+
 	public boolean isShowRoleLabelField(VitroRequest vreq) {
 		return true;
 	}
-	
-    
+
+
     //This has a default value, but note that even that will not be used
     //in the update with realized in or contributes to
     //Overridden when need be in subclassed generator
-	//Also note that for now we're going to actually going to return a 
+	//Also note that for now we're going to actually going to return a
 	//placeholder value by default
 	public String getRoleToGrantPredicate(VitroRequest vreq) {
 		ObjectProperty predicate = ModelUtils.getPropertyForRoleInClass(getGrantType(), vreq.getWebappDaoFactory());
 		return predicate.getURI();
 	}
-	
+
 	public String getGrantToRolePredicate(VitroRequest vreq) {
 		ObjectProperty predicate = ModelUtils.getPropertyForRoleInClass(getGrantType(), vreq.getWebappDaoFactory());
 		return predicate.getURIInverse();
 	}
-	
+
 	public String getGrantType() {
 		return "http://vivoweb.org/ontology/core#Grant";
 	}
@@ -662,65 +662,65 @@ public String getGrantType() {
 	public String getDefaultgrantToRolePredicate() {
 		return "http://vivoweb.org/ontology/core#relates";
 	}
-	
+
 	//roleToGrantPredicate
 	public String getDefaultroleToGrantPredicate() {
 		return "http://purl.obolibrary.org/obo/BFO_0000054";
-		
+
 	}
-	
+
 	public List<String> getPossibleRoleToGrantPredicates() {
 		return ModelUtils.getPossiblePropertiesForRole();
 	}
-	
+
 	public List<String> getPossibleGrantToRolePredicates() {
 		return ModelUtils.getPossibleInversePropertiesForRole();
 	}
-	
-    
+
+
 	/**
 	 * Methods to return URIS for various predicates
 	**/
 	public String getVivoCoreNamespace() {
 		return "http://vivoweb.org/ontology/core#";
 	}
-	
+
 	public String getRoleToIntervalURI() {
 		return getVivoCoreNamespace() + "dateTimeInterval";
 	}
-	
+
 	public String getIntervalTypeURI() {
 		return getVivoCoreNamespace() + "DateTimeInterval";
 	}
-	
+
 	public String getIntervalToStartURI() {
 		return getVivoCoreNamespace() + "start";
 	}
-	
+
 	public String getIntervalToEndURI() {
 		return getVivoCoreNamespace() + "end";
 	}
-	
+
 	public String getStartYearPredURI() {
 		return getVivoCoreNamespace() + "startYear";
 	}
-	
+
 	public String getEndYearPredURI() {
 		return getVivoCoreNamespace() + "endYear";
 	}
-	
+
 	public String getDateTimeValueTypeURI() {
 		return getVivoCoreNamespace() + "DateTimeValue";
 	}
-	
+
 	public String getDateTimePrecisionURI() {
 		return getVivoCoreNamespace() + "dateTimePrecision";
 	}
-	
+
 	public String getDateTimeValueURI() {
 		return getVivoCoreNamespace() + "dateTime";
 	}
-	
+
 	//Form specific data
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
@@ -731,23 +731,23 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 		//Put in the fact that we require field
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
+
 	public String getSparqlForAcFilter(VitroRequest vreq) {
 		String subject = EditConfigurationUtils.getSubjectUri(vreq);
 		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
-		
-		
-		String query = "PREFIX core:<" + getVivoCoreNamespace() + "> " + 
-		"SELECT ?grantUri WHERE { " + 
+
+
+		String query = "PREFIX core:<" + getVivoCoreNamespace() + "> " +
+		"SELECT ?grantUri WHERE { " +
 			"<" + subject + "> <" + predicate + "> ?grantRole ." +
 			"?grantRole <" + getRoleToGrantPredicate(vreq) + "> ?grantUri . }";
 		return query;
 	}
-	
+
 	private String getRangeUri(VitroRequest vreq) {
-        String rangeUri = vreq.getParameter("rangeUri"); 
-        
+        String rangeUri = vreq.getParameter("rangeUri");
+
 		return rangeUri;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java
index 30dd8d6ef2..8afed1e420 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java
@@ -1,54 +1,54 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-
-public class AddHeadOfRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
-	private static String template = "addHeadOfRoleToPerson.ftl";
-	private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
-
-    //Should this be overridden
-	@Override
-	String getTemplate() {
-		return template;
-	}
-	
-	@Override
-	String getRoleType() {
-		return "http://vivoweb.org/ontology/core#LeaderRole";
-	}	
-
-	/** Head Of role involves hard-coded options for the "right side" of the role or activity */
-    @Override
-    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-     
-        return new 
-        ChildVClassesOptions(OPTION_CLASS_URI)
-            .setDefaultOptionLabel("Select type");
-	}
-
-	@Override
-	boolean isShowRoleLabelField(){return true;}
-
-   /* 
-    * Use the methods below to change the date/time precision in the
-    * custom form associated with this generator. When not used, the
-    * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
-    * MINUTE, TIME and NONE.
-    */
-/*
-    public String getStartDatePrecision() {
-        String precision = VitroVocabulary.Precision.MONTH.uri();
-	    return precision;
-    }
-
-    public String getEndDatePrecision() {
-        String precision = VitroVocabulary.Precision.DAY.uri();
-	    return precision;
-    }
-*/    
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+
+public class AddHeadOfRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+
+	private static String template = "addHeadOfRoleToPerson.ftl";
+	private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
+
+    //Should this be overridden
+	@Override
+	String getTemplate() {
+		return template;
+	}
+
+	@Override
+	String getRoleType() {
+		return "http://vivoweb.org/ontology/core#LeaderRole";
+	}
+
+	/** Head Of role involves hard-coded options for the "right side" of the role or activity */
+    @Override
+    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+
+        return new
+        ChildVClassesOptions(OPTION_CLASS_URI)
+            .setDefaultOptionLabel("Select type");
+	}
+
+	@Override
+	boolean isShowRoleLabelField(){return true;}
+
+   /*
+    * Use the methods below to change the date/time precision in the
+    * custom form associated with this generator. When not used, the
+    * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
+    * MINUTE, TIME and NONE.
+    */
+/*
+    public String getStartDatePrecision() {
+        String precision = VitroVocabulary.Precision.MONTH.uri();
+	    return precision;
+    }
+
+    public String getEndDatePrecision() {
+        String precision = VitroVocabulary.Precision.DAY.uri();
+	    return precision;
+    }
+*/
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
index acec8b4a57..ba79af359c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
@@ -7,19 +7,19 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddMemberRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
+
 	private static String template = "addMemberRoleToPerson.ftl";
 	private static String VCLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
 	@Override
 	String getTemplate() {
 		return template;
-	}   
-	
+	}
+
 	@Override
-	String getRoleType() {	
+	String getRoleType() {
 		return "http://vivoweb.org/ontology/core#MemberRole";
 	}
-	
+
     @Override
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
                     return new ConstantFieldOptions(
@@ -58,11 +58,11 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
             "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
             "http://vivoweb.org/ontology/core#University","University");
     }
-	
+
 	@Override
-	boolean isShowRoleLabelField(){return true;}    
+	boolean isShowRoleLabelField(){return true;}
 
-   /* 
+   /*
     * Use the methods below to change the date/time precision in the
     * custom form associated with this generator. When not used, the
     * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -78,5 +78,5 @@ public String getEndDatePrecision() {
         String precision = VitroVocabulary.Precision.DAY.uri();
 	    return precision;
     }
-*/    
+*/
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java
index debd3ca807..bee73d3343 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java
@@ -17,46 +17,46 @@
 public class AddOrcidIdToPersonGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
     private Log log = LogFactory.getLog(AddOrcidIdToPersonGenerator.class);
-       
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);  
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("addOrcidIdToPerson.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("orcidId");
-        
+
         conf.setN3Required( Arrays.asList( n3ForOrcidId ) );
-                        
+
         conf.setUrisOnform(Arrays.asList("orcidId"));
-        
+
         conf.addSparqlForExistingUris("orcidId", orcidIdQuery);
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("orcidId").
                 setValidators( list("nonempty") ));
-        
+
         conf.addValidator(new AntiXssValidation());
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForOrcidId = 
+    final static String n3ForOrcidId =
         "@prefix owl: <http://www.w3.org/2002/07/owl#> .\n"+
         "?person <http://vivoweb.org/ontology/core#orcidId> ?orcidId . \n" +
-        "?orcidId a owl:Thing . " ;    
-    
+        "?orcidId a owl:Thing . " ;
+
     /* Queries for editing an existing entry */
 
     final static String orcidIdQuery =
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
index 678fac4896..1dec78f500 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
@@ -7,10 +7,10 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
+
 	private static String template = "addOrganizerRoleToPerson.ftl";
-	
-    
+
+
 	@Override
 	String getTemplate() {
 		return template;
@@ -20,7 +20,7 @@ String getTemplate() {
 	String getRoleType() {
 		return "http://vivoweb.org/ontology/core#OrganizerRole";
 	}
-	
+
 	//Organizer role involves hard-coded options for the "right side" of the role or activity
     @Override
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
@@ -48,7 +48,7 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
 	boolean isShowRoleLabelField() {
 		return false;
 	}
-       /* 
+       /*
         * Use the methods below to change the date/time precision in the
         * custom form associated with this generator. When not used, the
         * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -64,5 +64,5 @@ public String getEndDatePrecision() {
             String precision = VitroVocabulary.Precision.DAY.uri();
     	    return precision;
         }
-    */    
+    */
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
index 00df49faed..0a69623eba 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
@@ -7,17 +7,17 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
+
 	private static String template = "addOutreachProviderRoleToPerson.ftl";
 	private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
-	
+
 	@Override
 	String getTemplate() {
 		return template;
 	}
 
 	@Override
-	String getRoleType() {	
+	String getRoleType() {
 		return "http://vivoweb.org/ontology/core#OutreachProviderRole";
 	}
 
@@ -79,8 +79,8 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
 
 	@Override
 	boolean isShowRoleLabelField(){return true;}
-     
-   /* 
+
+   /*
     * Use the methods below to change the date/time precision in the
     * custom form associated with this generator. When not used, the
     * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -96,5 +96,5 @@ public String getEndDatePrecision() {
         String precision = VitroVocabulary.Precision.DAY.uri();
 	    return precision;
     }
-*/    
+*/
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
index e35af3c63d..a638213fa9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
@@ -37,49 +37,49 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
     final static String dateTimeValueType = vivoCore + "DateTimeValue";
     final static String dateTimeValue = vivoCore + "dateTime";
     final static String dateTimePrecision = vivoCore + "dateTimePrecision";
-    
+
     public AddPresenterRoleToPersonGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("addPresenterRoleToPerson.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("role");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewRole ) );
         conf.setN3Optional( Arrays.asList( n3ForRoleLabelAssertion,
-										   n3ForNewPresentation, 
-                                           n3ForExistingPresentation, 
-                                           n3ForNewConferenceNewPres, 
-                                           n3ForNewConferenceExistingPres, 
-                                           n3ForExistingConferenceNewPres, 
-                                           n3ForExistingConferenceExistingPres, 
-                                           n3ForStart, 
+										   n3ForNewPresentation,
+                                           n3ForExistingPresentation,
+                                           n3ForNewConferenceNewPres,
+                                           n3ForNewConferenceExistingPres,
+                                           n3ForExistingConferenceNewPres,
+                                           n3ForExistingConferenceExistingPres,
+                                           n3ForStart,
                                            n3ForEnd ) );
-        
+
         conf.addNewResource("presentation", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newConference", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("role", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform(Arrays.asList("existingPresentation", "existingConference", "presentationType"));
         conf.setLiteralsOnForm(Arrays.asList("presentationLabel", "presentationLabelDisplay", "conferenceLabel", "conferenceLabelDisplay", "roleLabel"));
-        
+
         conf.addSparqlForExistingLiteral("presentationLabel", presentationLabelQuery);
         conf.addSparqlForExistingLiteral("conferenceLabel", conferenceLabelQuery);
         conf.addSparqlForExistingLiteral("roleLabel", roleLabelQuery);
@@ -94,69 +94,69 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 "intervalNode", existingIntervalNodeQuery);
         conf.addSparqlForExistingUris("startNode", existingStartNodeQuery);
         conf.addSparqlForExistingUris("endNode", existingEndNodeQuery);
-        conf.addSparqlForExistingUris("startField-precision", 
+        conf.addSparqlForExistingUris("startField-precision",
                 existingStartPrecisionQuery);
-        conf.addSparqlForExistingUris("endField-precision", 
+        conf.addSparqlForExistingUris("endField-precision",
                 existingEndPrecisionQuery);
-        
+
         conf.addField( new FieldVTwo(). // an autocomplete field
-                setName("existingPresentation") 
+                setName("existingPresentation")
                 );
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("presentationLabelDisplay")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString()) )
                 );
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("presentationLabel")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString()) )
                 );
-        
+
         conf.addField( new FieldVTwo().
                 setName("presentationType").
                 setValidators( list("nonempty") ).
                 setOptions( new ChildVClassesWithParent(
-                        presentationClass))                                
+                        presentationClass))
                 );
- 
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("roleLabel").
                 setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators(list("datatype:" + XSD.xstring.toString())));
 
         conf.addField( new FieldVTwo(). // an autocomplete field
-                setName("existingConference") 
+                setName("existingConference")
                 );
-        
+
         conf.addField( new FieldVTwo().
                 setName("conferenceLabel").
                 setRangeDatatypeUri(XSD.xstring.toString() )
                 );
-        
+
         conf.addField( new FieldVTwo().
                 setName("conferenceLabelDisplay").
                 setRangeDatatypeUri(XSD.xstring.toString() )
                 );
-        
+
         conf.addField( new FieldVTwo().setName("startField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                               )
                 );
-        
+
         conf.addField( new FieldVTwo().setName("endField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                               )
                 );
-        
+
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new AutocompleteRequiredInputValidator("existingPresentation", "presentationLabel"));
@@ -165,26 +165,26 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
     }
 
     /* N3 assertions  */
-    final static String n3ForNewRole = 
-        "@prefix core: <" + vivoCore + "> . \n" +   
+    final static String n3ForNewRole =
+        "@prefix core: <" + vivoCore + "> . \n" +
         "?person <" + hasRolePred + ">  ?role . \n" +
-        "?role a  <" + roleClass + "> . \n" + 
+        "?role a  <" + roleClass + "> . \n" +
         "?role <" + roleOfPred + "> ?person . ";
 
-	final static String n3ForRoleLabelAssertion = 
-		"?role <" + label + "> ?roleLabel . ";             
-         
-    final static String n3ForNewPresentation = 
-        "?role <" + roleRealizedInPred + "> ?presentation . \n" + 
-        "?presentation <" + realizedRolePred + "> ?role . \n" +    
+	final static String n3ForRoleLabelAssertion =
+		"?role <" + label + "> ?roleLabel . ";
+
+    final static String n3ForNewPresentation =
+        "?role <" + roleRealizedInPred + "> ?presentation . \n" +
+        "?presentation <" + realizedRolePred + "> ?role . \n" +
         "?presentation <" + label + "> ?presentationLabel . \n" +
         "?presentation a ?presentationType .";
-    
-    final static String n3ForExistingPresentation = 
-        "?role <" + roleRealizedInPred + "> ?existingPresentation . \n" + 
+
+    final static String n3ForExistingPresentation =
+        "?role <" + roleRealizedInPred + "> ?existingPresentation . \n" +
         "?existingPresentation <" + realizedRolePred + "> ?role . \n" +
         "?existingPresentation a ?presentationType .";
-        
+
     final static String n3ForNewConferenceNewPres =
         "?presentation <" + eventWithinPred + "> ?newConference . \n" +
         "?newConference <" + includesEventPred + "> ?presentation . \n" +
@@ -196,63 +196,63 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "?newConference <" + includesEventPred + "> ?existingPresentation . \n" +
         "?newConference a <" +  conferenceClass + "> . \n" +
         "?newConference <" + label + "> ?conferenceLabel .";
-    
+
     final static String n3ForExistingConferenceNewPres =
         "?existingConference <" + includesEventPred + "> ?presentation . \n" +
         "?presentation <" + eventWithinPred + "> ?existingConference . \n" +
         "?presentation <" + label + "> ?presentationLabel . ";
-    
+
     final static String n3ForExistingConferenceExistingPres =
         "?existingConference <" + includesEventPred + "> ?existingPresentation . \n" +
         "?existingPresentation <" + eventWithinPred + "> ?existingConference . ";
 
     final static String n3ForStart =
-        "?role <" + roleToInterval + "> ?intervalNode . \n" +    
+        "?role <" + roleToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
-        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +    
+        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode  <" + dateTimeValue + "> ?startField-value . \n" +
         "?startNode  <" + dateTimePrecision + "> ?startField-precision . \n";
-    
+
     final static String n3ForEnd =
-        "?role <" + roleToInterval + "> ?intervalNode . \n" +    
+        "?role <" + roleToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
         "?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n" +
         "?endNode  <" + dateTimeValue + "> ?endField-value . \n" +
         "?endNode  <" + dateTimePrecision + "> ?endField-precision . \n";
-        
+
     /* Queries for editing an existing entry */
     final static String roleLabelQuery =
         "SELECT ?existingRoleLabel WHERE { \n" +
         "?role <" + label + "> ?existingRoleLabel . }";
-    
-    final static String presentationQuery = 
+
+    final static String presentationQuery =
         "SELECT ?existingPresentation WHERE { \n" +
         "?role <" + roleRealizedInPred + "> ?existingPresentation . }";
-    
+
     final static String presentationLabelQuery =
         "SELECT ?existingPresentationLabel WHERE { \n" +
         "?role <" + roleRealizedInPred + "> ?existingPresentation . " +
         "?existingPresentation <" + label + "> ?existingPresentationLabel . }";
-    
-    final static String presentationTypeQuery = 
+
+    final static String presentationTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "SELECT ?existingPresentationType WHERE { \n" + 
+        "SELECT ?existingPresentationType WHERE { \n" +
         "?role <" + roleRealizedInPred + "> ?existingPresentation . " +
         "?existingPresentation vitro:mostSpecificType ?existingPresentationType . }";
-    
-    final static String existingConferenceQuery = 
+
+    final static String existingConferenceQuery =
         "SELECT ?existingConference WHERE { \n" +
         "?role <" + roleRealizedInPred + "> ?existingPresentation . " +
         "?existingPresentation <" + eventWithinPred + "> ?existingConference . }";
-    
+
     final static String conferenceLabelQuery =
         "SELECT ?existingConferenceLabel WHERE { \n" +
         "?role <" + roleRealizedInPred + "> ?existingPresentation . " +
         "?existingPresentation <" + eventWithinPred + "> ?existingConference . \n" +
         "?existingConference <" + label + "> ?existingConferenceLabel . }";
-    
+
     final static String existingStartDateQuery =
         "SELECT ?existingDateStart WHERE { \n" +
         "  ?role <" + roleToInterval + "> ?intervalNode . \n" +
@@ -260,7 +260,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "  ?startNode a <" + dateTimeValueType +"> . \n" +
         "  ?startNode <" + dateTimeValue + "> ?existingDateStart . }";
-    
+
     final static String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
         "  ?role <" + roleToInterval + "> ?intervalNode . \n" +
@@ -270,39 +270,39 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?endNode <" + dateTimeValue + "> ?existingEndDate . }";
 
     final static String existingIntervalNodeQuery =
-        "SELECT ?existingIntervalNode WHERE { \n" + 
+        "SELECT ?existingIntervalNode WHERE { \n" +
         "  ?role <" + roleToInterval + "> ?existingIntervalNode . \n" +
         "  ?existingIntervalNode a <" + intervalType + "> . }";
-    
-    final static String existingStartNodeQuery = 
+
+    final static String existingStartNodeQuery =
         "SELECT ?existingStartNode WHERE { \n" +
         "  ?role <" + roleToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + 
+        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
         "  ?existingStartNode a <" + dateTimeValueType + "> . }   ";
-    
-    final static String existingEndNodeQuery = 
+
+    final static String existingEndNodeQuery =
         "SELECT ?existingEndNode WHERE { \n" +
         "  ?role <" + roleToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" + 
-        "  ?existingEndNode a <" + dateTimeValueType + "> .} ";              
-    
-    final static String existingStartPrecisionQuery = 
+        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" +
+        "  ?existingEndNode a <" + dateTimeValueType + "> .} ";
+
+    final static String existingStartPrecisionQuery =
         "SELECT ?existingStartPrecision WHERE { \n" +
         "  ?role <" + roleToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
-        "  ?startNode a  <" + dateTimeValueType + "> . \n" +           
+        "  ?startNode a  <" + dateTimeValueType + "> . \n" +
         "  ?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
-    
-    final static String existingEndPrecisionQuery = 
+
+    final static String existingEndPrecisionQuery =
         "SELECT ?existingEndPrecision WHERE { \n" +
         "  ?role <" + roleToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
-        "  ?endNode a <" + dateTimeValueType + "> . \n" +          
+        "  ?endNode a <" + dateTimeValueType + "> . \n" +
         "  ?endNode <" + dateTimePrecision + "> ?existingEndPrecision . }";
-    
+
 }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
index 11c395bf6e..e1bb91f871 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
@@ -38,7 +38,7 @@
 
 /**
  * On an add/new, this will show a form, on an edit/update this will skip to the
- * profile page of the publication.  
+ * profile page of the publication.
  */
 public class AddPublicationToPersonGenerator extends VivoBaseGenerator implements EditConfigurationGenerator {
 
@@ -61,12 +61,12 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement
     final static String dateTimeValue = vivoCore + "dateTime";
     final static String dateTimePrecision = vivoCore + "dateTimePrecision";
     final static String relatesPred = vivoCore + "relates";
-   
+
     public AddPublicationToPersonGenerator() {}
-    
+
 	@Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
-     
+
      if( EditConfigurationUtils.getObjectUri(vreq) == null ){
          return doAddNew(vreq,session);
      }else{
@@ -76,7 +76,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 
     private EditConfigurationVTwo doSkipToPublication(VitroRequest vreq) {
         Individual authorshipNode = EditConfigurationUtils.getObjectIndividual(vreq);
-        
+
         //try to get the publication
         String pubQueryStr = "SELECT ?obj \n" +
                              "WHERE { <" + authorshipNode.getURI() + "> <" + relatesPred + "> ?obj . \n" +
@@ -89,8 +89,8 @@ private EditConfigurationVTwo doSkipToPublication(VitroRequest vreq) {
                 return doBadAuthorshipNoPub( vreq );
             }else if( rs.size() > 1 ){
                 return doBadAuthorshipMultiplePubs(vreq);
-            }else{ 
-                //skip to publication 
+            }else{
+                //skip to publication
                 RDFNode objNode = rs.next().get("obj");
                 if (!objNode.isResource() || objNode.isAnon()) {
                     return doBadAuthorshipNoPub( vreq );
@@ -154,10 +154,10 @@ private EditConfigurationVTwo doBadAuthorshipNoPub(VitroRequest vreq) {
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     private void setVarNames(EditConfigurationVTwo editConfiguration) {
-        editConfiguration.setVarNameForSubject("person");               
-        editConfiguration.setVarNameForPredicate("predicate");      
+        editConfiguration.setVarNameForSubject("person");
+        editConfiguration.setVarNameForPredicate("predicate");
         editConfiguration.setVarNameForObject("authorshipUri");
 
     }
@@ -216,18 +216,18 @@ private List<String> generateN3Required() {
     }
 
     private String getAuthorshipN3() {
-        return "@prefix core: <" + vivoCore + "> . " + 
-        "?authorshipUri a core:Authorship ;" + 
-        "core:relates ?person ." +   
+        return "@prefix core: <" + vivoCore + "> . " +
+        "?authorshipUri a core:Authorship ;" +
+        "core:relates ?person ." +
         "?person core:relatedBy ?authorshipUri .";
     }
 
     private String getN3ForNewPub() {
         return "@prefix core: <" + vivoCore + "> ." +
         "?newPublication a ?pubType ." +
-        "?newPublication <" + label + "> ?title ." +  
+        "?newPublication <" + label + "> ?title ." +
         "?authorshipUri core:relates ?newPublication ." +
-        "?newPublication core:relatedBy ?authorshipUri .";   
+        "?newPublication core:relatedBy ?authorshipUri .";
     }
 
     private String getN3ForExistingPub() {
@@ -240,7 +240,7 @@ private String getN3ForNewCollectionNewPub() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?newPublication vivo:hasPublicationVenue ?newCollection . \n" +
         "?newCollection a <" + collectionClass + "> . \n" +
-        "?newCollection vivo:publicationVenueFor ?newPublication . \n" + 
+        "?newCollection vivo:publicationVenueFor ?newPublication . \n" +
         "?newCollection <" + label + "> ?collection .";
     }
 
@@ -248,7 +248,7 @@ private String getN3ForNewCollection() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?pubUri vivo:hasPublicationVenue ?newCollection . \n" +
         "?newCollection a <" + collectionClass + ">  . \n" +
-        "?newCollection vivo:publicationVenueFor ?pubUri . \n" + 
+        "?newCollection vivo:publicationVenueFor ?pubUri . \n" +
         "?newCollection <" + label + "> ?collection .";
     }
 
@@ -268,7 +268,7 @@ private String getN3ForNewBook() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?pubUri vivo:hasPublicationVenue ?newBook . \n" +
         "?newBook a <" + bookClass + ">  . \n" +
-        "?newBook vivo:publicationVenueFor ?pubUri . \n " + 
+        "?newBook vivo:publicationVenueFor ?pubUri . \n " +
         "?newBook <" + label + "> ?book .";
     }
 
@@ -282,8 +282,8 @@ private String getN3ForNewBookNewPub() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?newPublication vivo:hasPublicationVenue ?newBook . \n" +
         "?newBook a <" + bookClass + ">  . \n" +
-        "?newBook vivo:publicationVenueFor ?newPublication . \n " + 
-        "?newBook <" + label + "> ?book . "; 
+        "?newBook vivo:publicationVenueFor ?newPublication . \n " +
+        "?newBook <" + label + "> ?book . ";
     }
 
     private String getN3ForNewBookVolume() {
@@ -312,7 +312,7 @@ private String getN3ForNewBookNewEditor() {
         "?editorship a vivo:Editorship . \n" +
         "?editorship vivo:relates ?newEditor . \n" +
         "?newEditor a <" + editorClass + ">  . \n" +
-        "?newEditor vivo:relatedBy ?editorship . \n" + 
+        "?newEditor vivo:relatedBy ?editorship . \n" +
         "?newEditor <" + label + "> ?editor .";
     }
 
@@ -323,13 +323,13 @@ private String getN3ForNewBookEditor() {
         "?newBook <" + label + "> ?book . \n " +
         "?editorship a vivo:Editorship . \n" +
         "?editorship vivo:relates ?editorUri . \n" +
-        "?editorUri vivo:relatedBy ?editorship . "; 
+        "?editorUri vivo:relatedBy ?editorship . ";
     }
 
     private String getN3ForNewBookNewPublisher() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?newBook vivo:publisher ?newPublisher . \n " +
-        "?newPublisher vivo:publisherOf ?newBook . \n" + 
+        "?newPublisher vivo:publisherOf ?newBook . \n" +
         "?newPublisher <" + label + "> ?publisher .";
      }
 
@@ -349,7 +349,7 @@ private String getN3ForNewConference() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?pubUri <" + presentedAtPred + "> ?newConference . \n" +
         "?newConference a <" + conferenceClass + ">  . \n" +
-        "?newConference <http://purl.obolibrary.org/obo/BFO_0000051> ?pubUri . \n" + 
+        "?newConference <http://purl.obolibrary.org/obo/BFO_0000051> ?pubUri . \n" +
         "?newConference <" + label + "> ?conference .";
     }
 
@@ -363,7 +363,7 @@ private String getN3ForNewConferenceNewPub() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?newPublication <" + presentedAtPred + "> ?newConference . \n" +
         "?newConference a <" + conferenceClass + ">  . \n" +
-        "?newConference <http://purl.obolibrary.org/obo/BFO_0000051> ?newPublication . \n" + 
+        "?newConference <http://purl.obolibrary.org/obo/BFO_0000051> ?newPublication . \n" +
         "?newConference <" + label + "> ?conference .";
     }
 
@@ -377,7 +377,7 @@ private String getN3ForNewEvent() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?pubUri vivo:proceedingsOf ?newEvent . \n" +
         "?newEvent a <" + conferenceClass + ">  . \n" +
-        "?newEvent vivo:hasProceedings ?pubUri . \n" + 
+        "?newEvent vivo:hasProceedings ?pubUri . \n" +
         "?newEvent <" + label + "> ?event .";
     }
 
@@ -391,7 +391,7 @@ private String getN3ForNewEventNewPub() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?newPublication vivo:proceedingsOf ?newEvent . \n" +
         "?newEvent a <" + conferenceClass + ">  . \n" +
-        "?newEvent vivo:hasProceedings ?newPublication . \n" + 
+        "?newEvent vivo:hasProceedings ?newPublication . \n" +
         "?newEvent <" + label + "> ?event .";
     }
 
@@ -408,7 +408,7 @@ private String getN3ForNewEditor() {
         "?editorship a vivo:Editorship . \n" +
         "?editorship vivo:relates ?newEditor . \n" +
         "?newEditor a <" + editorClass + ">  . \n" +
-        "?newEditor vivo:relatedBy ?editorship . \n" + 
+        "?newEditor vivo:relatedBy ?editorship . \n" +
         "?newEditor <" + label + "> ?editor .";
     }
 
@@ -418,7 +418,7 @@ private String getN3ForEditor() {
         "?editorship vivo:relates ?pubUri . \n" +
         "?editorship a vivo:Editorship . \n" +
         "?editorship vivo:relates ?editorUri . \n" +
-        "?editorUri vivo:relatedBy ?editorship . "; 
+        "?editorUri vivo:relatedBy ?editorship . ";
     }
 
     private String getN3ForNewEditorNewPub() {
@@ -429,7 +429,7 @@ private String getN3ForNewEditorNewPub() {
         "?editorship a vivo:Editorship . \n" +
         "?editorship vivo:relates ?newEditor . \n" +
         "?newEditor a <" + editorClass + ">  . \n" +
-        "?newEditor vivo:relatedBy ?editorship . \n" + 
+        "?newEditor vivo:relatedBy ?editorship . \n" +
         "?newEditor <" + label + "> ?editor .";
     }
 
@@ -440,14 +440,14 @@ private String getN3ForEditorNewPub() {
         "?newPublication <" + label + "> ?title ." +
         "?editorship vivo:relates ?editorUri . \n" +
         "?editorship a vivo:Editorship . \n" +
-        "?editorUri vivo:relatedBy ?editorship . "; 
+        "?editorUri vivo:relatedBy ?editorship . ";
     }
 
     private String getN3ForNewPublisher() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?pubUri vivo:publisher ?newPublisher . \n" +
         "?newPublisher a <" + publisherClass + ">  . \n" +
-        "?newPublisher vivo:publisherOf ?pubUri . \n" + 
+        "?newPublisher vivo:publisherOf ?pubUri . \n" +
         "?newPublisher <" + label + "> ?publisher .";
     }
 
@@ -461,7 +461,7 @@ private String getN3ForNewPublisherNewPub() {
         return "@prefix vivo: <" + vivoCore + "> . \n" +
         "?newPublication vivo:publisher ?newPublisher . \n" +
         "?newPublisher a <" + publisherClass + ">  . \n" +
-        "?newPublisher vivo:publisherOf ?newPublication . \n" + 
+        "?newPublisher vivo:publisherOf ?newPublication . \n" +
         "?newPublisher <" + label + "> ?publisher .";
     }
 
@@ -475,9 +475,9 @@ private String getN3FirstNameAssertion() {
         return "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newEditor <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardEditor . \n" +
         "?vcardEditor <http://purl.obolibrary.org/obo/ARG_2000029>  ?newEditor . \n" +
-        "?vcardEditor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardEditor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardEditor vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:givenName ?firstName .";
     }
 
@@ -485,9 +485,9 @@ private String getN3LastNameAssertion() {
         return "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newEditor <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardEditor . \n" +
         "?vcardEditor <http://purl.obolibrary.org/obo/ARG_2000029>  ?newEditor . \n" +
-        "?vcardEditor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardEditor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardEditor vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:familyName ?lastName .";
     }
 
@@ -535,10 +535,10 @@ private String getN3ForDateTimeAssertion() {
     }
 
     /**  Get new resources	 */
-    private Map<String, String> generateNewResources(VitroRequest vreq) {					
+    private Map<String, String> generateNewResources(VitroRequest vreq) {
         String DEFAULT_NS_TOKEN=null; //null forces the default NS
 
-        HashMap<String, String> newResources = new HashMap<String, String>();			
+        HashMap<String, String> newResources = new HashMap<String, String>();
         newResources.put("authorshipUri", DEFAULT_NS_TOKEN);
         newResources.put("newPublication", DEFAULT_NS_TOKEN);
         newResources.put("newCollection", DEFAULT_NS_TOKEN);
@@ -554,21 +554,21 @@ private Map<String, String> generateNewResources(VitroRequest vreq) {
         return newResources;
     }
 
-    /** Set URIS and Literals In Scope and on form and supporting methods	 */   
+    /** Set URIS and Literals In Scope and on form and supporting methods	 */
     private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
         HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
-        urisInScope.put(editConfiguration.getVarNameForSubject(), 
+        urisInScope.put(editConfiguration.getVarNameForSubject(),
                 Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-        urisInScope.put(editConfiguration.getVarNameForPredicate(), 
+        urisInScope.put(editConfiguration.getVarNameForPredicate(),
                 Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
-        editConfiguration.setUrisInScope(urisInScope);    	
+        editConfiguration.setUrisInScope(urisInScope);
         HashMap<String, List<Literal>> literalsInScope = new HashMap<String, List<Literal>>();
-        editConfiguration.setLiteralsInScope(literalsInScope);    	
+        editConfiguration.setLiteralsInScope(literalsInScope);
 
     }
 
     private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-        List<String> urisOnForm = new ArrayList<String>();    	
+        List<String> urisOnForm = new ArrayList<String>();
         //add role activity and roleActivityType to uris on form
         urisOnForm.add("pubType");
         urisOnForm.add("pubUri");
@@ -605,11 +605,11 @@ private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, V
         literalsOnForm.add("firstName");
         literalsOnForm.add("lastName");
         editConfiguration.setLiteralsOnForm(literalsOnForm);
-    }   
+    }
 
-    /** Set SPARQL Queries and supporting methods. */        
+    /** Set SPARQL Queries and supporting methods. */
     //In this case no queries for existing
-    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {        
+    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
         editConfiguration.setSparqlForExistingUris(new HashMap<String, String>());
         editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
         editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
@@ -617,9 +617,9 @@ private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequ
     }
 
     /**
-     * 
+     *
      * Set Fields and supporting methods
-     * @throws Exception 
+     * @throws Exception
      */
 
     private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq) throws Exception {
@@ -668,7 +668,7 @@ private void setPubTypeField(EditConfigurationVTwo editConfiguration) throws Exc
         editConfiguration.addField(new FieldVTwo().
                 setName("pubType").
                 setValidators( list("nonempty") ).
-                setOptions( new ConstantFieldOptions("pubType", getPublicationTypeLiteralOptions() ))                                
+                setOptions( new ConstantFieldOptions("pubType", getPublicationTypeLiteralOptions() ))
                 );
     }
 
@@ -697,7 +697,7 @@ private void setCollectionUriField(EditConfigurationVTwo editConfiguration) {
         editConfiguration.addField(new FieldVTwo().
                 setName("collectionUri"));
     }
-    
+
     private void setBookLabelField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -705,7 +705,7 @@ private void setBookLabelField(EditConfigurationVTwo editConfiguration) {
                 setValidators(list("datatype:" + stringDatatypeUri)).
                 setRangeDatatypeUri(stringDatatypeUri));
     }
-    
+
     private void setBookDisplayField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -718,7 +718,7 @@ private void setBookUriField(EditConfigurationVTwo editConfiguration) {
         editConfiguration.addField(new FieldVTwo().
                 setName("bookUri"));
     }
-    
+
     private void setConferenceLabelField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -726,7 +726,7 @@ private void setConferenceLabelField(EditConfigurationVTwo editConfiguration) {
                 setValidators(list("datatype:" + stringDatatypeUri)).
                 setRangeDatatypeUri(stringDatatypeUri));
     }
-    
+
     private void setConferenceDisplayField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -739,7 +739,7 @@ private void setConferenceUriField(EditConfigurationVTwo editConfiguration) {
         editConfiguration.addField(new FieldVTwo().
                 setName("conferenceUri"));
     }
-    
+
     private void setEventLabelField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -747,7 +747,7 @@ private void setEventLabelField(EditConfigurationVTwo editConfiguration) {
                 setValidators(list("datatype:" + stringDatatypeUri)).
                 setRangeDatatypeUri(stringDatatypeUri));
     }
-    
+
     private void setEventDisplayField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -756,7 +756,7 @@ private void setEventDisplayField(EditConfigurationVTwo editConfiguration) {
                 setRangeDatatypeUri(stringDatatypeUri));
     }
 
-    
+
     private void setFirstNameField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -764,7 +764,7 @@ private void setFirstNameField(EditConfigurationVTwo editConfiguration) {
                 setValidators(list("datatype:" + stringDatatypeUri)).
                 setRangeDatatypeUri(stringDatatypeUri));
     }
-    
+
     private void setLastNameField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -776,7 +776,7 @@ private void setEventUriField(EditConfigurationVTwo editConfiguration) {
         editConfiguration.addField(new FieldVTwo().
                 setName("eventUri"));
     }
-    
+
     private void setEditorLabelField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -784,7 +784,7 @@ private void setEditorLabelField(EditConfigurationVTwo editConfiguration) {
                 setValidators(list("datatype:" + stringDatatypeUri)).
                 setRangeDatatypeUri(stringDatatypeUri));
     }
-    
+
     private void setEditorDisplayField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -797,7 +797,7 @@ private void setEditorUriField(EditConfigurationVTwo editConfiguration) {
         editConfiguration.addField(new FieldVTwo().
                 setName("editorUri"));
     }
-    
+
     private void setPublisherLabelField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -805,7 +805,7 @@ private void setPublisherLabelField(EditConfigurationVTwo editConfiguration) {
                 setValidators(list("datatype:" + stringDatatypeUri)).
                 setRangeDatatypeUri(stringDatatypeUri));
     }
-    
+
     private void setPublisherDisplayField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -818,7 +818,7 @@ private void setPublisherUriField(EditConfigurationVTwo editConfiguration) {
         editConfiguration.addField(new FieldVTwo().
                 setName("publisherUri"));
     }
-    
+
     private void setLocaleField(EditConfigurationVTwo editConfiguration) {
         String stringDatatypeUri = XSD.xstring.toString();
         editConfiguration.addField(new FieldVTwo().
@@ -879,11 +879,11 @@ private void setDateTimeField(EditConfigurationVTwo editConfiguration) {
         editConfiguration.addField(new FieldVTwo().
                 setName("dateTime").
                 setEditElement(
-                new DateTimeWithPrecisionVTwo(null, 
+                new DateTimeWithPrecisionVTwo(null,
                         VitroVocabulary.Precision.YEAR.uri(),
                         VitroVocabulary.Precision.NONE.uri())
                         )
-                );			
+                );
     }
 
     private List<List<String>> getPublicationTypeLiteralOptions() {
@@ -930,12 +930,12 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
     }
 
     public String getSparqlForAcFilter(VitroRequest vreq) {
-        String subject = EditConfigurationUtils.getSubjectUri(vreq);			
+        String subject = EditConfigurationUtils.getSubjectUri(vreq);
 
-        String query = "PREFIX core:<" + vivoCore + "> " + 
-        "SELECT ?pubUri WHERE { " + 
-        "<" + subject + "> core:relatedBy ?authorshipUri . " + 
-        "?authorshipUri a core:Authorship . " +  
+        String query = "PREFIX core:<" + vivoCore + "> " +
+        "SELECT ?pubUri WHERE { " +
+        "<" + subject + "> core:relatedBy ?authorshipUri . " +
+        "?authorshipUri a core:Authorship . " +
         "?authorshipUri core:relates ?pubUri . }";
         return query;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
index b70c27e0d9..ae3bd262a7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
@@ -7,9 +7,9 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddResearcherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
+
 	private static String template = "addResearcherRoleToPerson.ftl";
-	    
+
 	@Override
 	String getTemplate() {
 		return template;
@@ -19,21 +19,21 @@ String getTemplate() {
 	public String getRoleType() {
 		return "http://vivoweb.org/ontology/core#ResearcherRole";
 	}
-		
+
 	/** Researcher role involves hard-coded options for the "right side" of the role or activity. */
 	@Override
 	FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
 		return new ConstantFieldOptions(
-		        "", "Select one", 
-		        "http://vivoweb.org/ontology/core#Grant", "Grant", 
-	        "http://purl.obolibrary.org/obo/ERO_0000015", "Human Study",		
+		        "", "Select one",
+		        "http://vivoweb.org/ontology/core#Grant", "Grant",
+	        "http://purl.obolibrary.org/obo/ERO_0000015", "Human Study",
 	        "http://vivoweb.org/ontology/core#Project", "Project",
-	        "http://purl.obolibrary.org/obo/ERO_0000014", "Research Project");		
+	        "http://purl.obolibrary.org/obo/ERO_0000014", "Research Project");
 	}
 
-	@Override  
+	@Override
     boolean isShowRoleLabelField() { return true;  }
-   /* 
+   /*
     * Use the methods below to change the date/time precision in the
     * custom form associated with this generator. When not used, the
     * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -49,5 +49,5 @@ public String getEndDatePrecision() {
         String precision = VitroVocabulary.Precision.DAY.uri();
 	    return precision;
     }
-*/    
+*/
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
index e1c68edb66..b12452d761 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
@@ -6,36 +6,36 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
-public class AddReviewerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {		
-	
+public class AddReviewerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+
     private static String OBJECT_VCLASS_URI = "http://purl.org/ontology/bibo/Document";
-    
+
 	@Override
 	String getTemplate() { return "addReviewerRoleToPerson.ftl"; }
 
-    //The default activityToRolePredicate and roleToActivityPredicates are 
+    //The default activityToRolePredicate and roleToActivityPredicates are
 	//correct for this subclass so they don't need to be overwritten
 
 /*	@Override
 	public String getRoleToActivityPredicate(VitroRequest vreq) {
 		return "<http://purl.obolibrary.org/obo/BFO_0000054>";
 	}
-*/	
+*/
 	//role type will always be set based on particular form
 	@Override
 	public String getRoleType() {
 		//TODO: Get dynamic way of including vivoweb ontology
 		return "http://vivoweb.org/ontology/core#ReviewerRole";
-	}		
-	
+	}
+
 	/**
 	 *  Each subclass generator will return its own type of option here:
-	 *   whether literal hardcoded, based on class group, or subclasses of a specific class   
+	 *   whether literal hardcoded, based on class group, or subclasses of a specific class
 	 */
     @Override
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
 		return new ConstantFieldOptions(
-		        "",  "Select type", 
+		        "",  "Select type",
 		        "http://purl.org/ontology/bibo/AcademicArticle", "Academic Article",
                 "http://purl.org/ontology/bibo/Article", "Article",
                 "http://purl.org/ontology/bibo/AudioDocument", "Audio Document",
@@ -106,13 +106,13 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
                 "http://vivoweb.org/ontology/core#WorkingPaper", "Working Paper"
         );
     }
-    
+
 	//isShowRoleLabelField remains true for this so doesn't need to be overwritten
 	public boolean isShowRoleLabelField() {
 		return false;
 	}
 
-       /* 
+       /*
         * Use the methods below to change the date/time precision in the
         * custom form associated with this generator. When not used, the
         * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -128,6 +128,6 @@ public String getEndDatePrecision() {
             String precision = VitroVocabulary.Precision.DAY.uri();
     	    return precision;
         }
-    */    
-    
+    */
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
index e78c66e8ac..d29a437c86 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
@@ -39,55 +39,55 @@
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
 /**
- * Generates the edit configuration for adding a Role to a Person.  
-  
-  Stage one is selecting the type of the non-person thing 
-  associated with the Role with the intention of reducing the 
+ * Generates the edit configuration for adding a Role to a Person.
+
+  Stage one is selecting the type of the non-person thing
+  associated with the Role with the intention of reducing the
   number of Individuals that the user has to select from.
   Stage two is selecting the non-person Individual to associate
-  with the Role. 
+  with the Role.
 
   This is intended to create a set of statements like:
 
   ?person  core:hasResearchActivityRole ?newRole.
-  ?newRole rdf:type core:ResearchActivityRole ;         
+  ?newRole rdf:type core:ResearchActivityRole ;
            roleToActivityPredicate ?someActivity .
   ?someActivity rdf:type core:ResearchActivity .
   ?someActivity rdfs:label "activity title" .
-  
-  
-  
+
+
+
   Important: This form cannot be directly used as a custom form.  It has parameters that must be set.
   See addClinicalRoleToPerson.jsp for an example.
-     
+
     roleToActivityPredicate and activityToRolePredicate are both dependent on the type of
     the activity itself. For a new statement, the predicate type is not known.
-    For an existing statement, the predicate is known but may change based on the type of the activity newly selected.  
-    
- 
+    For an existing statement, the predicate is known but may change based on the type of the activity newly selected.
+
+
    bdc34:
    TODO: figure out what needs to be customized per role form, document it here in comments
    TODO: rewrite class as an abstract class with simple, documented, required methods to override
-  
+
    AddRoleToPersonTwoStageGenerator is abstract, each subclass will need to configure:
    From the old JSP version:
-   
+
    showRoleLabelField boolean
-   roleType URI   
+   roleType URI
    roleToActivityPredicate URI
-   activityToRolePredicate URI      
+   activityToRolePredicate URI
    roleActivityType_optionsType
    roleActivityType_objectClassURI
    roleActivityType_literalOptions
-   
+
    For the new generator version:
     template
  *
  */
 public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
-	
+
 	private Log log = LogFactory.getLog(AddRoleToPersonTwoStageGenerator.class);
-	
+
     /* ***** Methods that are REQUIRED to be implemented in subclasses ***** */
 
 //	abstract String getStartDatePrecision();
@@ -96,117 +96,117 @@ public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigura
 
 	/** Freemarker template to use */
 	abstract String getTemplate();
-	
-	/** URI of type for the role context node */ 
+
+	/** URI of type for the role context node */
     abstract String getRoleType();
-    
-    /** return the java object that generates the role activity field options for 
-     * the subclass. 
+
+    /** return the java object that generates the role activity field options for
+     * the subclass.
      * @throws Exception */
     abstract FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception;
-    
+
     /** In the case of literal options, subclass generator will set the options to be returned */
     //not needed any more since the FieldOption can be returned
     //abstract HashMap<String, String> getRoleActivityTypeLiteralOptions();
-    
+
     /**
-     * Each subclass generator will return its own type of option here:    
+     * Each subclass generator will return its own type of option here:
      * whether literal hardcoded, based on class group, or subclasses of a specific class
      * The latter two will apparently lend some kind of uri to objectClassUri ? */
     //not needed any more since the FieldOption can be returned
     //abstract RoleActivityOptionTypes getRoleActivityTypeOptionsType();
-    
+
     /** The URI of a Class to use with options if required. An option type like
      * CHILD_VCLASSES would reqire a role activity object class URI. */
     //not needed any more since the FieldOption can be returned
     //abstract String getRoleActivityTypeObjectClassUri(VitroRequest vreq);
-    
-    /** If true an input should be shown on the form for a 
-     * label for the role context node 
+
+    /** If true an input should be shown on the form for a
+     * label for the role context node
      * TODO: move this to the FTL and have label optional. */
     abstract boolean isShowRoleLabelField();
-    
-    /** URI of predicate between role context node and activity 
+
+    /** URI of predicate between role context node and activity
      * @throws Exception */
     //Bdc34: not used anywhere? that's odd
-    //abstract String getActivityToRolePredicate();            
-		
+    //abstract String getActivityToRolePredicate();
+
     @Override
-    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {    	
-        EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();    	    	
+    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
+        EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
     	initProcessParameters(vreq, session, editConfiguration);
-    	
-        editConfiguration.setVarNameForSubject("person");               
-        editConfiguration.setVarNameForPredicate("rolePredicate");      
+
+        editConfiguration.setVarNameForSubject("person");
+        editConfiguration.setVarNameForPredicate("rolePredicate");
         editConfiguration.setVarNameForObject("role");
-        
+
     	// Required N3
-    	editConfiguration.setN3Required(list(    	            	        
+    	editConfiguration.setN3Required(list(
     	        N3_PREFIX + "\n" +
     	        "?person ?rolePredicate ?role .\n" +
     	        "?role a ?roleType .\n" +
     	        "?role ?inverseRolePredicate ?person ."
-    	));    
-    	
-    	// Optional N3 
+    	));
+
+    	// Optional N3
     	//Note here we are placing the role to activity relationships as optional, since
     	//it's possible to delete this relationship from the activity
     	//On submission, if we kept these statements in n3required, the retractions would
     	//not have all variables substituted, leading to an error
     	//Note also we are including the relationship as a separate string in the array, to allow it to be
-    	//independently evaluated and passed back with substitutions even if the other strings are not 
-    	//substituted correctly. 
+    	//independently evaluated and passed back with substitutions even if the other strings are not
+    	//substituted correctly.
     	editConfiguration.setN3Optional( list(
     	        getN3ForNewRoleActivity(),
     	        getN3ForExistingRoleActivity(),
-//    	        getN3ForActivityType(),                              
+//    	        getN3ForActivityType(),
     	        getN3RoleLabelAssertion(),
     	        getN3ForStart(),
-    	        getN3ForEnd() ));	
-        	    	        
+    	        getN3ForEnd() ));
+
     	editConfiguration.setNewResources( newResources(vreq) );
-    	
+
     	//In scope
     	setUrisAndLiteralsInScope(editConfiguration, vreq);
-    	
+
     	//on Form
     	setUrisAndLiteralsOnForm(editConfiguration, vreq);
-    	    	
+
     	//Sparql queries
     	setSparqlQueries(editConfiguration, vreq);
-    	
+
     	//set fields
     	setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq));
-    	
+
     	//Form title and submit label now moved to edit configuration template
     	//TODO: check if edit configuration template correct place to set those or whether
     	//additional methods here should be used and reference instead, e.g. edit configuration template could call
     	//default obj property form.populateTemplate or some such method
     	//Select from existing also set within template itself
     	editConfiguration.setTemplate(getTemplate());
-    	    	
+
     	//Add validator
         editConfiguration.addValidator(new DateTimeIntervalValidationVTwo("startField","endField") );
         editConfiguration.addValidator(new AntiXssValidation());
         editConfiguration.addValidator(new AutocompleteRequiredInputValidator("existingRoleActivity", "activityLabel"));
-        
+
         //Add preprocessors
         addPreprocessors(editConfiguration, vreq.getWebappDaoFactory());
         //Adding additional data, specifically edit mode
         addFormSpecificData(editConfiguration, vreq);
-        
+
         //prepare
         prepare(vreq, editConfiguration);
     	return editConfiguration;
-    }    	
+    }
+
+    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+    	editConfiguration.setFormUrl(EditConfigurationUtils.getFormUrlWithoutContext(vreq));
+        editConfiguration.setEntityToReturnTo(EditConfigurationUtils.getSubjectUri(vreq));
+    }
 
-    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {    	        
-    	editConfiguration.setFormUrl(EditConfigurationUtils.getFormUrlWithoutContext(vreq));    	
-        editConfiguration.setEntityToReturnTo(EditConfigurationUtils.getSubjectUri(vreq));        
-    }           
-    
     /* N3 Required and Optional Generators as well as supporting methods */
-    
+
 	private List<String> getN3ForNewRoleActivity() {
 	    List<String> n3ForNewRoleActivity = new ArrayList<String>();
         n3ForNewRoleActivity.add("?role " + getRoleToActivityPlaceholder() + " ?roleActivity .\n"+
@@ -215,7 +215,7 @@ private List<String> getN3ForNewRoleActivity() {
         "?roleActivity a ?roleActivityType .");
     	return n3ForNewRoleActivity;
     }
-    
+
 	private List<String> getN3ForExistingRoleActivity() {
 	    List<String> n3ForExistingRoleActivity = new ArrayList<String>();
         n3ForExistingRoleActivity.add("?role " + getRoleToActivityPlaceholder() + " ?existingRoleActivity .\n"+
@@ -223,39 +223,39 @@ private List<String> getN3ForExistingRoleActivity() {
         "?existingRoleActivity a ?roleActivityType .");
     	return n3ForExistingRoleActivity;
     }
-    
-    
+
+
     private String getN3RoleLabelAssertion() {
     	return "?role <" + RDFS.label.getURI() + "> ?roleLabel .";
     }
-	
+
 	private List<String> getN3ForStart() {
 		List<String> n3ForStart = new ArrayList<String>();
-		n3ForStart.add("?role  <" + RoleToIntervalURI + "> ?intervalNode ." +     
-			    "?intervalNode  <" + RDF.type.getURI() + "> <" + IntervalTypeURI + "> ." + 
-			    "?intervalNode <" + IntervalToStartURI + "> ?startNode ." +     
-			    "?startNode  <" + RDF.type.getURI() + "> <" + DateTimeValueTypeURI + "> ." + 
-			    "?startNode  <" + DateTimeValueURI + "> ?startField-value ." + 
+		n3ForStart.add("?role  <" + RoleToIntervalURI + "> ?intervalNode ." +
+			    "?intervalNode  <" + RDF.type.getURI() + "> <" + IntervalTypeURI + "> ." +
+			    "?intervalNode <" + IntervalToStartURI + "> ?startNode ." +
+			    "?startNode  <" + RDF.type.getURI() + "> <" + DateTimeValueTypeURI + "> ." +
+			    "?startNode  <" + DateTimeValueURI + "> ?startField-value ." +
 			    "?startNode  <" + DateTimePrecisionURI + "> ?startField-precision .");
 		return n3ForStart;
 	}
-	
+
 	private List<String> getN3ForEnd() {
 		List<String> n3ForEnd = new ArrayList<String>();
-		n3ForEnd.add("?role      <" + RoleToIntervalURI + "> ?intervalNode .  " +   
-			    "?intervalNode  <" + RDF.type.getURI() + "> <" + IntervalTypeURI + "> ." + 
-			    "?intervalNode <" + IntervalToEndURI + "> ?endNode ." + 
-			    "?endNode  <" + RDF.type.getURI() + "> <" + DateTimeValueTypeURI + "> ." + 
-			    "?endNode  <" + DateTimeValueURI + "> ?endField-value ." + 
+		n3ForEnd.add("?role      <" + RoleToIntervalURI + "> ?intervalNode .  " +
+			    "?intervalNode  <" + RDF.type.getURI() + "> <" + IntervalTypeURI + "> ." +
+			    "?intervalNode <" + IntervalToEndURI + "> ?endNode ." +
+			    "?endNode  <" + RDF.type.getURI() + "> <" + DateTimeValueTypeURI + "> ." +
+			    "?endNode  <" + DateTimeValueURI + "> ?endField-value ." +
 			    "?endNode  <" + DateTimePrecisionURI+ "> ?endField-precision .");
-		return n3ForEnd;		
+		return n3ForEnd;
 	}
-		
+
 	/**  Get new resources	 */
-	 private Map<String, String> newResources(VitroRequest vreq) {					
+	 private Map<String, String> newResources(VitroRequest vreq) {
 			String DEFAULT_NS_TOKEN=null; //null forces the default NS
-			
-			HashMap<String, String> newResources = new HashMap<String, String>();			
+
+			HashMap<String, String> newResources = new HashMap<String, String>();
 			newResources.put("role", DEFAULT_NS_TOKEN);
 			newResources.put("roleActivity", DEFAULT_NS_TOKEN);
 			newResources.put("intervalNode", DEFAULT_NS_TOKEN);
@@ -263,22 +263,22 @@ private Map<String, String> newResources(VitroRequest vreq) {
 			newResources.put("endNode", DEFAULT_NS_TOKEN);
 			return newResources;
 		}
-	
-	/** Set URIS and Literals In Scope and on form and supporting methods	 */   
+
+	/** Set URIS and Literals In Scope and on form and supporting methods	 */
     private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
-    	
+
     	//Setting inverse role predicate
-    	urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));    
+    	urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
     	urisInScope.put("roleType", list( getRoleType() ) );
-    	
+
     	//Uris in scope include subject, predicate, and object var
-    	editConfiguration.setUrisInScope(urisInScope);    	
-    	
+    	editConfiguration.setUrisInScope(urisInScope);
+
     	//literals in scope empty initially, usually populated by code in prepare for update
     	//with existing values for variables
     }
-    
+
     private List<String> getInversePredicate(VitroRequest vreq) {
 		List<String> inversePredicateArray = new ArrayList<String>();
 		ObjectProperty op = EditConfigurationUtils.getObjectProperty(vreq);
@@ -289,7 +289,7 @@ private List<String> getInversePredicate(VitroRequest vreq) {
 	}
 
     private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	List<String> urisOnForm = new ArrayList<String>();    	
+    	List<String> urisOnForm = new ArrayList<String>();
     	//add role activity and roleActivityType to uris on form
     	urisOnForm.add("existingRoleActivity");
     	urisOnForm.add("roleActivityType");
@@ -298,30 +298,30 @@ private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, V
     	urisOnForm.add("roleToActivityPredicate");
     	urisOnForm.add("activityToRolePredicate");
     	editConfiguration.setUrisOnform(urisOnForm);
-    	
+
     	//activity label and role label are literals on form
     	List<String> literalsOnForm = new ArrayList<String>();
     	literalsOnForm.add("activityLabel");
     	literalsOnForm.add("activityLabelDisplay");
     	literalsOnForm.add("roleLabel");
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
-    }    
-    
-    /** Set SPARQL Queries and supporting methods. 
-     * @throws Exception */        
-    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) throws Exception {        
+    }
+
+    /** Set SPARQL Queries and supporting methods.
+     * @throws Exception */
+    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) throws Exception {
         //Queries for activity label, role label, start Field value, end Field value
         HashMap<String, String> map = new HashMap<String, String>();
         map.put("activityLabel", getActivityLabelQuery(vreq));
         map.put("roleLabel", getRoleLabelQuery(vreq));
         map.put("startField-value", getExistingStartDateQuery(vreq));
         map.put("endField-value", getExistingEndDateQuery(vreq));
-        
+
     	editConfiguration.setSparqlForExistingLiterals(map);
-    	  
-    	//Queries for role activity, activity type query, interval node, 
+
+    	//Queries for role activity, activity type query, interval node,
     	// start node, end node, start field precision, endfield precision
-        map = new HashMap<String, String>();        
+        map = new HashMap<String, String>();
         map.put("existingRoleActivity", getExistingRoleActivityQuery(vreq));
         map.put("roleActivityType", getActivityTypeQuery(vreq));
         map.put("intervalNode", getIntervalNodeQuery(vreq));
@@ -331,13 +331,13 @@ private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequ
         map.put("endField-precision", getEndPrecisionQuery(vreq));
         //Also need sparql queries for roleToActivityPredicate and activityToRolePredicate
         map.put("roleToActivityPredicate", getRoleToActivityPredicateQuery(vreq));
-        map.put("activityToRolePredicate", getActivityToRolePredicateQuery(vreq));    	            	       
-    	        
+        map.put("activityToRolePredicate", getActivityToRolePredicateQuery(vreq));
+
     	editConfiguration.setSparqlForExistingUris(map);
     }
-        
+
     private String getActivityToRolePredicateQuery(VitroRequest vreq) {
-    	String query = "SELECT ?existingActivityToRolePredicate \n " + 
+    	String query = "SELECT ?existingActivityToRolePredicate \n " +
 		"WHERE { \n" +
 	      "?roleActivity ?existingActivityToRolePredicate ?role .\n";
 		//Get possible predicates
@@ -352,7 +352,7 @@ private String getActivityToRolePredicateQuery(VitroRequest vreq) {
 	}
 
 	private String getRoleToActivityPredicateQuery(VitroRequest vreq) {
-		String query = "SELECT ?existingRoleToActivityPredicate \n " + 
+		String query = "SELECT ?existingRoleToActivityPredicate \n " +
 		"WHERE { \n" +
 	      "?role ?existingRoleToActivityPredicate ?roleActivity .\n";
 		//Get possible predicates
@@ -366,7 +366,7 @@ private String getEndPrecisionQuery(VitroRequest vreq) {
 		      "?role <" + RoleToIntervalURI + "> ?intervalNode .\n" +
 		    	      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n" +
 		    	      "?intervalNode <" + IntervalToEndURI + "> ?endNode .\n" +
-		    	      "?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .  \n" +        
+		    	      "?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .  \n" +
 		    	      "?endNode <" + DateTimePrecisionURI + "> ?existingEndPrecision . }";
 		return query;
 	}
@@ -376,7 +376,7 @@ private String getStartPrecisionQuery(VitroRequest vreq) {
 	      "?role <" + RoleToIntervalURI + "> ?intervalNode .\n" +
 	      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n" +
 	      "?intervalNode <" + IntervalToStartURI + "> ?startNode .\n" +
-	      "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .  \n" +        
+	      "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .  \n" +
 	      "?startNode <" + DateTimePrecisionURI + "> ?existingStartPrecision . }";
 		return query;
 	}
@@ -386,116 +386,116 @@ private String getEndNodeQuery(VitroRequest vreq) {
 		      "?role <" + RoleToIntervalURI + "> ?intervalNode .\n"+
 		      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n"+
 		      "?intervalNode <" + IntervalToEndURI + "> ?existingEndNode . \n"+
-		      "?existingEndNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .}\n";      
+		      "?existingEndNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .}\n";
 		return query;
 	}
 
 	private String getStartNodeQuery(VitroRequest vreq) {
-		String query =  "SELECT ?existingStartNode WHERE {\n"+ 
-		      "?role <" + RoleToIntervalURI + "> ?intervalNode .\n"+ 
-		      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n"+ 
-		      "?intervalNode <" + IntervalToStartURI + "> ?existingStartNode . \n"+ 
-		      "?existingStartNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .}";      
+		String query =  "SELECT ?existingStartNode WHERE {\n"+
+		      "?role <" + RoleToIntervalURI + "> ?intervalNode .\n"+
+		      "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n"+
+		      "?intervalNode <" + IntervalToStartURI + "> ?existingStartNode . \n"+
+		      "?existingStartNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .}";
 		return query;
 	}
 
 	private String getIntervalNodeQuery(VitroRequest vreq) {
-		String query =  "SELECT ?existingIntervalNode WHERE { \n" + 
-	          "?role <" + RoleToIntervalURI + "> ?existingIntervalNode . \n" + 
+		String query =  "SELECT ?existingIntervalNode WHERE { \n" +
+	          "?role <" + RoleToIntervalURI + "> ?existingIntervalNode . \n" +
 	          " ?existingIntervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> . }\n";
 		return query;
 	}
 
 	/**
 	 * Utility method for subclasses to make a query for type from a ConstantFieldOptions object.
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	protected String getActivityTypeQueryForConstantOptions(VitroRequest vreq, ConstantFieldOptions  fieldOptions )
 	throws Exception{
-	            
-        //make list of type URIs from options, this can be called with null since 
-	    //ConstantFieldOptions doesn't use any of the arguments. 
+
+        //make list of type URIs from options, this can be called with null since
+	    //ConstantFieldOptions doesn't use any of the arguments.
 	    Map<String,String> options = fieldOptions.getOptions(null, null, null) ;
-	    
-        if (options != null && options.size() > 0) {                           
-            List<String> typeUris = new ArrayList<String>();                       
+
+        if (options != null && options.size() > 0) {
+            List<String> typeUris = new ArrayList<String>();
             for(String typeUri: options.keySet()) {
                 if(typeUri != null && !typeUri.isEmpty()) {
                     typeUris.add("(?existingActivityType = <" + typeUri + ">)");
                 }
-            }    
-            
+            }
+
             String defaultActivityTypeQuery = getDefaultActivityTypeQuery(vreq);
             String typeFilters = "FILTER (" + StringUtils.join(typeUris, "||") + ")";
-            return defaultActivityTypeQuery.replaceAll("}$", "") + typeFilters + "}";                
-        } else { 
-            return getDefaultActivityTypeQuery(vreq);      
-        }         
+            return defaultActivityTypeQuery.replaceAll("}$", "") + typeFilters + "}";
+        } else {
+            return getDefaultActivityTypeQuery(vreq);
+        }
 	}
-	
+
 	/**
      * Utility method for subclasses to make a query for type from a ChildVClassesOptions object.
      */
 	protected String getActivityTypeQueryForChildVClassOptions(VitroRequest vreq, ChildVClassesOptions opts){
 	    log.debug("objectClassUri = " + opts.getClassUri());
         return QueryUtils.subUriForQueryVar(
-                getSubclassActivityTypeQuery(vreq), 
-                "objectClassUri", opts.getClassUri());         
+                getSubclassActivityTypeQuery(vreq),
+                "objectClassUri", opts.getClassUri());
 	}
-	
+
 	/**
      * Utility method for subclasses to make a query for type from a IndividualsViaClassGroupOptions object.
      */
     protected String getActivityTypeQueryForIndividualsViaClassGroupOptions(VitroRequest vreq, IndividualsViaClassGroupOptions opts){
         log.debug("ClassGroupUri = " + opts.getClassGroupUri());
         return QueryUtils.subUriForQueryVar(
-                getClassgroupActivityTypeQuery(vreq), 
-                "classgroup", opts.getClassGroupUri());         
+                getClassgroupActivityTypeQuery(vreq),
+                "classgroup", opts.getClassGroupUri());
     }
-    
+
 	/*
-	 * The activity type query results must be limited to the values in the activity type select element. 
+	 * The activity type query results must be limited to the values in the activity type select element.
 	 * Sometimes the query returns a superclass such as owl:Thing instead.
-	 * Make use of vitro:mostSpecificType so that, for example, an individual is both a 
+	 * Make use of vitro:mostSpecificType so that, for example, an individual is both a
 	 * core:InvitedTalk and a core:Presentation, core:InvitedTalk is selected.
 	 * vitro:mostSpecificType alone may not suffice, since it does not guarantee that the value returned
 	 * is in the select list.
-	 * We could still have problems if the value from the select list is not a vitro:mostSpecificType, 
+	 * We could still have problems if the value from the select list is not a vitro:mostSpecificType,
 	 * but that is unlikely.
-	 * 
+	 *
 	 */
-	private String getActivityTypeQuery(VitroRequest vreq) throws Exception {		
+	private String getActivityTypeQuery(VitroRequest vreq) throws Exception {
 
 	    String activityTypeQuery = null;
-	    
-		FieldOptions fieldOpts = getRoleActivityFieldOptions(vreq);		
+
+		FieldOptions fieldOpts = getRoleActivityFieldOptions(vreq);
 		try{
 		    if( fieldOpts == null ){
 		        activityTypeQuery = getDefaultActivityTypeQuery(vreq);
 		    }if( fieldOpts instanceof ConstantFieldOptions ){
-		        activityTypeQuery = getActivityTypeQueryForConstantOptions(vreq, (ConstantFieldOptions)fieldOpts);                // 
+		        activityTypeQuery = getActivityTypeQueryForConstantOptions(vreq, (ConstantFieldOptions)fieldOpts);                //
     		}else if (fieldOpts instanceof ChildVClassesOptions ){
     		    activityTypeQuery = getActivityTypeQueryForChildVClassOptions(vreq, (ChildVClassesOptions)fieldOpts);
     		}else if( fieldOpts instanceof IndividualsViaClassGroupOptions){
-    		    activityTypeQuery = getActivityTypeQueryForIndividualsViaClassGroupOptions(vreq, (IndividualsViaClassGroupOptions)fieldOpts);    
+    		    activityTypeQuery = getActivityTypeQueryForIndividualsViaClassGroupOptions(vreq, (IndividualsViaClassGroupOptions)fieldOpts);
     		}
 		}catch(Exception ex){
 		    log.debug("error while building activity type query",ex);
-		}		
+		}
 		activityTypeQuery = getDefaultActivityTypeQuery(vreq);
 
 	    //The replacement of activity type query's predicate was only relevant when we actually
 	    //know which predicate is definitely being used here
-	    //Here we have multiple values possible for predicate so the original 
-	    //Replacement should only happen when we have an actual predicate	    
+	    //Here we have multiple values possible for predicate so the original
+	    //Replacement should only happen when we have an actual predicate
 		//String replaceRoleToActivityPredicate = getRoleToActivityPredicate(vreq);
 		activityTypeQuery = QueryUtils.replaceQueryVar(activityTypeQuery, "predicate", getRoleToActivityPlaceholderName());
-		
-		log.debug("Activity type query: " + activityTypeQuery);		
+
+		log.debug("Activity type query: " + activityTypeQuery);
 	    return activityTypeQuery;
 	}
 
-	
+
 	private String getDefaultActivityTypeQuery(VitroRequest vreq) {
 		String query =   "PREFIX core: <" + VIVO_NS + ">\n" +
 	    "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
@@ -503,7 +503,7 @@ private String getDefaultActivityTypeQuery(VitroRequest vreq) {
 	    "    ?role ?predicate ?existingActivity . \n" +
 	    "    ?existingActivity vitro:mostSpecificType ?existingActivityType . \n";
 		query += getFilterRoleToActivityPredicate("predicate");
-	    query+= "}"; 
+	    query+= "}";
 		return query;
 	}
 
@@ -516,7 +516,7 @@ private String getSubclassActivityTypeQuery(VitroRequest vreq) {
 	    "    ?existingActivity vitro:mostSpecificType ?existingActivityType . \n" +
 	    "    ?existingActivityType rdfs:subClassOf ?objectClassUri . \n";
 		query += getFilterRoleToActivityPredicate("predicate");
-	    query+= "}"; 
+	    query+= "}";
 		return query;
 	}
 
@@ -528,7 +528,7 @@ private String getClassgroupActivityTypeQuery(VitroRequest vreq) {
 	    "    ?existingActivity vitro:mostSpecificType ?existingActivityType . \n" +
 	    "    ?existingActivityType vitro:inClassGroup ?classgroup . \n";
 		query += getFilterRoleToActivityPredicate("predicate");
-	    query+= "}"; 
+	    query+= "}";
 		return query;
 	}
 
@@ -536,31 +536,31 @@ private String getClassgroupActivityTypeQuery(VitroRequest vreq) {
 	private String getExistingRoleActivityQuery(VitroRequest vreq) {
 		//If role to activity predicate is the default query, then we need to replace with a union
 		//of both realizedIn and the other
-		String query =  "PREFIX core: <" + VIVO_NS + ">"; 
-		
-		query += "SELECT ?existingRoleActivity WHERE { \n" + 
-		" ?role ?predicate ?existingRoleActivity . \n ";	
+		String query =  "PREFIX core: <" + VIVO_NS + ">";
+
+		query += "SELECT ?existingRoleActivity WHERE { \n" +
+		" ?role ?predicate ?existingRoleActivity . \n ";
 		query += getFilterRoleToActivityPredicate("predicate");
 		query += "}";
 		return query;
 	}
-    
+
     private String getExistingEndDateQuery(VitroRequest vreq) {
-    	String query = " SELECT ?existingEndDate WHERE {\n" + 
-    		"?role <" + RoleToIntervalURI + "> ?intervalNode .\n" + 
-    		"?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n" + 
-    		"?intervalNode <" + IntervalToEndURI + "> ?endNode .\n" + 
-    		"?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .\n" + 
+    	String query = " SELECT ?existingEndDate WHERE {\n" +
+    		"?role <" + RoleToIntervalURI + "> ?intervalNode .\n" +
+    		"?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n" +
+    		"?intervalNode <" + IntervalToEndURI + "> ?endNode .\n" +
+    		"?endNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .\n" +
     		"?endNode <" + DateTimeValueURI + "> ?existingEndDate . }";
     	return query;
 	}
 
 	private String getExistingStartDateQuery(VitroRequest vreq) {
-		String query = "SELECT ?existingDateStart WHERE {\n" + 
-	     "?role <" + RoleToIntervalURI + "> ?intervalNode .\n" + 
-	     "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n" + 
-	     "?intervalNode <" +  IntervalToStartURI+ "> ?startNode .\n" + 
-	     "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .\n" + 
+		String query = "SELECT ?existingDateStart WHERE {\n" +
+	     "?role <" + RoleToIntervalURI + "> ?intervalNode .\n" +
+	     "?intervalNode <" + VitroVocabulary.RDF_TYPE + "> <" + IntervalTypeURI + "> .\n" +
+	     "?intervalNode <" +  IntervalToStartURI+ "> ?startNode .\n" +
+	     "?startNode <" + VitroVocabulary.RDF_TYPE + "> <" + DateTimeValueTypeURI + "> .\n" +
 	     "?startNode <" +  DateTimeValueURI + "> ?existingDateStart . }";
 
 	return query;
@@ -573,23 +573,23 @@ private String getRoleLabelQuery(VitroRequest vreq) {
 	}
 
 	private String getActivityLabelQuery(VitroRequest vreq) {
-		String query =  "PREFIX core: <" + VIVO_NS + ">" + 
+		String query =  "PREFIX core: <" + VIVO_NS + ">" +
 		"PREFIX rdfs: <" + RDFS.getURI() + "> \n";
 
-		query +=  "SELECT ?existingTitle WHERE { \n" + 
-		"?role ?predicate ?existingActivity . \n" +		
+		query +=  "SELECT ?existingTitle WHERE { \n" +
+		"?role ?predicate ?existingActivity . \n" +
 		"?existingActivity rdfs:label ?existingTitle . \n";
 		query += getFilterRoleToActivityPredicate("predicate");
-    	query += "}"; 
+    	query += "}";
 		return query;
 	}
 
 	/**
-	 * 
+	 *
 	 * Set Fields and supporting methods
-	 * @throws Exception 
+	 * @throws Exception
 	 */
-	
+
 	private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) throws Exception {
     	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
     	//Multiple fields
@@ -606,71 +606,71 @@ private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vre
     	getActivityToRolePredicateField(editConfiguration, vreq, fields);
     	editConfiguration.setFields(fields);
     }
-    
+
 	//This is a literal technically?
 	private void getActivityToRolePredicateField(
 			EditConfigurationVTwo editConfiguration, VitroRequest vreq,
 			Map<String, FieldVTwo> fields) {
-						
+
 		FieldVTwo field = new FieldVTwo();
-		
+
 		String fieldName = "activityToRolePredicate";
-    	field.setName(fieldName);    	  
-    	
+    	field.setName(fieldName);
+
     	//get range data type uri and range language
         String stringDatatypeUri = XSD.xstring.toString();
     	field.setRangeDatatypeUri( stringDatatypeUri );
-    	
-    	fields.put(field.getName(), field);			
+
+    	fields.put(field.getName(), field);
 	}
 
 	private void getRoleToActivityPredicateField(
 			EditConfigurationVTwo editConfiguration, VitroRequest vreq,
 			Map<String, FieldVTwo> fields) {
-						
+
 		FieldVTwo field = new FieldVTwo();
-		
+
 		String fieldName = "roleToActivityPredicate";
-    	field.setName(fieldName);    	
-    	
+    	field.setName(fieldName);
+
     	//get range data type uri and range language
         String stringDatatypeUri = XSD.xstring.toString();
         field.setRangeDatatypeUri(stringDatatypeUri);
-    
-    	fields.put(field.getName(), field);			
+
+    	fields.put(field.getName(), field);
 	}
 
 	//Label of "right side" of role, i.e. label for role roleIn Activity
 	private void getActivityLabelField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
-				
+
 		FieldVTwo field = new FieldVTwo();
 		String fieldName = "activityLabel";
-    	field.setName(fieldName);    	    	    
-    	
+    	field.setName(fieldName);
+
     	//get range data type uri and range language
-        String stringDatatypeUri = XSD.xstring.toString();   
+        String stringDatatypeUri = XSD.xstring.toString();
         field.setRangeDatatypeUri(stringDatatypeUri);
-        
+
     	List<String> validators = new ArrayList<String>();
     	validators.add("datatype:" + stringDatatypeUri);
-    	field.setValidators(validators);    	        
-    	    	    	    	
-    	fields.put(field.getName(), field);	
+    	field.setValidators(validators);
+
+    	fields.put(field.getName(), field);
 	}
-	
+
 	private void getActivityLabelDisplayField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq, Map<String, FieldVTwo> fields) {				
+			VitroRequest vreq, Map<String, FieldVTwo> fields) {
 		FieldVTwo field = new FieldVTwo();
-		
+
 		String fieldName = "activityLabelDisplay";
-    	field.setName(fieldName);    	
-    	
+    	field.setName(fieldName);
+
     	//get range data type uri and range language
-        String stringDatatypeUri = XSD.xstring.toString();        
+        String stringDatatypeUri = XSD.xstring.toString();
     	field.setRangeDatatypeUri(stringDatatypeUri);
-    	    	
-    	fields.put(field.getName(), field);	
+
+    	fields.put(field.getName(), field);
 	}
 
 	//type of "right side" of role, i.e. type of activity from role roleIn activity
@@ -679,21 +679,21 @@ private void getRoleActivityTypeField(
 			Map<String, FieldVTwo> fields) throws Exception {
 		String fieldName = "roleActivityType";
 		//get range data type uri and range language
-		
+
 		FieldVTwo field = new FieldVTwo();
-    	field.setName(fieldName);    	
-    	
+    	field.setName(fieldName);
+
     	List<String> validators = new ArrayList<String>();
     	if(isAddMode(vreq) || isRepairMode(vreq)) {
     		validators.add("nonempty");
     	}
     	field.setValidators(validators);
-    	
+
     	field.setOptions( getRoleActivityFieldOptions(vreq) );
-    	
-//    	field.setOptionsType(getRoleActivityTypeOptionsType().toString());    	
-//    	field.setObjectClassUri(getRoleActivityTypeObjectClassUri(vreq));    	    	
-//    	
+
+//    	field.setOptionsType(getRoleActivityTypeOptionsType().toString());
+//    	field.setObjectClassUri(getRoleActivityTypeObjectClassUri(vreq));
+//
 //    	HashMap<String, String> literalOptionsMap = getRoleActivityTypeLiteralOptions();
 //    	List<List<String>> fieldLiteralOptions = new ArrayList<List<String>>();
 //    	Set<String> optionUris = literalOptionsMap.keySet();
@@ -704,84 +704,84 @@ private void getRoleActivityTypeField(
 //    		fieldLiteralOptions.add(uriLabelArray);
 //    	}
 //    	field.setLiteralOptions(fieldLiteralOptions);
-    	
+
     	fields.put(field.getName(), field);
-		
-	}    
-	
+
+	}
+
 
 
     //Assuming URI for activity for role?
 	private void getExistingRoleActivityField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
 		String fieldName = "existingRoleActivity";
-		
+
 		FieldVTwo field = new FieldVTwo();
-    	field.setName(fieldName);    	
-    	    	       	
-    	fields.put(field.getName(), field);	
+    	field.setName(fieldName);
+
+    	fields.put(field.getName(), field);
 	}
-	
+
 	private void getRoleLabelField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
 		String fieldName = "roleLabel";
-		
+
 		FieldVTwo field = new FieldVTwo();
-    	field.setName(fieldName);  
-    	
+    	field.setName(fieldName);
+
     	String stringDatatypeUri = XSD.xstring.toString();
         field.setRangeDatatypeUri(stringDatatypeUri);
 
     	List<String> validators = new ArrayList<String>();
     	validators.add("datatype:" + stringDatatypeUri);
-    	field.setValidators(validators);    	    	    	    	
-    	    	
-    	fields.put(field.getName(), field);		
-	}	
+    	field.setValidators(validators);
+
+    	fields.put(field.getName(), field);
+	}
 
 	private void getStartField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
 	    FieldVTwo field = new FieldVTwo();
-	    
-		String fieldName = "startField";		
-    	field.setName(fieldName);    	        	
-    	    	    	    	
+
+		String fieldName = "startField";
+    	field.setName(fieldName);
+
     	field.setEditElement(
-                new DateTimeWithPrecisionVTwo(field, 
+                new DateTimeWithPrecisionVTwo(field,
                         getStartDatePrecision(),
-                        VitroVocabulary.Precision.NONE.uri()));   
-    	
-    	fields.put(field.getName(), field);		
+                        VitroVocabulary.Precision.NONE.uri()));
+
+    	fields.put(field.getName(), field);
 	}
 
 	private void getEndField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
 		FieldVTwo field = new FieldVTwo();
-		
-	    String fieldName = "endField";   
-    	field.setName(fieldName);    	    	    	
+
+	    String fieldName = "endField";
+    	field.setName(fieldName);
 
     	 field.setEditElement(
-                 new DateTimeWithPrecisionVTwo(field, 
+                 new DateTimeWithPrecisionVTwo(field,
                          getEndDatePrecision(),
                          VitroVocabulary.Precision.NONE.uri()));
-    	
-    	fields.put(field.getName(), field);		
+
+    	fields.put(field.getName(), field);
 	}
-       	
+
    private void addPreprocessors(EditConfigurationVTwo editConfiguration, WebappDaoFactory wadf) {
 	   //Add preprocessor that will replace the role to activity predicate and inverse
 	   //with correct properties based on the activity type
 	   editConfiguration.addEditSubmissionPreprocessor(
 			   new RoleToActivityPredicatePreprocessor(editConfiguration, wadf));
-	   
+
 	}
-   
+
     //This has a default value, but note that even that will not be used
     //in the update with realized in or contributes to
     //Overridden when need be in subclassed generator
-	//Also note that for now we're going to actually going to return a 
-	//placeholder value by default	
+	//Also note that for now we're going to actually going to return a
+	//placeholder value by default
 	public String getRoleToActivityPredicate(VitroRequest vreq) {
 	  //TODO: <uri> and ?placeholder are incompatible
 		return getRoleToActivityPlaceholder();
@@ -793,12 +793,12 @@ public String getRoleToActivityPredicate(VitroRequest vreq) {
 	public List<String> getPossibleRoleToActivityPredicates() {
 		return ModelUtils.getPossiblePropertiesForRole();
 	}
-	
+
 	public List<String> getPossibleActivityToRolePredicates() {
 		return ModelUtils.getPossibleInversePropertiesForRole();
 	}
-	
-	/* Methods that check edit mode	 */	
+
+	/* Methods that check edit mode	 */
 	public EditMode getEditMode(VitroRequest vreq) {
 		List<String> roleToGrantPredicates = getPossibleRoleToActivityPredicates();
 		return EditModeUtils.getEditMode(vreq, roleToGrantPredicates);
@@ -807,28 +807,28 @@ public EditMode getEditMode(VitroRequest vreq) {
 	private boolean isAddMode(VitroRequest vreq) {
     	return EditModeUtils.isAddMode(getEditMode(vreq));
     }
-    
+
     private boolean isEditMode(VitroRequest vreq) {
     	return EditModeUtils.isEditMode(getEditMode(vreq));
     }
-    
+
     private boolean isRepairMode(VitroRequest vreq) {
     	return EditModeUtils.isRepairMode(getEditMode(vreq));
     }
-    
+
 	/* URIS for various predicates */
 	private final String VIVO_NS="http://vivoweb.org/ontology/core#";
-	
-	private final String RoleToIntervalURI =  VIVO_NS + "dateTimeInterval";	
-	private final String IntervalTypeURI =    VIVO_NS + "DateTimeInterval";		
-	private final String IntervalToStartURI = VIVO_NS + "start";		
-	private final String IntervalToEndURI =   VIVO_NS + "end";		
-	private final String StartYearPredURI =   VIVO_NS + "startYear";	
+
+	private final String RoleToIntervalURI =  VIVO_NS + "dateTimeInterval";
+	private final String IntervalTypeURI =    VIVO_NS + "DateTimeInterval";
+	private final String IntervalToStartURI = VIVO_NS + "start";
+	private final String IntervalToEndURI =   VIVO_NS + "end";
+	private final String StartYearPredURI =   VIVO_NS + "startYear";
 	private final String EndYearPredURI =     VIVO_NS + "endYear";
-	private final String DateTimeValueTypeURI=VIVO_NS + "DateTimeValue";	
-	private final String DateTimePrecisionURI=VIVO_NS + "dateTimePrecision";	
-	private final String DateTimeValueURI =   VIVO_NS + "dateTime";	
-	
+	private final String DateTimeValueTypeURI=VIVO_NS + "DateTimeValue";
+	private final String DateTimePrecisionURI=VIVO_NS + "dateTimePrecision";
+	private final String DateTimeValueURI =   VIVO_NS + "dateTime";
+
 	//Form specific data
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
@@ -844,7 +844,7 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 		//Put in the fact that we require field
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-		
+
 	public String getFilterRoleToActivityPredicate(String predicateVar) {
 		String addFilter = "FILTER (";
 		List<String> predicates = getPossibleRoleToActivityPredicates();
@@ -856,16 +856,16 @@ public String getFilterRoleToActivityPredicate(String predicateVar) {
 		addFilter += ")";
 		return addFilter;
 	}
-	
+
 	private String getRoleToActivityPlaceholder() {
 		return "?" + getRoleToActivityPlaceholderName();
 	}
-	
+
 	private String getRoleToActivityPlaceholderName() {
 		return "roleToActivityPredicate";
 	}
-	
-	
+
+
 	private String getActivityToRolePlaceholder() {
 		return "?activityToRolePredicate";
 	}
@@ -876,9 +876,9 @@ public static enum RoleActivityOptionTypes {
         CHILD_VCLASSES,
         HARDCODED_LITERALS
     };
-    
+
 	private final String N3_PREFIX = "@prefix core: <http://vivoweb.org/ontology/core#> .";
-	
+
 	protected String getStartDatePrecision() {
 	    String precision = VitroVocabulary.Precision.YEAR.uri();
 		return precision;
@@ -888,6 +888,6 @@ protected String getEndDatePrecision() {
 	    String precision = VitroVocabulary.Precision.YEAR.uri();
 		return precision;
 	}
-	
-    
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
index 968b65864c..c1ae96218e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
@@ -6,19 +6,19 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
-public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {	
-    
+public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+
 	private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
 
 	@Override
 	String getTemplate() { return "addServiceProviderRoleToPerson.ftl"; }
 
 	@Override
-	String getRoleType() {	
+	String getRoleType() {
 		return "http://purl.obolibrary.org/obo/ERO_0000012";
-	}	
+	}
 
-	/** Service Provider role involves hard-coded options for the 
+	/** Service Provider role involves hard-coded options for the
 	 * "right side" of the role or activity.	 */
 	@Override
 FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
@@ -74,11 +74,11 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
         "http://purl.org/ontology/bibo/Workshop", "Workshop",
         "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
 }
-	
+
 	@Override
 	boolean isShowRoleLabelField(){return true;}
 
-   /* 
+   /*
     * Use the methods below to change the date/time precision in the
     * custom form associated with this generator. When not used, the
     * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
@@ -94,5 +94,5 @@ public String getEndDatePrecision() {
         String precision = VitroVocabulary.Precision.DAY.uri();
 	    return precision;
     }
-*/    
+*/
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java
index b059f9520d..49dbc9111e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java
@@ -1,55 +1,55 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-
-public class AddTeacherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
-	private static String template = "addTeacherRoleToPerson.ftl";
-	    
-	@Override
-	String getTemplate() {
-		return template;
-	}
-	
-	@Override
-	String getRoleType() {	
-		return "http://vivoweb.org/ontology/core#TeacherRole";
-	}
-	
-	
-	/** Teacher role involves hard-coded options for the "right side" 
-	 * of the role or activity. */
-	@Override
-    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-		return new ConstantFieldOptions(
-          "", "Select one",
-          "http://purl.org/ontology/bibo/Conference", "Conference", 
-          "http://vivoweb.org/ontology/core#Course",  "Course",
-          "http://purl.org/ontology/bibo/Workshop",   "Workshop");		
-	}
-
-	@Override
-	boolean isShowRoleLabelField(){return true;}
-
-   /* 
-    * Use the methods below to change the date/time precision in the
-    * custom form associated with this generator. When not used, the
-    * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
-    * MINUTE, TIME and NONE.
-    */
-/*
-    public String getStartDatePrecision() {
-        String precision = VitroVocabulary.Precision.MONTH.uri();
-	    return precision;
-    }
-
-    public String getEndDatePrecision() {
-        String precision = VitroVocabulary.Precision.DAY.uri();
-	    return precision;
-    }
-*/    
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+
+public class AddTeacherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+
+	private static String template = "addTeacherRoleToPerson.ftl";
+
+	@Override
+	String getTemplate() {
+		return template;
+	}
+
+	@Override
+	String getRoleType() {
+		return "http://vivoweb.org/ontology/core#TeacherRole";
+	}
+
+
+	/** Teacher role involves hard-coded options for the "right side"
+	 * of the role or activity. */
+	@Override
+    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+		return new ConstantFieldOptions(
+          "", "Select one",
+          "http://purl.org/ontology/bibo/Conference", "Conference",
+          "http://vivoweb.org/ontology/core#Course",  "Course",
+          "http://purl.org/ontology/bibo/Workshop",   "Workshop");
+	}
+
+	@Override
+	boolean isShowRoleLabelField(){return true;}
+
+   /*
+    * Use the methods below to change the date/time precision in the
+    * custom form associated with this generator. When not used, the
+    * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
+    * MINUTE, TIME and NONE.
+    */
+/*
+    public String getStartDatePrecision() {
+        String precision = VitroVocabulary.Precision.MONTH.uri();
+	    return precision;
+    }
+
+    public String getEndDatePrecision() {
+        String precision = VitroVocabulary.Precision.DAY.uri();
+	    return precision;
+    }
+*/
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
index 4661793aeb..100df8fca0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
@@ -1,311 +1,311 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.vocabulary.XSD;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
-/**
- * Generates the edit configuration for importing concepts from external
- * search services, e.g. UMLS etc.      
- */
-public class AddUserDefinedConceptGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator {
-	
-	private Log log = LogFactory.getLog(AddUserDefinedConceptGenerator.class);
-	private boolean isObjectPropForm = false;
-	private String subjectUri = null;
-	private String predicateUri = null;
-	private String objectUri = null;
-	private String datapropKeyStr= null;
-	private int dataHash = 0;
-	private DataPropertyStatement dps = null;
-	private String dataLiteral = null;
-	private String template = "addUserDefinedConcept.ftl";
-	private static HashMap<String,String> defaultsForXSDtypes ;
-	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";
-	
-    @Override
-    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
-    	EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
-	  initBasics(editConfiguration, vreq);
-      initPropertyParameters(vreq, session, editConfiguration);
-      initObjectPropForm(editConfiguration, vreq);               
-      
-      editConfiguration.setTemplate(template);
-      
-      setVarNames(editConfiguration);
-    	
-    	//Assumes this is a simple case of subject predicate var
-      editConfiguration.setN3Required(this.generateN3Required(vreq));
-    	    	
-      //n3 optional
-      editConfiguration.setN3Optional(this.generateN3Optional());
-    	
-	//Todo: what do new resources depend on here?
-	//In original form, these variables start off empty
-	editConfiguration.setNewResources(generateNewResources(vreq));
-	//In scope
-	this.setUrisAndLiteralsInScope(editConfiguration, vreq);
-	
-	//on Form
-	this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
-	
-	editConfiguration.setFilesOnForm(new ArrayList<String>());
-    	
-    	//Sparql queries
-    	this.setSparqlQueries(editConfiguration, vreq);
-    	
-    	//set fields
-    	setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq));
-    	
-    
-    	setTemplate(editConfiguration, vreq);
-    	
-    	editConfiguration.addValidator(new AntiXssValidation());
-    	
-        //Add preprocessors
-        addPreprocessors(editConfiguration, vreq.getWebappDaoFactory());
-        //Adding additional data, specifically edit mode
-        addFormSpecificData(editConfiguration, vreq);
-        //One override for basic functionality, changing url pattern
-        //and entity 
-        //Adding term should return to this same page, not the subject
-        //Return takes the page back to the individual form
-        editConfiguration.setUrlPatternToReturnTo(getUrlPatternToReturnTo(vreq));
-    	prepare(vreq, editConfiguration);
-        return editConfiguration;
-    }
-    
- 
-
-	private String getUrlPatternToReturnTo(VitroRequest vreq) {
-		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
-		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-		String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAssociatedConceptGenerator";
-		String editUrl = EditConfigurationUtils.getEditUrlWithoutContext(vreq);
-		return editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) + 
-		"&predicateUri=" + UrlBuilder.urlEncode(predicateUri) + 
-		"&editForm=" + UrlBuilder.urlEncode(generatorName);
-	}
-
-
-
-	private void setVarNames(EditConfigurationVTwo editConfiguration) {
-		  editConfiguration.setVarNameForSubject("subject");
-	      editConfiguration.setVarNameForPredicate("predicate");
-	      editConfiguration.setVarNameForObject("conceptNode");
-	}
-
-	protected void setTemplate(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-    	editConfiguration.setTemplate(template);
-		
-	}
-   
-   
-    
-   /*
-    * N3 Required and Optional Generators as well as supporting methods 
-    */
-	
-	private String getPrefixesString() {
-		//TODO: Include dynamic way of including this
-		return "@prefix core: <http://vivoweb.org/ontology/core#> .";
-	}
-	
-	
-	//Here, the node is typed as a skos concept
-    private List<String> generateN3Required(VitroRequest vreq) {
-    	List<String> n3Required = list(    	            	        
-    	        getPrefixesString() + "\n" +
-    	        "?subject ?predicate ?conceptNode .\n" 
-    	);
-    	List<String> inversePredicate = getInversePredicate(vreq);
-		//Adding inverse predicate if it exists
-		if(inversePredicate.size() > 0) {
-			n3Required.add("?conceptNode <" + inversePredicate.get(0) + "> ?subject .");
-		}
-    	return n3Required;
-    }
-    
-   //Optional b/c user may select an existing SKOS concept
-	private List<String> generateN3Optional() {
-		return list(    
-					"?conceptNode <" + VitroVocabulary.RDF_TYPE + "> <" + SKOSConceptType + "> .\n" + 
-					"?conceptNode <" + label + "> ?conceptLabel ."
-	    	);
-		
-    }
-	
-	
-  
-	
-	/*
-	 * Get new resources
-	 */
-	 private Map<String, String> generateNewResources(VitroRequest vreq) {
-			HashMap<String, String> newResources = new HashMap<String, String>();
-			newResources.put("conceptNode", null);
-			//There are no new resources here, the concept node uri doesn't
-			//get created but already exists, and vocab uri should already exist as well
-			return newResources;
-		}
-    
-
-	
-	
-	/*
-	 * Set URIS and Literals In Scope and on form and supporting methods
-	 */
-    
-    private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
-    	//note that at this point the subject, predicate, and object var parameters have already been processed
-    	//these two were always set when instantiating an edit configuration object from json,
-    	//although the json itself did not specify subject/predicate as part of uris in scope
-    	urisInScope.put(editConfiguration.getVarNameForSubject(), 
-    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
-    			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
-    	//Setting inverse role predicate
-    	urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
-    	
-    	
-    	editConfiguration.setUrisInScope(urisInScope);
-    	//Uris in scope include subject, predicate, and object var
-    	//literals in scope empty initially, usually populated by code in prepare for update
-    	//with existing values for variables
-    	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
-    }
-    
-    private List<String> getInversePredicate(VitroRequest vreq) {
-		List<String> inversePredicateArray = new ArrayList<String>();
-		ObjectProperty op = EditConfigurationUtils.getObjectProperty(vreq);
-		if(op != null && op.getURIInverse() != null) {
-			inversePredicateArray.add(op.getURIInverse());
-		}
-		return inversePredicateArray;
-	}
-
-	//n3 should look as follows
-    //?subject ?predicate ?objectVar 
-    
-    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	List<String> urisOnForm = new ArrayList<String>();
-    	List<String> literalsOnForm = new ArrayList<String>();
-    	//The URI of the node that defines the concept
-    	urisOnForm.add("conceptNode");
-    	editConfiguration.setUrisOnform(urisOnForm);
-    	//In case the user defines a new concept, will add a concept label
-    	literalsOnForm.add("conceptLabel");
-    	editConfiguration.setLiteralsOnForm(literalsOnForm);
-    }
-    
-    
-    /**
-     * Set SPARQL Queries and supporting methods
-     */
-    
-    
-    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	//Sparql queries defining retrieval of literals etc.
-    	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
-    	Map<String, String> urisInScope = new HashMap<String, String>();
-    	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
-    	editConfiguration.setSparqlForExistingLiterals(new HashMap<String, String>());
-    	editConfiguration.setSparqlForExistingUris(new HashMap<String, String>());
-    }
-
-	/**
-	 * 
-	 * Set Fields and supporting methods
-	 */
-	
-	private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
-    	setConceptNodeField(editConfiguration, vreq);
-    	setConceptLabelField(editConfiguration, vreq);
-    }
-    
-	//this field will be hidden and include the concept node URI
-	private void setConceptNodeField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptNode"));		
-	}
-
-
-	private void setConceptLabelField(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		editConfiguration.addField(new FieldVTwo().
-				setName("conceptLabel").
-				setValidators(list("datatype:" + XSD.xstring.toString())).
-				setRangeDatatypeUri(XSD.xstring.toString())
-				);
-	}
-
-
-
-	
-
-	
-    
-   
-    //Add preprocessor
-	
-   private void addPreprocessors(EditConfigurationVTwo editConfiguration, WebappDaoFactory wadf) {
-	   //Will be a completely different type of preprocessor
-	  /*
-	   editConfiguration.addEditSubmissionPreprocessor(
-			   new RoleToActivityPredicatePreprocessor(editConfiguration, wadf));
-	   */
-	}
-     
-   
-	//Form specific data
-	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
-		formSpecificData.put("sparqlForAcFilter", getSparqlForAcFilter(vreq));
-		formSpecificData.put("conceptType", SKOSConceptType);
-		editConfiguration.setFormSpecificData(formSpecificData);
-	}
-	
-	
-	public String getSparqlForAcFilter(VitroRequest vreq) {
-		String subject = EditConfigurationUtils.getSubjectUri(vreq);			
-		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
-		String query = "PREFIX core:<" + vivoCore + "> " + 
-		"SELECT ?conceptNode WHERE { " + 
-			"<" + subject + "> <" + predicate + "> ?conceptNode ." + 
-			"?conceptNode <" + VitroVocabulary.RDF_TYPE + "> <" + SKOSConceptType + "> . }";
-		return query;
-	}
-	
-	//skos concepts can be added for either research areas or subject areas
-	//IF coming in from a different form then can get the predicate here as it will be stored
-	public String getCurrentPredicate(VitroRequest vreq) {
-		return vreq.getParameter("conceptPredicate");
-	}
-	
-	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.vocabulary.XSD;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
+/**
+ * Generates the edit configuration for importing concepts from external
+ * search services, e.g. UMLS etc.
+ */
+public class AddUserDefinedConceptGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator {
+
+	private Log log = LogFactory.getLog(AddUserDefinedConceptGenerator.class);
+	private boolean isObjectPropForm = false;
+	private String subjectUri = null;
+	private String predicateUri = null;
+	private String objectUri = null;
+	private String datapropKeyStr= null;
+	private int dataHash = 0;
+	private DataPropertyStatement dps = null;
+	private String dataLiteral = null;
+	private String template = "addUserDefinedConcept.ftl";
+	private static HashMap<String,String> defaultsForXSDtypes ;
+	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";
+
+    @Override
+    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
+    	EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
+	  initBasics(editConfiguration, vreq);
+      initPropertyParameters(vreq, session, editConfiguration);
+      initObjectPropForm(editConfiguration, vreq);
+
+      editConfiguration.setTemplate(template);
+
+      setVarNames(editConfiguration);
+
+    	//Assumes this is a simple case of subject predicate var
+      editConfiguration.setN3Required(this.generateN3Required(vreq));
+
+      //n3 optional
+      editConfiguration.setN3Optional(this.generateN3Optional());
+
+	//Todo: what do new resources depend on here?
+	//In original form, these variables start off empty
+	editConfiguration.setNewResources(generateNewResources(vreq));
+	//In scope
+	this.setUrisAndLiteralsInScope(editConfiguration, vreq);
+
+	//on Form
+	this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
+
+	editConfiguration.setFilesOnForm(new ArrayList<String>());
+
+    	//Sparql queries
+    	this.setSparqlQueries(editConfiguration, vreq);
+
+    	//set fields
+    	setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq));
+
+
+    	setTemplate(editConfiguration, vreq);
+
+    	editConfiguration.addValidator(new AntiXssValidation());
+
+        //Add preprocessors
+        addPreprocessors(editConfiguration, vreq.getWebappDaoFactory());
+        //Adding additional data, specifically edit mode
+        addFormSpecificData(editConfiguration, vreq);
+        //One override for basic functionality, changing url pattern
+        //and entity
+        //Adding term should return to this same page, not the subject
+        //Return takes the page back to the individual form
+        editConfiguration.setUrlPatternToReturnTo(getUrlPatternToReturnTo(vreq));
+    	prepare(vreq, editConfiguration);
+        return editConfiguration;
+    }
+
+
+
+	private String getUrlPatternToReturnTo(VitroRequest vreq) {
+		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
+		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+		String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAssociatedConceptGenerator";
+		String editUrl = EditConfigurationUtils.getEditUrlWithoutContext(vreq);
+		return editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) +
+		"&predicateUri=" + UrlBuilder.urlEncode(predicateUri) +
+		"&editForm=" + UrlBuilder.urlEncode(generatorName);
+	}
+
+
+
+	private void setVarNames(EditConfigurationVTwo editConfiguration) {
+		  editConfiguration.setVarNameForSubject("subject");
+	      editConfiguration.setVarNameForPredicate("predicate");
+	      editConfiguration.setVarNameForObject("conceptNode");
+	}
+
+	protected void setTemplate(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+    	editConfiguration.setTemplate(template);
+
+	}
+
+
+
+   /*
+    * N3 Required and Optional Generators as well as supporting methods
+    */
+
+	private String getPrefixesString() {
+		//TODO: Include dynamic way of including this
+		return "@prefix core: <http://vivoweb.org/ontology/core#> .";
+	}
+
+
+	//Here, the node is typed as a skos concept
+    private List<String> generateN3Required(VitroRequest vreq) {
+    	List<String> n3Required = list(
+    	        getPrefixesString() + "\n" +
+    	        "?subject ?predicate ?conceptNode .\n"
+    	);
+    	List<String> inversePredicate = getInversePredicate(vreq);
+		//Adding inverse predicate if it exists
+		if(inversePredicate.size() > 0) {
+			n3Required.add("?conceptNode <" + inversePredicate.get(0) + "> ?subject .");
+		}
+    	return n3Required;
+    }
+
+   //Optional b/c user may select an existing SKOS concept
+	private List<String> generateN3Optional() {
+		return list(
+					"?conceptNode <" + VitroVocabulary.RDF_TYPE + "> <" + SKOSConceptType + "> .\n" +
+					"?conceptNode <" + label + "> ?conceptLabel ."
+	    	);
+
+    }
+
+
+
+
+	/*
+	 * Get new resources
+	 */
+	 private Map<String, String> generateNewResources(VitroRequest vreq) {
+			HashMap<String, String> newResources = new HashMap<String, String>();
+			newResources.put("conceptNode", null);
+			//There are no new resources here, the concept node uri doesn't
+			//get created but already exists, and vocab uri should already exist as well
+			return newResources;
+		}
+
+
+
+
+	/*
+	 * Set URIS and Literals In Scope and on form and supporting methods
+	 */
+
+    private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
+    	//note that at this point the subject, predicate, and object var parameters have already been processed
+    	//these two were always set when instantiating an edit configuration object from json,
+    	//although the json itself did not specify subject/predicate as part of uris in scope
+    	urisInScope.put(editConfiguration.getVarNameForSubject(),
+    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
+    	urisInScope.put(editConfiguration.getVarNameForPredicate(),
+    			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
+    	//Setting inverse role predicate
+    	urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
+
+
+    	editConfiguration.setUrisInScope(urisInScope);
+    	//Uris in scope include subject, predicate, and object var
+    	//literals in scope empty initially, usually populated by code in prepare for update
+    	//with existing values for variables
+    	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
+    }
+
+    private List<String> getInversePredicate(VitroRequest vreq) {
+		List<String> inversePredicateArray = new ArrayList<String>();
+		ObjectProperty op = EditConfigurationUtils.getObjectProperty(vreq);
+		if(op != null && op.getURIInverse() != null) {
+			inversePredicateArray.add(op.getURIInverse());
+		}
+		return inversePredicateArray;
+	}
+
+	//n3 should look as follows
+    //?subject ?predicate ?objectVar
+
+    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	List<String> urisOnForm = new ArrayList<String>();
+    	List<String> literalsOnForm = new ArrayList<String>();
+    	//The URI of the node that defines the concept
+    	urisOnForm.add("conceptNode");
+    	editConfiguration.setUrisOnform(urisOnForm);
+    	//In case the user defines a new concept, will add a concept label
+    	literalsOnForm.add("conceptLabel");
+    	editConfiguration.setLiteralsOnForm(literalsOnForm);
+    }
+
+
+    /**
+     * Set SPARQL Queries and supporting methods
+     */
+
+
+    private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	//Sparql queries defining retrieval of literals etc.
+    	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
+    	Map<String, String> urisInScope = new HashMap<String, String>();
+    	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
+    	editConfiguration.setSparqlForExistingLiterals(new HashMap<String, String>());
+    	editConfiguration.setSparqlForExistingUris(new HashMap<String, String>());
+    }
+
+	/**
+	 *
+	 * Set Fields and supporting methods
+	 */
+
+	private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
+    	setConceptNodeField(editConfiguration, vreq);
+    	setConceptLabelField(editConfiguration, vreq);
+    }
+
+	//this field will be hidden and include the concept node URI
+	private void setConceptNodeField(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptNode"));
+	}
+
+
+	private void setConceptLabelField(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		editConfiguration.addField(new FieldVTwo().
+				setName("conceptLabel").
+				setValidators(list("datatype:" + XSD.xstring.toString())).
+				setRangeDatatypeUri(XSD.xstring.toString())
+				);
+	}
+
+
+
+
+
+
+
+
+    //Add preprocessor
+
+   private void addPreprocessors(EditConfigurationVTwo editConfiguration, WebappDaoFactory wadf) {
+	   //Will be a completely different type of preprocessor
+	  /*
+	   editConfiguration.addEditSubmissionPreprocessor(
+			   new RoleToActivityPredicatePreprocessor(editConfiguration, wadf));
+	   */
+	}
+
+
+	//Form specific data
+	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
+		formSpecificData.put("sparqlForAcFilter", getSparqlForAcFilter(vreq));
+		formSpecificData.put("conceptType", SKOSConceptType);
+		editConfiguration.setFormSpecificData(formSpecificData);
+	}
+
+
+	public String getSparqlForAcFilter(VitroRequest vreq) {
+		String subject = EditConfigurationUtils.getSubjectUri(vreq);
+		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
+		String query = "PREFIX core:<" + vivoCore + "> " +
+		"SELECT ?conceptNode WHERE { " +
+			"<" + subject + "> <" + predicate + "> ?conceptNode ." +
+			"?conceptNode <" + VitroVocabulary.RDF_TYPE + "> <" + SKOSConceptType + "> . }";
+		return query;
+	}
+
+	//skos concepts can be added for either research areas or subject areas
+	//IF coming in from a different form then can get the predicate here as it will be stored
+	public String getCurrentPredicate(VitroRequest vreq) {
+		return vreq.getParameter("conceptPredicate");
+	}
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java
index d73a7d0e72..065af47017 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java
@@ -1,67 +1,67 @@
-
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.HashMap;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-
-/**
- * Generates the edit configuration for a default property form.
- *
- */
-public class AutocompleteDataPropertyFormGenerator extends DefaultDataPropertyFormGenerator {
-
-	//The only thing that changes here are the templates
-	private Log log = LogFactory.getLog(AutocompleteObjectPropertyFormGenerator.class);
-	private String dataPropertyTemplate = "autoCompleteDataPropForm.ftl";
-	
-
-	@Override
-	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
-		EditConfigurationVTwo ec = super.getEditConfiguration(vreq, session);
-		this.addFormSpecificData(ec, vreq);
-		return ec;
-	}
-	
-	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
-		//Filter setting - i.e. sparql query for filtering out results from autocomplete
-		formSpecificData.put("sparqlForAcFilter", getSparqlForAcFilter(vreq));
-		editConfiguration.setTemplate(dataPropertyTemplate);
-		//Add edit model
-		formSpecificData.put("editMode", getEditMode(vreq));
-		editConfiguration.setFormSpecificData(formSpecificData);
-	}
-	
-	public String getSparqlForAcFilter(VitroRequest vreq) {
-		String subject = EditConfigurationUtils.getSubjectUri(vreq);			
-		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
-		//Get all objects for existing predicate, filters out results from addition and edit
-		String query =  "SELECT ?dataLiteral WHERE { " + 
-			"<" + subject + "> <" + predicate + "> ?dataLiteral .} ";
-		return query;
-	}
-	
-	//Get edit mode
-	public String getEditMode(VitroRequest vreq) {
-       if(isUpdate(vreq)) 
-    	   return "edit";
-        else
-    	   return "add";
-	}
-	
-	private boolean isUpdate(VitroRequest vreq) {
-		Integer dataHash = EditConfigurationUtils.getDataHash(vreq);
-		return ( dataHash != null );
-	}
-	
-}
+
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.HashMap;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+
+/**
+ * Generates the edit configuration for a default property form.
+ *
+ */
+public class AutocompleteDataPropertyFormGenerator extends DefaultDataPropertyFormGenerator {
+
+	//The only thing that changes here are the templates
+	private Log log = LogFactory.getLog(AutocompleteObjectPropertyFormGenerator.class);
+	private String dataPropertyTemplate = "autoCompleteDataPropForm.ftl";
+
+
+	@Override
+	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
+		EditConfigurationVTwo ec = super.getEditConfiguration(vreq, session);
+		this.addFormSpecificData(ec, vreq);
+		return ec;
+	}
+
+	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
+		//Filter setting - i.e. sparql query for filtering out results from autocomplete
+		formSpecificData.put("sparqlForAcFilter", getSparqlForAcFilter(vreq));
+		editConfiguration.setTemplate(dataPropertyTemplate);
+		//Add edit model
+		formSpecificData.put("editMode", getEditMode(vreq));
+		editConfiguration.setFormSpecificData(formSpecificData);
+	}
+
+	public String getSparqlForAcFilter(VitroRequest vreq) {
+		String subject = EditConfigurationUtils.getSubjectUri(vreq);
+		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
+		//Get all objects for existing predicate, filters out results from addition and edit
+		String query =  "SELECT ?dataLiteral WHERE { " +
+			"<" + subject + "> <" + predicate + "> ?dataLiteral .} ";
+		return query;
+	}
+
+	//Get edit mode
+	public String getEditMode(VitroRequest vreq) {
+       if(isUpdate(vreq))
+    	   return "edit";
+        else
+    	   return "add";
+	}
+
+	private boolean isUpdate(VitroRequest vreq) {
+		Integer dataHash = EditConfigurationUtils.getDataHash(vreq);
+		return ( dataHash != null );
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java
index f83bd860cb..5dadb7f8b9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java
@@ -16,42 +16,42 @@
 
 public class GrantAdministeredByGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
-    
+
     public GrantAdministeredByGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("grantAdministeredBy.ftl");
-        
+
         conf.setVarNameForSubject("grant");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("adminRole");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewAdminRole) );
-        conf.setN3Optional( Arrays.asList( n3ForNewAdminOrganization, 
+        conf.setN3Optional( Arrays.asList( n3ForNewAdminOrganization,
                                            n3ForExistingAdminOrganization ) );
-        
+
         conf.addNewResource("newOrganization", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("adminRole", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
+
         conf.setUrisOnform(Arrays.asList("existingOrganization"));
         conf.setLiteralsOnForm(Arrays.asList("orgLabel", "orgLabelDisplay" ));
-        
-        conf.addSparqlForExistingLiteral("orgLabel", orgLabelQuery);       
+
+        conf.addSparqlForExistingLiteral("orgLabel", orgLabelQuery);
         conf.addSparqlForExistingUris("existingOrganization", existingOrganizationQuery);
-        
+
 
         conf.addField( new FieldVTwo(). // options will be added in browser by auto complete JS
                 setName("existingOrganization")
-        );        
+        );
 
         conf.addField( new FieldVTwo().
                 setName("orgLabel").
@@ -67,7 +67,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new AutocompleteRequiredInputValidator("existingOrganization", "orgLabel"));
-        
+
 //        addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
@@ -75,29 +75,29 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
     /* N3 assertions  */
 
-    final static String n3ForNewAdminRole = 
-        "@prefix vivo: <" + vivoCore + "> . \n" +   
+    final static String n3ForNewAdminRole =
+        "@prefix vivo: <" + vivoCore + "> . \n" +
         "?grant vivo:relates  ?adminRole . \n" +
-        "?adminRole a  vivo:AdministratorRole . \n" +              
-        "?adminRole vivo:relatedBy ?grant . " ;    
-    
-    final static String n3ForNewAdminOrganization  =      
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+        "?adminRole a  vivo:AdministratorRole . \n" +
+        "?adminRole vivo:relatedBy ?grant . " ;
+
+    final static String n3ForNewAdminOrganization  =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?adminRole <http://purl.obolibrary.org/obo/RO_0000052> ?newOrganization . \n" +
         "?newOrganization a <http://xmlns.com/foaf/0.1/Organization>  . \n" +
         "?newOrganization <http://purl.obolibrary.org/obo/RO_0000053> ?adminRole . \n" +
         "?newOrganization vivo:relatedBy ?grant . \n" +
         "?grant vivo:relates ?newOrganization . \n" +
         "?newOrganization <"+ label + "> ?orgLabel .";
-    
-    final static String n3ForExistingAdminOrganization  =      
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+
+    final static String n3ForExistingAdminOrganization  =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?adminRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingOrganization . \n" +
         "?existingOrganization a <http://xmlns.com/foaf/0.1/Organization>  . \n" +
         "?existingOrganization <http://purl.obolibrary.org/obo/RO_0000053> ?adminRole . " +
         "?existingOrganization vivo:relatedBy ?grant . \n" +
         "?grant vivo:relates ?existingOrganization . \n" ;
-    
+
     /* Queries for editing an existing entry */
 
     final static String existingOrganizationQuery =
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java
index e1ac2f79ef..fc6ed23472 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java
@@ -20,35 +20,35 @@
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
 
-public class GrantHasContributorGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator{            
+public class GrantHasContributorGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator{
 
 	// NOTE:  This generator is for contract as well as grants.
     //TODO: can we get rid of the session and get it form the vreq?
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
- 
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-                
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("grantHasContributor.ftl");
-        
+
         conf.setVarNameForSubject("subject");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("theRole");
-                
+
         conf.setN3Required( Arrays.asList( n3ForNewProjectRole, roleTypeAssertion ) );
         conf.setN3Optional(Arrays.asList( n3ForNewPerson, n3ForExistingPerson, firstNameAssertion, lastNameAssertion ) );
-        
+
         conf.addNewResource("theRole", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newPerson",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardPerson", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardName", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform( Arrays.asList( "existingPerson", "roleType"));
         conf.setLiteralsOnForm( Arrays.asList("personLabel", "personLabelDisplay", "firstName", "lastName"));
 
@@ -56,12 +56,12 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 
         conf.addSparqlForExistingUris("existingPerson", existingPersonQuery);
 		conf.addSparqlForExistingUris("roleType", roleTypeQuery);
-                        
+
         conf.addField( new FieldVTwo().
                 setName("existingPerson")
-                //options will be added in browser by auto complete JS  
-                );        
-        
+                //options will be added in browser by auto complete JS
+                );
+
         conf.addField( new FieldVTwo().
                 setName("personLabel").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
@@ -82,27 +82,27 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
                 setRangeDatatypeUri(XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString()) )
                 );
-		
+
 		conf.addField( new FieldVTwo().
 	            setName("roleType").
 	            setValidators( list("nonempty") ).
-	               setOptions( 
+	               setOptions(
 	                        new ChildVClassesWithParent("http://vivoweb.org/ontology/core#ResearcherRole")));
 
-	    
+
         //Add validator
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new FirstAndLastNameValidator("existingPerson"));
-        
+
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
     }
-    
+
     /* N3 assertions for working with educational training */
-    
-    final static String n3ForNewProjectRole =       
+
+    final static String n3ForNewProjectRole =
         "@prefix core: <"+ vivoCore +"> .\n" +
 		"@prefix rdfs: <"+ rdfs +">  . \n"+
         "?subject core:relates  ?theRole .\n" +
@@ -111,7 +111,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 	final static String roleTypeAssertion =
 	    "?theRole a ?roleType .";
 
-    final static String n3ForNewPerson  =      
+    final static String n3ForNewPerson  =
         "@prefix core: <"+ vivoCore +"> .\n" +
         "?theRole <http://purl.obolibrary.org/obo/RO_0000052> ?newPerson . \n" +
         "?newPerson <http://purl.obolibrary.org/obo/RO_0000053> ?theRole . \n" +
@@ -120,40 +120,40 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?newPerson a <http://xmlns.com/foaf/0.1/Person> . \n" +
         "?newPerson <"+ label +"> ?personLabel . ";
 
-    final static String n3ForExistingPerson  =      
+    final static String n3ForExistingPerson  =
         "@prefix core: <"+ vivoCore +"> .\n" +
         "?theRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingPerson . \n" +
         "?existingPerson <http://purl.obolibrary.org/obo/RO_0000053> ?theRole . \n" +
         "?subject core:relates ?newPerson . \n" +
         "?newPerson core:relatedBy ?subject . \n" +
         " ";
-    
-    final static String firstNameAssertion  =      
+
+    final static String firstNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
         "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardPerson vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:givenName ?firstName .";
-    
-    final static String lastNameAssertion  =      
+
+    final static String lastNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
         "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardPerson vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:familyName ?lastName .";
 
     /* Queries for editing an existing educational training entry */
 
-    final static String roleTypeQuery = 
+    final static String roleTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "SELECT ?roleType WHERE { \n" + 
+        "SELECT ?roleType WHERE { \n" +
         "  ?theRole vitro:mostSpecificType ?roleType . }";
 
-    final static String existingPersonQuery  =      
+    final static String existingPersonQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPerson WHERE {\n"+
         "?theRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingPerson . \n" +
@@ -161,7 +161,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
 
-    final static String personLabelQuery  =      
+    final static String personLabelQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPersonLabel WHERE {\n"+
         "?theRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingPerson . \n" +
@@ -170,14 +170,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
 
-    
+
   //Adding form specific data such as edit mode
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
 		formSpecificData.put("editMode", getEditMode(vreq).name().toLowerCase());
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
+
 	public EditMode getEditMode(VitroRequest vreq) {
 		List<String> predicates = new ArrayList<String>();
 		predicates.add("http://purl.obolibrary.org/obo/RO_0000053");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
index 71b2385655..7610387c3d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
@@ -46,7 +46,7 @@
 /**
  * This generator is specifically for handling labels for a FOAF Person individual and is an object property form.
  *This allows the page to show all the labels for a particular individual and sets up code
- *enabling the addition of a new label.  Links on the page will allow for removal or editing of a given label. 
+ *enabling the addition of a new label.  Links on the page will allow for removal or editing of a given label.
  */
 public class ManageLabelsForPersonGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
     public static Log log = LogFactory.getLog(ManageLabelsForIndividualGenerator.class);
@@ -68,13 +68,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         //be employed when the 'add' button is used, we will set this is an object property form
         //although label will mean we need to add a data property statement as well
         //URL to return to is the same page once addition is complete
-        initObjectPropForm(config, vreq);  
+        initObjectPropForm(config, vreq);
+
 
-        
         this.setUrlToReturnTo(config, vreq);
 
         config.setSubjectUri(EditConfigurationUtils.getSubjectUri(vreq));
-        
+
         setVarNames(config);
         //config.setDatapropKey( EditConfigurationUtils.getDataHash(vreq) );
         //Add n3, fields, etc. in the case where the user wants to add a label
@@ -86,10 +86,10 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
     	this.setUrisAndLiteralsInScope(config);
         this.setFields(config, vreq, EditConfigurationUtils
 				.getPredicateUri(vreq));
-        
+
         //Get existing labels
         //this.initExistingLabels(config, vreq);
-        
+
         //Add form specific data used to populate template
         addFormSpecificData(config, vreq);
         //This preprocessor handles getting the correct label language and putting the attribute on the label
@@ -97,24 +97,24 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 			   new ManageLabelsForPersonPreprocessor(config));
  	   //This will handle generating the label from the first name, middle, and last names and also make sure to associate
  	   //a language with that label
-       config.addModelChangePreprocessor(new FoafNameToRdfsLabelPreprocessor());        
+       config.addModelChangePreprocessor(new FoafNameToRdfsLabelPreprocessor());
 
         prepare(vreq, config);
         return config;
     }
-    
+
     /**With ISF Changes**/
     //For addition of a label, with ISF changes, the name is now linked to a vcard which  in turn is linked to a "fullname" that then has first/middle/last names
-    
+
     private void addNewResources(EditConfigurationVTwo config) {
     	config.addNewResource("fullName", DEFAULT_NS_FOR_NEW_RESOURCE);
         config.addNewResource("individualVcard", DEFAULT_NS_FOR_NEW_RESOURCE);
     }
-  
+
     private void setUrlToReturnTo(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));		
+		editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));
 	}
-    
+
     private void setVarNames(EditConfigurationVTwo editConfiguration) {
 		  editConfiguration.setVarNameForSubject("subject");
 	      editConfiguration.setVarNameForPredicate("predicate");
@@ -129,29 +129,29 @@ private List<String> generateN3Required(VitroRequest vreq) {
 
 	private List<String> generateN3Optional(VitroRequest vreq) {
 		List<String> n3Optional = new ArrayList<String>();
-		
-		String personFullNameN3 = this.N3_PREFIX + 
+
+		String personFullNameN3 = this.N3_PREFIX +
 		 "?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-	        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+	        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
 	        "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?subject . \n" +
 	        "?individualVcard <http://www.w3.org/2006/vcard/ns#hasName> ?fullName . \n" +
 	        "?fullName a <http://www.w3.org/2006/vcard/ns#Name> .";
-		String personFirstNameN3 =  
+		String personFirstNameN3 =
 	        "?fullName <http://www.w3.org/2006/vcard/ns#givenName> ?firstName . ";
-		String personLastNameN3 = 
+		String personLastNameN3 =
 	        "?fullName <http://www.w3.org/2006/vcard/ns#familyName> ?lastName .";
 		String personMiddleNameN3 = "?subject <http://vivoweb.org/ontology/core#middleName> ?middleName .";
   		n3Optional.add(personFullNameN3 + "\n " + personFirstNameN3 + "\n " + personLastNameN3);
 		n3Optional.add(personMiddleNameN3);
 		return n3Optional;
 	}
-	
-	
-	
+
+
+
 	private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
     	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
     	editConfiguration.setFields(fields);
-    	
+
     	editConfiguration.addField(new FieldVTwo(
     			).setName("newLabelLanguage"));
     	//no validators since all of this is optional
@@ -161,41 +161,41 @@ private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vre
     	        setValidators(getFirstNameValidators(vreq, editConfiguration)));
     	editConfiguration.addField(new FieldVTwo().
                 setName("middleName").
-                setValidators(getMiddleNameValidators(vreq, editConfiguration)));  
-    	
+                setValidators(getMiddleNameValidators(vreq, editConfiguration)));
+
     	editConfiguration.addField(new FieldVTwo().
                 setName("lastName").
-                setValidators(getLastNameValidators(vreq, editConfiguration)));    
-    	
+                setValidators(getLastNameValidators(vreq, editConfiguration)));
+
     	//With ISF Changes, also include middle name
-    	
+
     }
-    
+
 	//first and last name have validators if is person is true
     private List<String> getFirstNameValidators(VitroRequest vreq, EditConfigurationVTwo config) {
 		List<String> validators = new ArrayList<String>();
 			validators.add("nonempty");
-		
+
 		return validators;
 	}
-    
+
     private List<String> getMiddleNameValidators(VitroRequest vreq, EditConfigurationVTwo config) {
 		List<String> validators = new ArrayList<String>();
-		
+
 		return validators;
 	}
 
 	private List<String> getLastNameValidators(VitroRequest vreq, EditConfigurationVTwo config) {
 		List<String> validators = new ArrayList<String>();
 			validators.add("nonempty");
-		
+
 		return validators;
 	}
 
-	
-    
 
-    
+
+
+
 	private void setUrisAndLiteralsOnForm(EditConfigurationVTwo config,
 			VitroRequest vreq) {
 		List<String> literalsOnForm = new ArrayList<String>();
@@ -205,29 +205,29 @@ private void setUrisAndLiteralsOnForm(EditConfigurationVTwo config,
 		literalsOnForm.add("lastName");
 		literalsOnForm.add("middleName");
 		config.setLiteralsOnForm(literalsOnForm);
-		
+
 	}
 
 
 	private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration) {
     	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
     	//note that at this point the subject, predicate, and object var parameters have already been processed
-    	urisInScope.put(editConfiguration.getVarNameForSubject(), 
+    	urisInScope.put(editConfiguration.getVarNameForSubject(),
     			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
+    	urisInScope.put(editConfiguration.getVarNameForPredicate(),
     			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
     	editConfiguration.setUrisInScope(urisInScope);
     	//Uris in scope include subject, predicate, and object var
-    	
+
     	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
     }
-	
+
 	private void initExistingLabels(EditConfigurationVTwo config,
 			VitroRequest vreq) {
 		this.existingLabelLiterals = this.getExistingLabels(config.getSubjectUri(), vreq);
-		
+
 	}
-    
+
 
 	private List<String> getExistingSortedLanguageNamesList() {
 		HashSet<String> existingLanguages = new HashSet<String>();
@@ -258,7 +258,7 @@ private void addFormSpecificData(EditConfigurationVTwo config,
 		//Get available locales for the drop down for adding a new label, also sorted by language name
 		HashSet<String> existingLanguageNames = new HashSet<String>(existingLabelsByLanguageName.keySet());
 		List<HashMap<String, String>> availableLocalesForAdd = getAvailableLocales(locales, existingLanguageNames);
-		
+
 
 		//Save all locales
 		 config.addFormSpecificData("selectLocaleFullList", locales);
@@ -266,27 +266,27 @@ private void addFormSpecificData(EditConfigurationVTwo config,
 		 config.addFormSpecificData("labelsSortedByLanguageName", existingLabelsByLanguageName);
 		 config.addFormSpecificData("selectLocale",availableLocalesForAdd);
 		 config.addFormSpecificData("displayRemoveLink", (numberExistingLabels > 1));
-      
-		
+
+
         //How do we edit? Will need to see
-        config.addFormSpecificData("deleteWebpageUrl", "/edit/primitiveDelete");              
+        config.addFormSpecificData("deleteWebpageUrl", "/edit/primitiveDelete");
+
 
-      
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(config.getSubjectUri());
         if( subject != null && subject.getName() != null ){
             config.addFormSpecificData("subjectName", subject.getName());
         }else{
             config.addFormSpecificData("subjectName", null);
         }
-        
+
   		config.addFormSpecificData("isPersonType", "true");
   		//Include whether or not editable to enable edit/remove links and add to show up
   		config.addFormSpecificData("editable", isEditable(vreq, config));
 	}
-	
 
 
-	//Based on what locales have already been selected for labels, return a list of 
+
+	//Based on what locales have already been selected for labels, return a list of
 	//locales for which new labels can be added and have these sorted by the name of the language
 	private List<HashMap<String, String>> getAvailableLocales(List<HashMap<String, String>> allLocales,
 			HashSet<String> existingLabelsLanguageNames) {
@@ -309,7 +309,7 @@ public int compare(HashMap<String, String> h1, HashMap<String, String> h2) {
                 return languageName1.compareTo(languageName2);
             }
         });
-		
+
 		return availableLocales;
 	}
 
@@ -319,7 +319,7 @@ private Object isEditable(VitroRequest vreq, EditConfigurationVTwo config) {
 		AddDataPropertyStatement adps = new AddDataPropertyStatement(
 				vreq.getJenaOntModel(), individual.getURI(),
 				SOME_URI, SOME_LITERAL);
-	
+
 		AddObjectPropertyStatement aops = new AddObjectPropertyStatement(
 				vreq.getJenaOntModel(), individual.getURI(),
 				SOME_PREDICATE, SOME_URI);
@@ -331,7 +331,7 @@ private Object isEditable(VitroRequest vreq, EditConfigurationVTwo config) {
 	public String getFOAFPersonClassURI() {
 		return "http://xmlns.com/foaf/0.1/Person";
 	}
-	
+
 	public boolean isPersonType(VitroRequest vreq, EditConfigurationVTwo config) {
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 		Boolean isPersonType = Boolean.FALSE;
@@ -344,11 +344,11 @@ public boolean isPersonType(VitroRequest vreq, EditConfigurationVTwo config) {
 	    			isPersonType = Boolean.TRUE;
 	    			break;
 	    		}
-	    	}    	
+	    	}
 	    }
 	    return isPersonType;
 	}
-	
+
 	//how to get the type of the individual in question
 	public List<VClass> getVClasses(EditConfigurationVTwo config, VitroRequest vreq) {
 		Individual subject = EditConfigurationUtils.getIndividual(vreq, config.getSubjectUri());
@@ -365,7 +365,7 @@ private HashMap<String, List<LabelInformation>> getLabelsSortedByLanguageName(Li
 		prop.setURI(propertyUri);
 		//Iterate through the labels and create a hashmap
 		HashMap<String, List<LabelInformation>> labelsHash= new HashMap<String, List<LabelInformation>>();
-		
+
 		for(Literal l: labels) {
 			String languageTag = l.getLanguage();
 			String languageName = "";
@@ -377,7 +377,7 @@ else if(localeCodeToNameMap.containsKey(languageTag)) {
 			} else {
 				log.warn("This language tag " + languageTag + " does not have corresponding name in the system and was not processed");
 			}
-			
+
 			if(!StringUtils.isEmpty(languageName)) {
 				if(!labelsHash.containsKey(languageName)) {
 					labelsHash.put(languageName, new ArrayList<LabelInformation>());
@@ -386,14 +386,14 @@ else if(localeCodeToNameMap.containsKey(languageTag)) {
 				//This should put the label in the list
 				//Create label information instance with the required information
 				//To generate link
-				
+
 				DataPropertyStatementTemplateModel dpstm = new DataPropertyStatementTemplateModel(subjectUri, prop, l,
 			            template, vreq);
 				labelsList.add(new LabelInformation(
 						l, dpstm.getEditUrl(), dpstm.getDeleteUrl(), languageTag, languageName));
 			}
 		}
-		
+
 		//Sort each label list
 		LabelInformationComparator lic = new LabelInformationComparator();
 		for(String languageName: labelsHash.keySet()) {
@@ -401,12 +401,12 @@ else if(localeCodeToNameMap.containsKey(languageTag)) {
 			labelInfo.sort(lic);
 		}
 		return labelsHash;
-		
+
 	}
-	
-	
+
+
 	public static class LabelInformationComparator implements Comparator<LabelInformation> {
-		
+
 		public int compare(LabelInformation l1, LabelInformation l2) {
 			return l1.getLabelStringValue().compareTo(l2.getLabelStringValue());
 		}
@@ -418,8 +418,8 @@ public int compare(LabelInformation l1, LabelInformation l2) {
 	        + "SELECT DISTINCT ?label WHERE { \n"
 	        + "    ?subject rdfs:label ?label \n"
 	        + "} ORDER BY ?label";
-	    
-	       
+
+
     private ArrayList<Literal>  getExistingLabels(String subjectUri, VitroRequest vreq) {
         String queryStr = QueryUtils.subUriForQueryVar(LABEL_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
@@ -431,31 +431,31 @@ private ArrayList<Literal>  getExistingLabels(String subjectUri, VitroRequest vr
             while (results.hasNext()) {
                 QuerySolution soln = results.nextSolution();
                 Literal nodeLiteral = soln.get("label").asLiteral();
-                labels.add(nodeLiteral); 
+                labels.add(nodeLiteral);
 
 
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
+        }
        return labels;
 }
-	
 
-	
+
+
     //Putting this into a method allows overriding it in subclasses
     protected String getEditForm() {
     	return null;
     	//return AddEditWebpageFormGenerator.class.getName();
     }
-    
-   
+
+
     protected String getTemplate() {
     	return template;
     }
-    
-    
-    
+
+
+
     //get locales
     public List<HashMap<String, String>> getLocales(VitroRequest vreq) {
     	List<Locale> selectables = SelectedLocale.getSelectableLocales(vreq);
@@ -472,27 +472,27 @@ public List<HashMap<String, String>> getLocales(VitroRequest vreq) {
 						+ "': " + e);
 			}
 		}
-		
+
 		return list;
     }
-    
-    
-    
+
+
+
     public HashMap<String, String> getFullCodeToLanguageNameMap(List<HashMap<String, String>> localesList) {
     	HashMap<String, String> codeToLanguageMap = new HashMap<String, String>();
     	for(Map<String, String> locale: localesList) {
     		String code = (String) locale.get("code");
     		String label = (String) locale.get("label");
     		if(!codeToLanguageMap.containsKey(code)) {
-    			codeToLanguageMap.put(code, label); 
-    		} 
+    			codeToLanguageMap.put(code, label);
+    		}
     		else {
-    			log.warn("Language code " + code + " for " + label  + " was not associated in map becayse label already exists");    		
+    			log.warn("Language code " + code + " for " + label  + " was not associated in map becayse label already exists");
     		}
     	}
     	return codeToLanguageMap;
     }
-    
+
     public List<String> getFullLanguagesNamesSortedList(List<Map<String, Object>> localesList) {
     	HashSet<String> languageNamesSet = new HashSet<String>();
     	for(Map<String, Object> locale: localesList) {
@@ -500,13 +500,13 @@ public List<String> getFullLanguagesNamesSortedList(List<Map<String, Object>> lo
     		if(!languageNamesSet.contains(label)) {
     			languageNamesSet.add(label);
     		}
-    		
+
     	}
     	List<String> languageNames =  new ArrayList<String>(languageNamesSet);
     	Collections.sort(languageNames);
     	return languageNames;
     }
-    
+
     //copied from locale selection data getter but don't need all this information
     private HashMap<String, String> buildLocaleMap(Locale locale,
 			Locale currentLocale) throws FileNotFoundException {
@@ -516,14 +516,14 @@ private HashMap<String, String> buildLocaleMap(Locale locale,
 		map.put("label", locale.getDisplayName(currentLocale));
 		return map;
 	}
-    
+
     //Class used to store the information needed for the template, such as the labels, their languages, their edit links
     public class LabelInformation {
     	private Literal labelLiteral = null;
     	private String editLinkURL;
     	private String deleteLinkURL;
     	private String languageCode; //languageCode
-    	private String languageName; 
+    	private String languageName;
     	public LabelInformation(Literal inputLiteral, String inputEditLinkURL, String inputDeleteLinkURL, String inputLanguageCode, String inputLanguageName) {
     		this.labelLiteral = inputLiteral;
     		this.editLinkURL = inputEditLinkURL;
@@ -531,32 +531,32 @@ public LabelInformation(Literal inputLiteral, String inputEditLinkURL, String in
     		this.languageCode = inputLanguageCode;
     		this.languageName = inputLanguageName;
     	}
-    	
-    	
+
+
     	public Literal getLabelLiteral() {
     		return this.labelLiteral;
     	}
-    	
+
     	public String getLabelStringValue() {
     		return this.labelLiteral.getString();
     	}
-    	
+
     	public String getEditLinkURL() {
     		return this.editLinkURL;
     	}
-    	
+
     	public String getDeleteLinkURL() {
     		return this.deleteLinkURL;
     	}
     	public String getLanguageCode() {
     		return this.languageCode;
     	}
-    	
+
     	public String getLanguageName() {
     		return this.languageName;
     	}
     }
-    
+
 	private String N3_PREFIX = "@prefix foaf: <http://xmlns.com/foaf/0.1/> .\n";
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
index 2e2a29617c..1c43cfa1c9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
@@ -31,13 +31,13 @@
  * This is an odd controller that is just drawing a page with links on it.
  * It is not an example of the normal use of the RDF editing system and
  * was just migrated over from an odd use of the JSP RDF editing system
- * during the 1.4 release. 
- * 
+ * during the 1.4 release.
+ *
  * This mainly sets up pageData for the template to use.
  */
 public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
     public static Log log = LogFactory.getLog(ManageWebpagesForIndividualGenerator.class);
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
 
@@ -55,8 +55,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         config.addFormSpecificData("webpages",webpages);
 
         config.addFormSpecificData("rankPredicate", "http://vivoweb.org/ontology/core#rank" );
-        config.addFormSpecificData("reorderUrl", "/edit/reorder" );       
-        config.addFormSpecificData("deleteWebpageUrl", "/edit/primitiveDelete");              
+        config.addFormSpecificData("reorderUrl", "/edit/reorder" );
+        config.addFormSpecificData("deleteWebpageUrl", "/edit/primitiveDelete");
 
         ParamMap paramMap = new ParamMap();
         paramMap.put("subjectUri", config.getSubjectUri());
@@ -64,7 +64,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         paramMap.put("view", "form");
         String path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap);
 
-        config.addFormSpecificData("baseEditWebpageUrl", path);                 
+        config.addFormSpecificData("baseEditWebpageUrl", path);
 
         //Also add domainUri and rangeUri if they exist, adding here instead of template
         String domainUri = (String) vreq.getParameter("domainUri");
@@ -82,7 +82,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         }
         path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap);
 
-        config.addFormSpecificData("showAddFormUrl", path);          
+        config.addFormSpecificData("showAddFormUrl", path);
 
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(config.getSubjectUri());
         if( subject != null && subject.getName() != null ){
@@ -162,10 +162,10 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         + "    OPTIONAL { ?link core:rank ?rank } \n"
         + "    OPTIONAL { ?link vitro:mostSpecificType ?type } \n"
         + "    OPTIONAL { ?type rdfs:label ?typeLabel } \n"
-        + "} GROUP BY ?rank ?vcard ?link ?url ?typeLabel \n" 
+        + "} GROUP BY ?rank ?vcard ?link ?url ?typeLabel \n"
     	+ "  ORDER BY ?rank";
-    
-       
+
+
     private List<Map<String, String>> getWebpages(String subjectUri, VitroRequest vreq) {
         RDFService rdfService = vreq.getRDFService();
 
@@ -195,20 +195,20 @@ private List<Map<String, String>> getWebpages(String subjectUri, VitroRequest vr
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
+        }
         log.debug("webpages = " + webpages);
         return webpages;
     }
-    
+
     //Putting this into a method allows overriding it in subclasses
     protected String getEditForm() {
     	return AddEditWebpageFormGenerator.class.getName();
     }
-    
+
     protected String getQuery() {
     	return WEBPAGE_QUERY;
     }
-    
+
     protected String getTemplate() {
     	return "manageWebpagesForIndividual.ftl";
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java
index 57fdfc1cef..f7187b0d73 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java
@@ -16,42 +16,42 @@
 
 public class OrganizationAdministersGrantGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
-    
+
     public OrganizationAdministersGrantGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("organizationAdministersGrant.ftl");
-        
+
         conf.setVarNameForSubject("organization");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("adminRole");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewAdminRole) );
-        conf.setN3Optional( Arrays.asList( n3ForNewAdminGrant, 
+        conf.setN3Optional( Arrays.asList( n3ForNewAdminGrant,
                                            n3ForExistingAdminGrant ) );
-        
+
         conf.addNewResource("newGrant", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("adminRole", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
+
         conf.setUrisOnform(Arrays.asList("existingGrant"));
         conf.setLiteralsOnForm(Arrays.asList("grantLabel", "grantLabelDisplay" ));
-        
-        conf.addSparqlForExistingLiteral("grantLabel", grantLabelQuery);       
+
+        conf.addSparqlForExistingLiteral("grantLabel", grantLabelQuery);
         conf.addSparqlForExistingUris("existingGrant", existingGrantQuery);
-        
+
 
         conf.addField( new FieldVTwo(). // options will be added in browser by auto complete JS
                 setName("existingGrant")
-        );        
+        );
 
         conf.addField( new FieldVTwo().
                 setName("grantLabel").
@@ -67,7 +67,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new AutocompleteRequiredInputValidator("existingGrant", "grantLabel"));
-        
+
 //        addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
@@ -75,29 +75,29 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
     /* N3 assertions  */
 
-    final static String n3ForNewAdminRole = 
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+    final static String n3ForNewAdminRole =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?organization <http://purl.obolibrary.org/obo/RO_0000053>  ?adminRole . \n" +
-        "?adminRole a  vivo:AdministratorRole . \n" +              
-        "?adminRole <http://purl.obolibrary.org/obo/RO_0000052> ?organization . " ;    
-    
-    final static String n3ForNewAdminGrant  =      
-        "@prefix vivo: <" + vivoCore + "> . \n" +   
+        "?adminRole a  vivo:AdministratorRole . \n" +
+        "?adminRole <http://purl.obolibrary.org/obo/RO_0000052> ?organization . " ;
+
+    final static String n3ForNewAdminGrant  =
+        "@prefix vivo: <" + vivoCore + "> . \n" +
         "?adminRole vivo:relatedBy ?newGrant . \n" +
         "?newGrant a vivo:Grant  . \n" +
         "?newGrant vivo:relates ?adminRole . \n" +
         "?organization vivo:relatedBy  ?newGrant . \n" +
         "?newGrant vivo:relates ?organization  . \n" +
         "?newGrant <"+ label + "> ?grantLabel .";
-    
-    final static String n3ForExistingAdminGrant  =      
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+
+    final static String n3ForExistingAdminGrant  =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?adminRole vivo:relatedBy ?existingGrant . \n" +
         "?existingGrant a <http://xmlns.com/foaf/0.1/Grant>  . \n" +
         "?existingGrant vivo:relates ?adminRole . \n" +
         "?organization vivo:relatedBy  ?newGrant . \n" +
         "?newGrant vivo:relates ?organization  . " ;
-    
+
     /* Queries for editing an existing entry */
 
     final static String existingGrantQuery =
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
index 8b30e432f9..07a6eca98c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
@@ -23,28 +23,28 @@
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
 
-public class OrganizationForTrainingGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator{            
+public class OrganizationForTrainingGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator{
 
     //TODO: can we get rid of the session and get it form the vreq?
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
- 
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-                
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("organizationForTraining.ftl");
-        
+
         conf.setVarNameForSubject("organization");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("edTraining");
-                
+
         conf.setN3Required( Arrays.asList( n3ForNewEdTraining, trainingTypeAssertion ) );
         conf.setN3Optional(Arrays.asList( majorFieldAssertion,  n3ForAwardedDegree, n3ForNewPerson, n3ForExistingPerson,
-                n3ForNewPersonAwardedDegree, n3ForExistingPersonAwardedDegree, deptAssertion, infoAssertion, n3ForStart, 
+                n3ForNewPersonAwardedDegree, n3ForExistingPersonAwardedDegree, deptAssertion, infoAssertion, n3ForStart,
                 n3ForEnd, firstNameAssertion, lastNameAssertion ));
-        
+
         conf.addNewResource("edTraining", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("awardedDegree",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newPerson",DEFAULT_NS_FOR_NEW_RESOURCE);
@@ -53,10 +53,10 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         conf.addNewResource("endNode",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardPerson", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardName", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform( Arrays.asList( "existingPerson", "degreeType", "trainingType"));
         conf.setLiteralsOnForm( Arrays.asList("personLabel", "personLabelDisplay", "awardedDegreeLabel",
                                               "majorField", "dept", "info", "firstName", "lastName"));
@@ -68,7 +68,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         conf.addSparqlForExistingLiteral("startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
 
-        
+
         conf.addSparqlForExistingUris("awardedDegree", existingAwardedDegreeQuery);
         conf.addSparqlForExistingUris("existingPerson", existingPersonQuery);
         conf.addSparqlForExistingUris("trainingType", trainingTypeQuery);
@@ -80,8 +80,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         conf.addSparqlForExistingUris("endField-precision", existingEndPrecisionQuery);
         //Add sparql to include inverse property as well
         conf.addSparqlForAdditionalUrisInScope("inverseTrainingAtPerson", inverseTrainingAtPersonQuery);
-                        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("degreeType").
                 setOptions( new IndividualsViaVClassOptions(
                         degreeTypeClass)));
@@ -90,16 +90,16 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
                 setName("majorField").
                 setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators(list("datatype:" + XSD.xstring.toString())));
-        
+
         conf.addField( new FieldVTwo().
                 setName("existingPerson")
-                //options will be added in browser by auto complete JS  
-                );        
-        
+                //options will be added in browser by auto complete JS
+                );
+
         conf.addField( new FieldVTwo().
                 setName("awardedDegree")
-                //options will be added in browser by auto complete JS  
-                );        
+                //options will be added in browser by auto complete JS
+                );
 
         conf.addField( new FieldVTwo().
                 setName("personLabel").
@@ -115,11 +115,11 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
                 setName("existingAwardedDegreeLabel").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString())));
-            
+
         conf.addField( new FieldVTwo().
                 setName("personLabelDisplay").
                 setRangeDatatypeUri(XSD.xstring.toString() ));
-                
+
         conf.addField( new FieldVTwo().
                 setName("firstName").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
@@ -135,14 +135,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         conf.addField( new FieldVTwo().
                 setName("trainingType").
                 setValidators( list("nonempty") ).
-                setOptions( 
+                setOptions(
                         new ChildVClassesWithParent(edProcessClass)));
 
         conf.addField( new FieldVTwo().
                 setName("dept").
                 setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators(list("datatype:" + XSD.xstring.toString())));
-                
+
         conf.addField( new FieldVTwo().
                 setName("info").
                 setRangeDatatypeUri( XSD.xstring.toString() ).
@@ -150,33 +150,33 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 
         FieldVTwo startField = new FieldVTwo().
         						setName("startField");
-        conf.addField(startField.                        
+        conf.addField(startField.
             setEditElement(
-                    new DateTimeWithPrecisionVTwo(startField, 
+                    new DateTimeWithPrecisionVTwo(startField,
                     VitroVocabulary.Precision.YEAR.uri(),
                     VitroVocabulary.Precision.NONE.uri())));
-        
+
         FieldVTwo endField = new FieldVTwo().
 								setName("endField");
-        conf.addField( endField.                
+        conf.addField( endField.
                 setEditElement(
-                        new DateTimeWithPrecisionVTwo(endField, 
+                        new DateTimeWithPrecisionVTwo(endField,
                         VitroVocabulary.Precision.YEAR.uri(),
                         VitroVocabulary.Precision.NONE.uri())));
         //Add validator
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new FirstAndLastNameValidator("existingPerson"));
-        
+
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
     }
-    
+
     /* N3 assertions for working with educational training */
-    
-    final static String n3ForNewEdTraining =       
+
+    final static String n3ForNewEdTraining =
         "@prefix core: <"+ vivoCore +"> .\n"+
         "?organization <http://purl.obolibrary.org/obo/RO_0000056>  ?edTraining .\n" +
         "?edTraining  a core:EducationalProcess .\n" +
@@ -185,7 +185,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
     final static String trainingTypeAssertion =
         "?edTraining a ?trainingType .";
 
-    final static String n3ForAwardedDegree  =      
+    final static String n3ForAwardedDegree  =
         "@prefix core: <"+ vivoCore +"> .\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . \n" +
         "?awardedDegree <http://purl.obolibrary.org/obo/RO_0002353> ?edTraining . \n" +
@@ -196,49 +196,49 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?degreeType <http://vivoweb.org/ontology/core#relatedBy> ?awardedDegree . \n"+
         "?awardedDegree a core:AwardedDegree .";
 
-    final static String n3ForNewPerson  =      
+    final static String n3ForNewPerson  =
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?newPerson . \n" +
         "?newPerson <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining . \n" +
         "?newPerson a <http://xmlns.com/foaf/0.1/Person> . \n" +
         "?newPerson <"+ label +"> ?personLabel . ";
 
-    final static String n3ForExistingPerson  =      
+    final static String n3ForExistingPerson  =
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingPerson . \n" +
         "?existingPerson <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining . \n" +
         " ";
-    
-    final static String n3ForNewPersonAwardedDegree  =      
+
+    final static String n3ForNewPersonAwardedDegree  =
         "?awardedDegree <http://vivoweb.org/ontology/core#relates> ?newPerson . \n" +
         "?newPerson <http://vivoweb.org/ontology/core#releatedBy> ?awardedDegree . \n" +
         "?newPerson a <http://xmlns.com/foaf/0.1/Person> . \n" +
         "?awardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
         "?newPerson <"+ label +"> ?personLabel . ";
 
-    final static String firstNameAssertion  =      
+    final static String firstNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
         "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardPerson vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:givenName ?firstName .";
-    
-    final static String lastNameAssertion  =      
+
+    final static String lastNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
         "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardPerson vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:familyName ?lastName .";
 
-    final static String n3ForExistingPersonAwardedDegree  =      
+    final static String n3ForExistingPersonAwardedDegree  =
         "?awardedDegree <http://vivoweb.org/ontology/core#relates> ?existingPerson . \n" +
         "?existingPerson <http://vivoweb.org/ontology/core#relatedBy> ?awardedDegree . \n" +
         "?awardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . ";
 
-    final static String majorFieldAssertion  =      
+    final static String majorFieldAssertion  =
         "?edTraining <"+ majorFieldPred +"> ?majorField .";
 
     final static String n3ForStart =
@@ -257,24 +257,24 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?endNode  <"+ dateTimeValue +"> ?endField-value .\n"+
         "?endNode  <"+ dateTimePrecision +"> ?endField-precision .";
 
-    final static String deptAssertion  =      
+    final static String deptAssertion  =
         "?edTraining <"+ deptPred +"> ?dept .";
 
-    final static String infoAssertion  =      
+    final static String infoAssertion  =
         "?edTraining <"+ infoPred +"> ?info .";
 
     /* Queries for editing an existing educational training entry */
 
-    final static String existingAwardedDegreeQuery =      
+    final static String existingAwardedDegreeQuery =
         "SELECT ?existingAwardedDegree WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . }\n";
 
-    final static String existingAwardedDegreeLabelQuery =      
+    final static String existingAwardedDegreeLabelQuery =
         "SELECT ?existingAwardedDegreeLabel WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n" +
         "?existingAwardedDegree <"+ label +"> ?existingAwardedDegreeLabel }\n";
 
-    final static String existingPersonQuery  =      
+    final static String existingPersonQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPerson WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingPerson . \n" +
@@ -282,7 +282,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
 
-    final static String personLabelQuery  =      
+    final static String personLabelQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPersonLabel WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingPerson . \n" +
@@ -291,12 +291,12 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
 
-    final static String trainingTypeQuery = 
+    final static String trainingTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "SELECT ?existingTrainingType WHERE { \n" + 
+        "SELECT ?existingTrainingType WHERE { \n" +
         "  ?edTraining vitro:mostSpecificType ?existingTrainingType .  }";
-        
-    final static String degreeTypeQuery  =      
+
+    final static String degreeTypeQuery  =
         "PREFIX core: <"+ vivoCore +"> \n"+
         "SELECT ?existingDegreeType WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n"+
@@ -304,31 +304,31 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingAwardedDegree core:relates ?existingDegreeType .  \n" +
         "?existingDegreeType a core:AcademicDegree }";
 
-    final static String majorFieldQuery  =  
+    final static String majorFieldQuery  =
         "SELECT ?existingMajorField WHERE {\n"+
         "?edTraining <"+ majorFieldPred +"> ?existingMajorField . }";
 
-    final static String deptQuery  =  
+    final static String deptQuery  =
         "SELECT ?existingDept WHERE {\n"+
         "?edTraining <"+ deptPred +"> ?existingDept . }";
 
-    final static String infoQuery  =  
+    final static String infoQuery  =
         "SELECT ?existingInfo WHERE {\n"+
         "?edTraining <"+ infoPred +"> ?existingInfo . }";
 
-    final static String existingIntervalNodeQuery  =  
+    final static String existingIntervalNodeQuery  =
         "SELECT ?existingIntervalNode WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?existingIntervalNode .\n"+
         "?existingIntervalNode <"+ type +"> <"+ intervalType +"> . }";
-     
-    final static String existingStartNodeQuery  =  
+
+    final static String existingStartNodeQuery  =
         "SELECT ?existingStartNode WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
         "?intervalNode <"+ intervalToStart +"> ?existingStartNode . \n"+
         "?existingStartNode <"+ type +"> <"+ dateTimeValueType +"> .}";
 
-    final static String existingStartDateQuery  =  
+    final static String existingStartDateQuery  =
         "SELECT ?existingDateStart WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
@@ -336,7 +336,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?startNode <"+ type +"> <"+ dateTimeValueType +"> .\n"+
         "?startNode <"+ dateTimeValue +"> ?existingDateStart . }";
 
-    final static String existingStartPrecisionQuery  =  
+    final static String existingStartPrecisionQuery  =
         "SELECT ?existingStartPrecision WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
@@ -344,14 +344,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?startNode <"+ type +"> <"+ dateTimeValueType +"> . \n"+
         "?startNode <"+ dateTimePrecision +"> ?existingStartPrecision . }";
 
-    final static String existingEndNodeQuery  =  
+    final static String existingEndNodeQuery  =
         "SELECT ?existingEndNode WHERE { \n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
         "?intervalNode <"+ intervalToEnd +"> ?existingEndNode . \n"+
         "?existingEndNode <"+ type +"> <"+ dateTimeValueType +"> .}";
 
-    final static String existingEndDateQuery  =  
+    final static String existingEndDateQuery  =
         "SELECT ?existingEndDate WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
@@ -359,28 +359,28 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?endNode <"+ type +"> <"+ dateTimeValueType +"> .\n"+
         "?endNode <"+ dateTimeValue +"> ?existingEndDate . }";
 
-    final static String existingEndPrecisionQuery  =  
+    final static String existingEndPrecisionQuery  =
         "SELECT ?existingEndPrecision WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
         "?intervalNode <"+ intervalToEnd +"> ?endNode .\n"+
         "?endNode <"+ type +"> <"+ dateTimeValueType +"> .\n"+
         "?endNode <"+ dateTimePrecision +"> ?existingEndPrecision . }";
-    
+
     //Query for inverse property
     final static String inverseTrainingAtPersonQuery  =
     	  "PREFIX owl:  <http://www.w3.person/2002/07/owl#>"
 			+ " SELECT ?inverseTrainingAtPerson "
 			+ "    WHERE { ?inverseTrainingAtPerson owl:inverseOf <http://vivoweb.org/ontology/core#relates> . } ";
-    
-    
+
+
   //Adding form specific data such as edit mode
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
 		formSpecificData.put("editMode", getEditMode(vreq).name().toLowerCase());
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
+
 	public EditMode getEditMode(VitroRequest vreq) {
 		List<String> predicates = new ArrayList<String>();
 		predicates.add("http://vivoweb.org/ontology/core#relates");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
index c048996e59..2dc592b32a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
@@ -113,7 +113,7 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 			+ "@prefix core: <http://vivoweb.org/ontology/core#> . \n"
 			+ "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . \n"
 			+ "?organization core:relatedBy ?position . \n"
-			+ "?position a core:Position . \n" 
+			+ "?position a core:Position . \n"
 			+ "?position a  ?positionType . \n"
 			+ "?position rdfs:label ?positionTitle . \n"
 			+ "?position core:relates ?organization . ";
@@ -122,7 +122,7 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 			+ "@prefix core: <http://vivoweb.org/ontology/core#> . \n"
 			+ "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . \n"
 			+ "@prefix foaf: <http://xmlns.com/foaf/0.1/> . \n"
-    		+ "?position core:relates ?person . \n" 
+    		+ "?position core:relates ?person . \n"
     		+ "?person core:relatedBy ?position . \n"
     		+ "?person a foaf:Person . \n"
     		+ "?person rdfs:label ?personLabel . ";
@@ -147,7 +147,7 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 
     private static final String N3_EXISTING_PERSON = ""
 			+ "@prefix core: <http://vivoweb.org/ontology/core#> . \n"
-        	+ "?position core:relates ?existingPerson . \n" 
+        	+ "?position core:relates ?existingPerson . \n"
         	+ "?existingPerson core:relatedBy ?position . \n";
 
 	private static final String N3_NEW_START_NODE = ""
@@ -221,7 +221,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 		conf.addField(new FieldVTwo()
 				.setName("positionType")
 				.setValidators(list("nonempty"))
-				.setOptions( 
+				.setOptions(
 				        new ChildVClassesWithParent(URI_POSITION_CLASS))
 				);
 
@@ -260,7 +260,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 		conf.addValidator(new AntiXssValidation());
 		conf.addValidator(new DateTimeIntervalValidationVTwo("startField",
 				"endField"));
-		
+
 		prepare(vreq, conf);
 		return conf;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
index 8d8420894d..21fa93ebe7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
@@ -37,25 +37,25 @@ public class PersonHasAdviseeRelationshipGenerator extends VivoBaseGenerator imp
     final static String dateTimeValueType = vivoCore + "DateTimeValue";
     final static String dateTimeValue = vivoCore + "dateTime";
     final static String dateTimePrecision = vivoCore + "dateTimePrecision";
-    
+
     public PersonHasAdviseeRelationshipGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("personHasAdviseeRelationship.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("adviseeRole");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewAdvisingRelationship,
                                            advisingRelLabelAssertion,
                                            advisingRelTypeAssertion ) );
@@ -66,9 +66,9 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                                            lastNameAssertion,
                                            n3ForExistingSubjAreaAssertion, //relationship to existing subject area
                                            n3ForNewSubjAreaAssertion, //this will include all the new information that needs to be captured
-                                           n3ForStart, 
+                                           n3ForStart,
                                            n3ForEnd ) );
-        
+
         conf.addNewResource("advisingRelationship", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newAdvisor", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardAdvisor", DEFAULT_NS_FOR_NEW_RESOURCE);
@@ -79,19 +79,19 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform(Arrays.asList("advisingRelType", "existingSubjArea", "degree", "existingAdvisor"));
         conf.setLiteralsOnForm(Arrays.asList("advisingRelLabel", "subjAreaLabel", "advisorLabel", "firstName", "lastName", "subjAreaLabelDisplay", "advisorLabelDisplay" ));
-        
+
         conf.addSparqlForExistingLiteral("advisingRelLabel", advisingRelLabelQuery);
         conf.addSparqlForExistingLiteral("advisorLabel", advisorLabelQuery);
         conf.addSparqlForExistingLiteral("subjAreaLabel", subjAreaLabelQuery);
         conf.addSparqlForExistingLiteral("startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
-        
+
         conf.addSparqlForExistingUris("advisingRelType", advisingRelTypeQuery);
         conf.addSparqlForExistingUris("advisingRelationship", existingAdvisingRelQuery);
         conf.addSparqlForExistingUris("advisorRole", existingAdvisorRoleQuery);
@@ -103,8 +103,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addSparqlForExistingUris("endNode", existingEndNodeQuery);
         conf.addSparqlForExistingUris("startField-precision", existingStartPrecisionQuery);
         conf.addSparqlForExistingUris("endField-precision", existingEndPrecisionQuery);
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("advisingRelType").
                 setValidators( list("nonempty") ).
                 setOptions( new ChildVClassesWithParent(advisingRelClass))
@@ -129,8 +129,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 );
 
         conf.addField( new FieldVTwo(). // options set by auto complete JS
-                setName("existingSubjArea") 
-                );             
+                setName("existingSubjArea")
+                );
 
         conf.addField( new FieldVTwo().
                 setName("subjAreaLabel").
@@ -140,13 +140,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
         conf.addField( new FieldVTwo().
                 setName("degree").
-                setOptions( 
+                setOptions(
                     new IndividualsViaVClassOptions(degreeClass))
                 );
 
         conf.addField( new FieldVTwo(). // options set by auto complete JS
-                setName("existingAdvisor")                
-        );                
+                setName("existingAdvisor")
+        );
 
         conf.addField( new FieldVTwo().
                 setName("advisorLabel").
@@ -167,16 +167,16 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 );
 
         conf.addField( new FieldVTwo().setName("startField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
                 );
 
         conf.addField( new FieldVTwo().setName("endField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
@@ -186,98 +186,98 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new FirstAndLastNameValidator("existingAdvisor"));
         addFormSpecificData(conf, vreq);
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewAdvisingRelationship = 
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+    final static String n3ForNewAdvisingRelationship =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?person <http://vivoweb.org/ontology/core#relatedBy>  ?advisingRelationship . \n" +
-        "?advisingRelationship a  <" + advisingRelClass + "> . \n" +              
+        "?advisingRelationship a  <" + advisingRelClass + "> . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?person . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
-        "?adviseeRole a  <" + adviseeRoleClass + "> . \n" +              
+        "?adviseeRole a  <" + adviseeRoleClass + "> . \n" +
         "?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         "?person <http://purl.obolibrary.org/obo/RO_0000053>  ?adviseeRole . \n" +
         "?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052>  ?person . ";
-    
-    final static String advisingRelLabelAssertion  =      
+
+    final static String advisingRelLabelAssertion  =
         "?advisingRelationship <"+ label + "> ?advisingRelLabel .";
-    
-    final static String advisingRelTypeAssertion  =      
+
+    final static String advisingRelTypeAssertion  =
         "?advisingRelationship a ?advisingRelType .";
 
-    final static String n3ForNewAdvisorAssertion  =      
+    final static String n3ForNewAdvisorAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?newAdvisor . \n" +
         "?newAdvisor <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         "?newAdvisor <" + label + "> ?advisorLabel . \n" +
         "?newAdvisor a <" + advisorClass + ">  . \n" +
         "?newAdvisor <http://purl.obolibrary.org/obo/RO_0000053>  ?advisorRole . \n" +
         "?advisorRole <http://purl.obolibrary.org/obo/RO_0000052>  ?newAdvisor . \n" +
-        "?advisorRole a  <" + advisorRoleClass + "> . \n" +              
+        "?advisorRole a  <" + advisorRoleClass + "> . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         "?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
-    
-    final static String n3ForExistingAdvisorAssertion  =      
+
+    final static String n3ForExistingAdvisorAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisor . \n" +
         "?existingAdvisor <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         "?existingAdvisor <http://purl.obolibrary.org/obo/RO_0000053>  ?advisorRole . \n" +
         "?advisorRole <http://purl.obolibrary.org/obo/RO_0000052>  ?existingAdvisor . \n" +
-        "?advisorRole a  <" + advisorRoleClass + "> . \n" +              
+        "?advisorRole a  <" + advisorRoleClass + "> . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         "?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
-    
-    final static String firstNameAssertion  =      
+
+    final static String firstNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newAdvisor <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardAdvisor . \n" +
         "?vcardAdvisor <http://purl.obolibrary.org/obo/ARG_2000029>  ?newAdvisor . \n" +
-        "?vcardAdvisor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardAdvisor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardAdvisor vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:givenName ?firstName .";
-    
-    final static String lastNameAssertion  =      
+
+    final static String lastNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newAdvisor <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardAdvisor . \n" +
         "?vcardAdvisor <http://purl.obolibrary.org/obo/ARG_2000029>  ?newAdvisor . \n" +
-        "?vcardAdvisor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardAdvisor a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardAdvisor vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:familyName ?lastName .";
-    
-    final static String degreeAssertion  =      
+
+    final static String degreeAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#degreeCandidacy> ?degree . \n" +
         " ";
 
     //This is for an existing subject area
     //Where we only need the existing subject area label
-    final static String n3ForExistingSubjAreaAssertion  =      
+    final static String n3ForExistingSubjAreaAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?existingSubjArea . \n" +
-        "?existingSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . ";   
+        "?existingSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . ";
     //For new subject area, we include all new information
     //new subject area should always be a new resource
-    //and the following should only get evaluated 
+    //and the following should only get evaluated
     //when there is something in the label
-    
-    final static String n3ForNewSubjAreaAssertion  =   
-    	"?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?newSubjArea . \n" + 
-	    "?newSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . \n" + 
-        "?newSubjArea <"+ label + "> ?subjAreaLabel . \n" + 
-        "?newSubjArea a <" + subjAreaClass + "> . ";    
+
+    final static String n3ForNewSubjAreaAssertion  =
+    	"?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?newSubjArea . \n" +
+	    "?newSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . \n" +
+        "?newSubjArea <"+ label + "> ?subjAreaLabel . \n" +
+        "?newSubjArea a <" + subjAreaClass + "> . ";
 
     final static String n3ForStart =
-        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +    
+        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
-        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +    
+        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode  <" + dateTimeValue + "> ?startField-value . \n" +
         "?startNode  <" + dateTimePrecision + "> ?startField-precision . \n";
-    
+
     final static String n3ForEnd =
-        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +    
+        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
         "?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n" +
@@ -286,7 +286,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
     /* Queries for editing an existing entry */
 
-    final static String existingAdvisingRelQuery  =      
+    final static String existingAdvisingRelQuery  =
         "SELECT ?advisingRelationship WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
@@ -297,7 +297,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "SELECT ?advisingRelType WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
-        " ?advisingRelationship vitro:mostSpecificType ?advisingRelType . \n" + 
+        " ?advisingRelationship vitro:mostSpecificType ?advisingRelType . \n" +
         "}";
 
     final static String advisingRelLabelQuery =
@@ -307,7 +307,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?advisingRelationship <"  + label + "> ?existingAdvisingRelLabel . \n" +
         "}";
 
-    final static String advisorQuery  =      
+    final static String advisorQuery  =
         "SELECT ?existingAdvisor WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
@@ -330,13 +330,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingAdvisorRole a <" + advisorRoleClass + ">  . \n" +
         "}";
 
-    final static String existingAdvisorRoleQuery  =      
+    final static String existingAdvisorRoleQuery  =
         "SELECT ?existingAdvisorRole WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisorRole . \n" +
         " ?existingAdvisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
-        " ?existingAdvisorRole a  <" + advisorRoleClass + "> . \n" +              
+        " ?existingAdvisorRole a  <" + advisorRoleClass + "> . \n" +
         "}";
 
     final static String subjAreaQuery =
@@ -348,7 +348,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
         "}";
 
-    final static String subjAreaLabelQuery  =      
+    final static String subjAreaLabelQuery  =
         "SELECT ?existingSubjAreaLabel WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
@@ -358,14 +358,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
         "}";
 
-    final static String degreeQuery  =  
+    final static String degreeQuery  =
         "SELECT ?existingDegree WHERE {\n"+
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#degreeCandidacy> ?existingDegree . \n" +
         " ?existingDegree a  <" + degreeClass + "> . \n" +
         "}";
-        
+
     final static String existingStartDateQuery =
         "SELECT ?existingDateStart WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
@@ -375,7 +375,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "  ?startNode a <" + dateTimeValueType +"> . \n" +
         "  ?startNode <" + dateTimeValue + "> ?existingDateStart . }";
-    
+
     final static String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
@@ -387,48 +387,48 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?endNode <" + dateTimeValue + "> ?existingEndDate . }";
 
     final static String existingIntervalNodeQuery =
-        "SELECT ?existingIntervalNode WHERE { \n" + 
+        "SELECT ?existingIntervalNode WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?existingIntervalNode . \n" +
         "  ?existingIntervalNode a <" + intervalType + "> . }";
 
-    final static String existingStartNodeQuery = 
+    final static String existingStartNodeQuery =
         "SELECT ?existingStartNode WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + 
+        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
         "  ?existingStartNode a <" + dateTimeValueType + "> .}   ";
 
-    final static String existingEndNodeQuery = 
+    final static String existingEndNodeQuery =
         "SELECT ?existingEndNode WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" + 
-        "  ?existingEndNode a <" + dateTimeValueType + "> } ";              
+        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" +
+        "  ?existingEndNode a <" + dateTimeValueType + "> } ";
 
-    final static String existingStartPrecisionQuery = 
+    final static String existingStartPrecisionQuery =
         "SELECT ?existingStartPrecision WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
-        "  ?startNode a  <" + dateTimeValueType + "> . \n" +           
+        "  ?startNode a  <" + dateTimeValueType + "> . \n" +
         "  ?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
 
-    final static String existingEndPrecisionQuery = 
+    final static String existingEndPrecisionQuery =
         "SELECT ?existingEndPrecision WHERE { \n" +
         " ?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
-        "  ?endNode a <" + dateTimeValueType + "> . \n" +          
+        "  ?endNode a <" + dateTimeValueType + "> . \n" +
         "  ?endNode <" + dateTimePrecision + "> ?existingEndPrecision . }";
 
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
@@ -438,10 +438,10 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 	}
 
 	public String getSparqlForAcFilter(VitroRequest vreq) {
-		String subject = EditConfigurationUtils.getSubjectUri(vreq);			
+		String subject = EditConfigurationUtils.getSubjectUri(vreq);
 		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
 		//Get all objects for existing predicate, filters out results from addition and edit
-		String query =  "SELECT ?objectVar WHERE { " + 
+		String query =  "SELECT ?objectVar WHERE { " +
 			"<" + subject + "> <" + predicate + "> ?objectVar .} ";
 		return query;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
index 184fe17d78..6c22bd4a18 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
@@ -37,25 +37,25 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
     final static String dateTimeValueType = vivoCore + "DateTimeValue";
     final static String dateTimeValue = vivoCore + "dateTime";
     final static String dateTimePrecision = vivoCore + "dateTimePrecision";
-    
+
     public PersonHasAdvisorRelationshipGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("personHasAdvisorRelationship.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("advisorRole");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewAdvisingRelationship,
                                            advisingRelLabelAssertion,
                                            advisingRelTypeAssertion ) );
@@ -66,9 +66,9 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                                            lastNameAssertion,
                                            n3ForExistingSubjAreaAssertion, //relationship to existing subject area
                                            n3ForNewSubjAreaAssertion, //this will include all the new information that needs to be captured
-                                           n3ForStart, 
+                                           n3ForStart,
                                            n3ForEnd ) );
-        
+
         conf.addNewResource("advisingRelationship", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newAdvisee", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardAdvisee", DEFAULT_NS_FOR_NEW_RESOURCE);
@@ -79,19 +79,19 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform(Arrays.asList("advisingRelType", "existingSubjArea", "degree", "existingAdvisee"));
         conf.setLiteralsOnForm(Arrays.asList("advisingRelLabel", "subjAreaLabel", "adviseeLabel", "firstName", "lastName", "subjAreaLabelDisplay", "adviseeLabelDisplay" ));
-        
+
         conf.addSparqlForExistingLiteral("advisingRelLabel", advisingRelLabelQuery);
         conf.addSparqlForExistingLiteral("adviseeLabel", adviseeLabelQuery);
         conf.addSparqlForExistingLiteral("subjAreaLabel", subjAreaLabelQuery);
         conf.addSparqlForExistingLiteral("startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
-        
+
         conf.addSparqlForExistingUris("advisingRelType", advisingRelTypeQuery);
         conf.addSparqlForExistingUris("advisingRelationship", existingAdvisingRelQuery);
         conf.addSparqlForExistingUris("adviseeRole", existingAdviseeRoleQuery);
@@ -103,8 +103,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addSparqlForExistingUris("endNode", existingEndNodeQuery);
         conf.addSparqlForExistingUris("startField-precision", existingStartPrecisionQuery);
         conf.addSparqlForExistingUris("endField-precision", existingEndPrecisionQuery);
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("advisingRelType").
                 setValidators( list("nonempty") ).
                 setOptions( new ChildVClassesWithParent(advisingRelClass))
@@ -129,8 +129,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 );
 
         conf.addField( new FieldVTwo(). // options set by auto complete JS
-                setName("existingSubjArea") 
-                );             
+                setName("existingSubjArea")
+                );
 
         conf.addField( new FieldVTwo().
                 setName("subjAreaLabel").
@@ -140,13 +140,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
         conf.addField( new FieldVTwo().
                 setName("degree").
-                setOptions( 
+                setOptions(
                     new IndividualsViaVClassOptions(degreeClass))
                 );
 
         conf.addField( new FieldVTwo(). // options set by auto complete JS
-                setName("existingAdvisee")                
-        );                
+                setName("existingAdvisee")
+        );
 
         conf.addField( new FieldVTwo().
                 setName("adviseeLabel").
@@ -167,16 +167,16 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 );
 
         conf.addField( new FieldVTwo().setName("startField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
                 );
 
         conf.addField( new FieldVTwo().setName("endField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
@@ -186,98 +186,98 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new FirstAndLastNameValidator("existingAdvisee"));
         addFormSpecificData(conf, vreq);
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewAdvisingRelationship = 
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+    final static String n3ForNewAdvisingRelationship =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?person <http://vivoweb.org/ontology/core#relatedBy>  ?advisingRelationship . \n" +
-        "?advisingRelationship a  <" + advisingRelClass + "> . \n" +              
+        "?advisingRelationship a  <" + advisingRelClass + "> . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?person . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
-        "?advisorRole a  <" + advisorRoleClass + "> . \n" +              
+        "?advisorRole a  <" + advisorRoleClass + "> . \n" +
         "?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         "?person <http://purl.obolibrary.org/obo/RO_0000053>  ?advisorRole . \n" +
         "?advisorRole <http://purl.obolibrary.org/obo/RO_0000052>  ?person . ";
-    
-    final static String advisingRelLabelAssertion  =      
+
+    final static String advisingRelLabelAssertion  =
         "?advisingRelationship <"+ label + "> ?advisingRelLabel .";
-    
-    final static String advisingRelTypeAssertion  =      
+
+    final static String advisingRelTypeAssertion  =
         "?advisingRelationship a ?advisingRelType .";
 
-    final static String n3ForNewAdviseeAssertion  =      
+    final static String n3ForNewAdviseeAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?newAdvisee . \n" +
         "?newAdvisee <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         "?newAdvisee <" + label + "> ?adviseeLabel . \n" +
         "?newAdvisee a <" + adviseeClass + ">  . \n" +
         "?newAdvisee <http://purl.obolibrary.org/obo/RO_0000053>  ?adviseeRole . \n" +
         "?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052>  ?newAdvisee . \n" +
-        "?adviseeRole a  <" + adviseeRoleClass + "> . \n" +              
+        "?adviseeRole a  <" + adviseeRoleClass + "> . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
-    
-    final static String n3ForExistingAdviseeAssertion  =      
+
+    final static String n3ForExistingAdviseeAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisee . \n" +
         "?existingAdvisee <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         "?existingAdvisee <http://purl.obolibrary.org/obo/RO_0000053>  ?adviseeRole . \n" +
         "?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052>  ?existingAdvisee . \n" +
-        "?adviseeRole a  <" + adviseeRoleClass + "> . \n" +              
+        "?adviseeRole a  <" + adviseeRoleClass + "> . \n" +
         "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
         "?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
-    
-    final static String firstNameAssertion  =      
+
+    final static String firstNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newAdvisee <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardAdvisee . \n" +
         "?vcardAdvisee <http://purl.obolibrary.org/obo/ARG_2000029>  ?newAdvisee . \n" +
-        "?vcardAdvisee a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardAdvisee a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardAdvisee vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:givenName ?firstName .";
-    
-    final static String lastNameAssertion  =      
+
+    final static String lastNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newAdvisee <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardAdvisee . \n" +
         "?vcardAdvisee <http://purl.obolibrary.org/obo/ARG_2000029>  ?newAdvisee . \n" +
-        "?vcardAdvisee a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardAdvisee a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardAdvisee vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:familyName ?lastName .";
-    
-    final static String degreeAssertion  =      
+
+    final static String degreeAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#degreeCandidacy> ?degree . \n" +
         " ";
 
     //This is for an existing subject area
     //Where we only need the existing subject area label
-    final static String n3ForExistingSubjAreaAssertion  =      
+    final static String n3ForExistingSubjAreaAssertion  =
         "?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?existingSubjArea . \n" +
-        "?existingSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship";   
+        "?existingSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship";
     //For new subject area, we include all new information
     //new subject area should always be a new resource
-    //and the following should only get evaluated 
+    //and the following should only get evaluated
     //when there is something in the label
-    
-    final static String n3ForNewSubjAreaAssertion  =   
-    	"?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?newSubjArea . \n" + 
-	    "?newSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . \n" + 
-        "?newSubjArea <"+ label + "> ?subjAreaLabel . \n" + 
-        "?newSubjArea a <" + subjAreaClass + "> . ";    
+
+    final static String n3ForNewSubjAreaAssertion  =
+    	"?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?newSubjArea . \n" +
+	    "?newSubjArea <http://vivoweb.org/ontology/core#subjectAreaOf> ?advisingRelationship . \n" +
+        "?newSubjArea <"+ label + "> ?subjAreaLabel . \n" +
+        "?newSubjArea a <" + subjAreaClass + "> . ";
 
     final static String n3ForStart =
-        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +    
+        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
-        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +    
+        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode  <" + dateTimeValue + "> ?startField-value . \n" +
         "?startNode  <" + dateTimePrecision + "> ?startField-precision . \n";
-    
+
     final static String n3ForEnd =
-        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +    
+        "?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
         "?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n" +
@@ -286,7 +286,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
     /* Queries for editing an existing entry */
 
-    final static String existingAdvisingRelQuery  =      
+    final static String existingAdvisingRelQuery  =
         "SELECT ?advisingRelationship WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
@@ -294,10 +294,10 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
     final static String advisingRelTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "SELECT ?advisingRelType WHERE { \n" + 
+        "SELECT ?advisingRelType WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
-        " ?advisingRelationship vitro:mostSpecificType ?advisingRelType . \n" + 
+        " ?advisingRelationship vitro:mostSpecificType ?advisingRelType . \n" +
         "}";
 
     final static String advisingRelLabelQuery =
@@ -307,7 +307,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?advisingRelationship <"  + label + "> ?existingAdvisingRelLabel . \n" +
         "}";
 
-    final static String adviseeQuery  =      
+    final static String adviseeQuery  =
         "SELECT ?existingAdvisee WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
@@ -332,13 +332,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingAdviseeRole a <" + adviseeRoleClass + ">  . \n" +
         "}";
 
-    final static String existingAdviseeRoleQuery  =      
+    final static String existingAdviseeRoleQuery  =
         "SELECT ?existingAdviseeRole WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdviseeRole . \n" +
         " ?existingAdviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
-        " ?existingAdviseeRole a  <" + adviseeRoleClass + "> . \n" +              
+        " ?existingAdviseeRole a  <" + adviseeRoleClass + "> . \n" +
         "}";
 
     final static String subjAreaQuery =
@@ -350,7 +350,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
         "}";
 
-    final static String subjAreaLabelQuery  =      
+    final static String subjAreaLabelQuery  =
         "SELECT ?existingSubjAreaLabel WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
@@ -360,14 +360,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
         "}";
 
-    final static String degreeQuery  =  
+    final static String degreeQuery  =
         "SELECT ?existingDegree WHERE {\n"+
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#degreeCandidacy> ?existingDegree . \n" +
         " ?existingDegree a  <" + degreeClass + "> . \n" +
         "}";
-        
+
     final static String existingStartDateQuery =
         "SELECT ?existingDateStart WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
@@ -377,7 +377,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "  ?startNode a <" + dateTimeValueType +"> . \n" +
         "  ?startNode <" + dateTimeValue + "> ?existingDateStart . }";
-    
+
     final static String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
@@ -389,48 +389,48 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?endNode <" + dateTimeValue + "> ?existingEndDate . }";
 
     final static String existingIntervalNodeQuery =
-        "SELECT ?existingIntervalNode WHERE { \n" + 
+        "SELECT ?existingIntervalNode WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?existingIntervalNode . \n" +
         "  ?existingIntervalNode a <" + intervalType + "> . }";
 
-    final static String existingStartNodeQuery = 
+    final static String existingStartNodeQuery =
         "SELECT ?existingStartNode WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + 
+        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
         "  ?existingStartNode a <" + dateTimeValueType + "> .}   ";
 
-    final static String existingEndNodeQuery = 
+    final static String existingEndNodeQuery =
         "SELECT ?existingEndNode WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" + 
-        "  ?existingEndNode a <" + dateTimeValueType + "> } ";              
+        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" +
+        "  ?existingEndNode a <" + dateTimeValueType + "> } ";
 
-    final static String existingStartPrecisionQuery = 
+    final static String existingStartPrecisionQuery =
         "SELECT ?existingStartPrecision WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
-        "  ?startNode a  <" + dateTimeValueType + "> . \n" +           
+        "  ?startNode a  <" + dateTimeValueType + "> . \n" +
         "  ?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
 
-    final static String existingEndPrecisionQuery = 
+    final static String existingEndPrecisionQuery =
         "SELECT ?existingEndPrecision WHERE { \n" +
         " ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
         " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
         "  ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
-        "  ?endNode a <" + dateTimeValueType + "> . \n" +          
+        "  ?endNode a <" + dateTimeValueType + "> . \n" +
         "  ?endNode <" + dateTimePrecision + "> ?existingEndPrecision . }";
 
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
@@ -440,10 +440,10 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 	}
 
 	public String getSparqlForAcFilter(VitroRequest vreq) {
-		String subject = EditConfigurationUtils.getSubjectUri(vreq);			
+		String subject = EditConfigurationUtils.getSubjectUri(vreq);
 		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
 		//Get all objects for existing predicate, filters out results from addition and edit
-		String query =  "SELECT ?objectVar WHERE { " + 
+		String query =  "SELECT ?objectVar WHERE { " +
 			"<" + subject + "> <" + predicate + "> ?objectVar .} ";
 		return query;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
index 4a79ae921d..ede14f4554 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
@@ -38,38 +38,38 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
     final static String dateTimeValueType = vivoCore + "DateTimeValue";
     final static String dateTimeValue = vivoCore + "dateTime";
     final static String dateTimePrecision = vivoCore + "dateTimePrecision";
-    
+
     public PersonHasAwardOrHonorGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("personHasAwardOrHonor.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("awardReceipt");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewAwardReceipt,
                                            awardReceiptLabelAssertion  ) );
-        conf.setN3Optional( Arrays.asList( n3ForNewAwardAssertion, 
-                                           n3ForExistingAwardAssertion, 
-                                           descriptionAssertion, 
+        conf.setN3Optional( Arrays.asList( n3ForNewAwardAssertion,
+                                           n3ForExistingAwardAssertion,
+                                           descriptionAssertion,
                                            n3ForNewOrgNewAwardAssertion,
                                            n3ForExistingOrgNewAwardAssertion,
                                            n3ForNewOrgExistingAwardAssertion,
                                            n3ForExistingOrgExistingAwardAssertion,
-                                           n3ForYearAwarded, 
-                                           n3ForStart, 
+                                           n3ForYearAwarded,
+                                           n3ForStart,
                                            n3ForEnd ) );
-        
+
         conf.addNewResource("award", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("awardReceipt", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newOrg", DEFAULT_NS_FOR_NEW_RESOURCE);
@@ -77,13 +77,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
-        //literals in scope: none 
-        
+
+        //uris in scope: none
+        //literals in scope: none
+
         conf.setUrisOnform(Arrays.asList("existingAward", "existingOrg"));
         conf.setLiteralsOnForm(Arrays.asList("description", "awardReceiptLabel", "awardLabel", "orgLabel", "yearAwardedDisplay", "orgLabelDisplay", "awardLabelDisplay" ));
-        
+
         conf.addSparqlForExistingLiteral("awardReceiptLabel", awardReceiptLabelQuery);
         conf.addSparqlForExistingLiteral("awardLabel", awardLabelQuery);
         conf.addSparqlForExistingLiteral("orgLabel", orgLabelQuery);
@@ -91,9 +91,9 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addSparqlForExistingLiteral("yearAwarded-value", existingYearAwardedQuery);
         conf.addSparqlForExistingLiteral("startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
-        
+
         conf.addSparqlForExistingUris("existingAward", existingAwardQuery);
-        conf.addSparqlForExistingUris("existingOrg", existingOrgQuery); 
+        conf.addSparqlForExistingUris("existingOrg", existingOrgQuery);
         conf.addSparqlForExistingUris("yearAwardedNode",existingYearAwardedNodeQuery);
         conf.addSparqlForExistingUris("intervalNode",existingIntervalNodeQuery);
         conf.addSparqlForExistingUris("startNode", existingStartNodeQuery);
@@ -101,20 +101,20 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addSparqlForExistingUris("yearAwarded-precision", existingYearAwardedPrecisionQuery);
         conf.addSparqlForExistingUris("startField-precision", existingStartPrecisionQuery);
         conf.addSparqlForExistingUris("endField-precision", existingEndPrecisionQuery);
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("description")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString()) )
                 );
 
         conf.addField( new FieldVTwo(). // options will be added in browser by auto complete JS
-                setName("existingOrg")      
+                setName("existingOrg")
         );
 
         conf.addField( new FieldVTwo(). // options will be added in browser by auto complete JS
                 setName("existingAward")
-        );        
+        );
 
         conf.addField( new FieldVTwo().
                 setName("awardReceiptLabel").
@@ -153,24 +153,24 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 );
 
         conf.addField( new FieldVTwo().setName("yearAwarded").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
                 );
 
         conf.addField( new FieldVTwo().setName("startField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
                 );
 
         conf.addField( new FieldVTwo().setName("endField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
@@ -185,66 +185,66 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
     /* N3 assertions  */
 
-    final static String n3ForNewAwardReceipt = 
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+    final static String n3ForNewAwardReceipt =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?person <" + awardReceiptPred + ">  ?awardReceipt . \n" +
-        "?awardReceipt a  <" + awardReceiptClass + "> . \n" +              
-        "?awardReceipt <" + awardForPred + "> ?person . " ;    
-    
-    final static String awardReceiptLabelAssertion  =      
+        "?awardReceipt a  <" + awardReceiptClass + "> . \n" +
+        "?awardReceipt <" + awardForPred + "> ?person . " ;
+
+    final static String awardReceiptLabelAssertion  =
         "?awardReceipt <"+ label + "> ?awardReceiptLabel .";
-    
-    final static String n3ForNewAwardAssertion  =      
+
+    final static String n3ForNewAwardAssertion  =
         "?awardReceipt <" + receiptOfPred + "> ?award . \n" +
         "?award a <" + awardClass + ">  . \n" +
          "?award <" + receiptPred + "> ?awardReceipt . \n" +
         "?award <"+ label + "> ?awardLabel .";
-    
-    final static String n3ForExistingAwardAssertion  =      
+
+    final static String n3ForExistingAwardAssertion  =
         "?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" +
         "?existingAward <" + receiptPred + "> ?awardReceipt . " ;
-    
-    final static String descriptionAssertion  =      
+
+    final static String descriptionAssertion  =
         "?awardReceipt <"+ descriptionPred +"> ?description .";
 
-    final static String n3ForExistingOrgNewAwardAssertion  =      
+    final static String n3ForExistingOrgNewAwardAssertion  =
         "?awardReceipt <" + awardConferredByPred +"> ?existingOrg . \n" +
         "?existingOrg <" + awardConferredPred + "> ?awardReceipt . \n" +
-        "?award <"+ label + "> ?awardLabel .";    
+        "?award <"+ label + "> ?awardLabel .";
 
-    final static String n3ForExistingOrgExistingAwardAssertion  =      
+    final static String n3ForExistingOrgExistingAwardAssertion  =
         "?awardReceipt <" + awardConferredByPred +"> ?existingOrg . \n" +
-        "?existingOrg <" + awardConferredPred + "> ?awardReceipt . ";    
+        "?existingOrg <" + awardConferredPred + "> ?awardReceipt . ";
 
-    final static String n3ForNewOrgNewAwardAssertion  =      
+    final static String n3ForNewOrgNewAwardAssertion  =
         "?newOrg a <" + orgClass + "> . \n" +
         "?awardReceipt <" + awardConferredByPred +"> ?newOrg . \n" +
         "?newOrg <" + awardConferredPred + "> ?awardReceipt . \n" +
-        "?award <"+ label + "> ?awardLabel . \n" +   
-        "?newOrg <"+ label + "> ?orgLabel .";    
+        "?award <"+ label + "> ?awardLabel . \n" +
+        "?newOrg <"+ label + "> ?orgLabel .";
 
-    final static String n3ForNewOrgExistingAwardAssertion  =      
+    final static String n3ForNewOrgExistingAwardAssertion  =
         "?newOrg a <" + orgClass + "> . \n" +
         "?awardReceipt <" + awardConferredByPred +"> ?newOrg . \n" +
-        "?newOrg <" + awardConferredPred + "> ?awardReceipt . \n" +    
-        "?newOrg <"+ label + "> ?orgLabel .";    
+        "?newOrg <" + awardConferredPred + "> ?awardReceipt . \n" +
+        "?newOrg <"+ label + "> ?orgLabel .";
 
-	final static String n3ForYearAwarded = 
+	final static String n3ForYearAwarded =
         "?awardReceipt <" + yearAwardedPred + "> ?yearAwardedNode . \n" +
         "?yearAwardedNode a <" + dateTimeValueType + "> . \n" +
         "?yearAwardedNode  <" + dateTimeValue + "> ?yearAwarded-value . \n" +
         "?yearAwardedNode  <" + dateTimePrecision + "> ?yearAwarded-precision .";
-        
+
     final static String n3ForStart =
-        "?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +    
+        "?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
-        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +    
+        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode  <" + dateTimeValue + "> ?startField-value . \n" +
         "?startNode  <" + dateTimePrecision + "> ?startField-precision . \n";
-    
+
     final static String n3ForEnd =
-        "?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +    
+        "?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
         "?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n" +
@@ -259,7 +259,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingAward a <" + awardClass + "> . \n" +
         "}";
 
-    final static String existingOrgQuery  =      
+    final static String existingOrgQuery  =
         "SELECT ?existingOrg WHERE { \n" +
         " ?awardReceipt <" + awardConferredByPred + "> ?existingOrg . \n" +
         " ?existingOrg a <" + orgClass + ">  . \n" +
@@ -277,24 +277,24 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingAward <" + label + "> ?existingAwardLabel . \n" +
         "}";
 
-    final static String orgLabelQuery  =      
+    final static String orgLabelQuery  =
         "SELECT ?existingOrgLabel WHERE { \n" +
         " ?awardReceipt <" + awardConferredByPred + "> ?existingOrg . \n" +
         " ?existingOrg a <" + orgClass + ">  . \n" +
         " ?existingOrg <" + label + "> ?existingOrgLabel . \n" +
         "}";
 
-    final static String descriptionQuery  =  
+    final static String descriptionQuery  =
         "SELECT ?existingDescription WHERE {\n"+
         " ?awardReceipt <"+ descriptionPred +"> ?existingDescription . }";
 
-    final static String existingYearAwardedQuery = 
+    final static String existingYearAwardedQuery =
         "SELECT ?existingYearAwardedValue WHERE { \n" +
         "  ?awardReceipt <" + yearAwardedPred + "> ?yearAwardedNode . \n" +
         "  ?yearAwardedNode a <" + dateTimeValueType + "> . \n" +
         "  ?yearAwardedNode <" + dateTimeValue + "> ?existingYearAwardedValue }";
 
-    final static String existingYearAwardedNodeQuery = 
+    final static String existingYearAwardedNodeQuery =
         "SELECT ?existingYearAwardedNode WHERE { \n" +
         "  ?awardReceipt <" + yearAwardedPred + "> ?existingYearAwardedNode . }";
 
@@ -305,7 +305,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "  ?startNode a <" + dateTimeValueType +"> . \n" +
         "  ?startNode <" + dateTimeValue + "> ?existingStartDate . }";
-    
+
     final static String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
         "  ?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +
@@ -315,44 +315,44 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?endNode <" + dateTimeValue + "> ?existingEndDate . }";
 
     final static String existingIntervalNodeQuery =
-        "SELECT ?existingIntervalNode WHERE { \n" + 
+        "SELECT ?existingIntervalNode WHERE { \n" +
         "  ?awardReceipt <" + awardReceiptToInterval + "> ?existingIntervalNode . \n" +
         "  ?existingIntervalNode a <" + intervalType + "> . }";
 
-    final static String existingStartNodeQuery = 
+    final static String existingStartNodeQuery =
         "SELECT ?existingStartNode WHERE { \n" +
         "  ?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + 
+        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
         "  ?existingStartNode a <" + dateTimeValueType + "> . }   ";
 
-    final static String existingEndNodeQuery = 
+    final static String existingEndNodeQuery =
         "SELECT ?existingEndNode WHERE { \n" +
         "  ?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" + 
-        "  ?existingEndNode a <" + dateTimeValueType + "> } ";              
+        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" +
+        "  ?existingEndNode a <" + dateTimeValueType + "> } ";
 
-    final static String existingYearAwardedPrecisionQuery = 
+    final static String existingYearAwardedPrecisionQuery =
         "SELECT ?existingYearAwardedPrecision WHERE { \n" +
         "  ?awardReceipt <" + yearAwardedPred + "> ?yearAwarded . \n" +
-        "  ?yearAwarded a  <" + dateTimeValueType + "> . \n" +           
+        "  ?yearAwarded a  <" + dateTimeValueType + "> . \n" +
         "  ?yearAwarded <" + dateTimePrecision + "> ?existingYearAwardedPrecision . }";
 
-    final static String existingStartPrecisionQuery = 
+    final static String existingStartPrecisionQuery =
         "SELECT ?existingStartPrecision WHERE { \n" +
         "  ?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
-        "  ?startNode a  <" + dateTimeValueType + "> . \n" +           
+        "  ?startNode a  <" + dateTimeValueType + "> . \n" +
         "  ?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
 
-    final static String existingEndPrecisionQuery = 
+    final static String existingEndPrecisionQuery =
         "SELECT ?existingEndPrecision WHERE { \n" +
         "  ?awardReceipt <" + awardReceiptToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
-        "  ?endNode a <" + dateTimeValueType + "> . \n" +          
+        "  ?endNode a <" + dateTimeValueType + "> . \n" +
         "  ?endNode <" + dateTimePrecision + "> ?existingEndPrecision . }";
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
index f1a1a6c98b..876ab4c267 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
@@ -26,60 +26,60 @@
 /**
     Form for adding an educational attainment to an individual
 
-    Classes: 
+    Classes:
     core:EducationalProcess - primary new individual being created
     foaf:Person - existing individual
     foaf:Organization - new or existing individual
     core:AcademicDegree - existing individual
     core:AwardedDegree - new or existing individual
-    
 
-   
-    There are 4 modes that this form can be in: 
-     1.  Add, there is a subject and a predicate but no position and nothing else. 
-           
+
+
+    There are 4 modes that this form can be in:
+     1.  Add, there is a subject and a predicate but no position and nothing else.
+
      2. normal edit where everything should already be filled out.  There is a subject, a object and an individual on
-        the other end of the object's relationship. 
-     
-     3. Repair a bad role node.  There is a subject, prediate and object but there is no individual on the 
+        the other end of the object's relationship.
+
+     3. Repair a bad role node.  There is a subject, prediate and object but there is no individual on the
         other end of the object's  relationship.  This should be similar to an add but the form should be expanded.
-        
+
      4. Really bad node. multiple statements on the other end of the object's  relationship.
 
  * @author bdc34
  *
  */
-public class PersonHasEducationalTraining  extends VivoBaseGenerator implements EditConfigurationGenerator{            
+public class PersonHasEducationalTraining  extends VivoBaseGenerator implements EditConfigurationGenerator{
 
     //TODO: can we get rid of the session and get it form the vreq?
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
- 
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-                
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("personHasEducationalTraining.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("edTraining");
-                
+
         conf.setN3Required( Arrays.asList( n3ForNewEdTraining, trainingTypeAssertion ) );
         conf.setN3Optional(Arrays.asList( majorFieldAssertion,  n3ForAwardedDegree, n3ForNewOrganization, n3ForExistingOrganization,
                 n3ForNewOrgAwardedDegree, n3ForExistingOrgAwardedDegree, deptAssertion, infoAssertion, n3ForStart, n3ForEnd ));
-        
+
         conf.addNewResource("edTraining", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("awardedDegree",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newOrg",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("intervalNode",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode",DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform( Arrays.asList( "existingOrg", "orgType", "degreeType", "trainingType"));
         conf.setLiteralsOnForm( Arrays.asList("orgLabel", "orgLabelDisplay", "awardedDegreeLabel",
                                               "majorField", "dept", "info"));
@@ -92,7 +92,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         conf.addSparqlForExistingLiteral("startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
 
-        
+
         conf.addSparqlForExistingUris("awardedDegree", existingAwardedDegreeQuery);
         conf.addSparqlForExistingUris("existingOrg", existingOrgQuery);
         conf.addSparqlForExistingUris("orgType", orgTypeQuery);
@@ -105,8 +105,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         conf.addSparqlForExistingUris("endField-precision", existingEndPrecisionQuery);
         //Add sparql to include inverse property as well
         conf.addSparqlForAdditionalUrisInScope("inverseTrainingAtOrg", inverseTrainingAtOrgQuery);
-                        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("degreeType").
                 setOptions( new IndividualsViaVClassOptions(
                         degreeTypeClass)));
@@ -115,16 +115,16 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
                 setName("majorField").
                 setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators(list("datatype:" + XSD.xstring.toString())));
-        
+
         conf.addField( new FieldVTwo().
                 setName("existingOrg")
-                //options will be added in browser by auto complete JS  
-                );        
-        
+                //options will be added in browser by auto complete JS
+                );
+
         conf.addField( new FieldVTwo().
                 setName("awardedDegree")
-                //options will be added in browser by auto complete JS  
-                );        
+                //options will be added in browser by auto complete JS
+                );
 
         conf.addField( new FieldVTwo().
                 setName("orgLabel").
@@ -140,28 +140,28 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
                 setName("existingAwardedDegreeLabel").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString())));
-            
+
         conf.addField( new FieldVTwo().
                 setName("orgLabelDisplay").
                 setRangeDatatypeUri(XSD.xstring.toString() ));
-                
+
         conf.addField( new FieldVTwo().
                 setName("orgType").
                 setValidators( list("nonempty")).
                 setOptions( new ChildVClassesOptions(
                         orgClass)));
-                
+
         conf.addField( new FieldVTwo().
                 setName("trainingType").
                 setValidators( list("nonempty") ).
-                setOptions( 
+                setOptions(
                         new ChildVClassesWithParent(edProcessClass)));
 
         conf.addField( new FieldVTwo().
                 setName("dept").
                 setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators(list("datatype:" + XSD.xstring.toString())));
-                
+
         conf.addField( new FieldVTwo().
                 setName("info").
                 setRangeDatatypeUri( XSD.xstring.toString() ).
@@ -169,32 +169,32 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 
         FieldVTwo startField = new FieldVTwo().
         						setName("startField");
-        conf.addField(startField.                        
+        conf.addField(startField.
             setEditElement(
-                    new DateTimeWithPrecisionVTwo(startField, 
+                    new DateTimeWithPrecisionVTwo(startField,
                     VitroVocabulary.Precision.YEAR.uri(),
                     VitroVocabulary.Precision.NONE.uri())));
-        
+
         FieldVTwo endField = new FieldVTwo().
 								setName("endField");
-        conf.addField( endField.                
+        conf.addField( endField.
                 setEditElement(
-                        new DateTimeWithPrecisionVTwo(endField, 
+                        new DateTimeWithPrecisionVTwo(endField,
                         VitroVocabulary.Precision.YEAR.uri(),
                         VitroVocabulary.Precision.NONE.uri())));
         //Add validator
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
-        
+
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
     }
-    
+
     /* N3 assertions for working with educational training */
-    
-    final static String n3ForNewEdTraining =       
+
+    final static String n3ForNewEdTraining =
         "@prefix core: <"+ vivoCore +"> .\n"+
         "?person <http://purl.obolibrary.org/obo/RO_0000056>  ?edTraining .\n" +
         "?edTraining  a core:EducationalProcess .\n" +
@@ -203,7 +203,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
     final static String trainingTypeAssertion =
         "?edTraining a ?trainingType .";
 
-    final static String n3ForAwardedDegree  =      
+    final static String n3ForAwardedDegree  =
         "@prefix core: <"+ vivoCore +"> .\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . \n" +
         "?awardedDegree <http://purl.obolibrary.org/obo/RO_0002353> ?edTraining . \n" +
@@ -214,31 +214,31 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?degreeType <http://vivoweb.org/ontology/core#relatedBy> ?awardedDegree . \n"+
         "?awardedDegree a core:AwardedDegree .";
 
-    final static String n3ForNewOrganization  =      
+    final static String n3ForNewOrganization  =
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?newOrg . \n" +
         "?newOrg <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining . \n" +
         "?newOrg a ?orgType . \n" +
         "?newOrg <"+ label +"> ?orgLabel . ";
 
-    final static String n3ForExistingOrganization  =      
+    final static String n3ForExistingOrganization  =
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingOrg . \n" +
         "?existingOrg <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining . \n" +
         "?existingOrg a ?orgType . ";
-    
-    final static String n3ForNewOrgAwardedDegree  =      
+
+    final static String n3ForNewOrgAwardedDegree  =
         "?awardedDegree <http://vivoweb.org/ontology/core#assignedBy> ?newOrg . \n" +
         "?newOrg <http://vivoweb.org/ontology/core#assigns> ?awardedDegree . \n" +
         "?newOrg a ?orgType . \n" +
         "?awardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
         "?newOrg <"+ label +"> ?orgLabel . ";
 
-    final static String n3ForExistingOrgAwardedDegree  =      
+    final static String n3ForExistingOrgAwardedDegree  =
         "?awardedDegree <http://vivoweb.org/ontology/core#assignedBy> ?existingOrg . \n" +
         "?existingOrg <http://vivoweb.org/ontology/core#assigns> ?awardedDegree . \n" +
         "?awardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
         "?existingOrg a ?orgType . ";
 
-    final static String majorFieldAssertion  =      
+    final static String majorFieldAssertion  =
         "?edTraining <"+ majorFieldPred +"> ?majorField .";
 
     final static String n3ForStart =
@@ -257,24 +257,24 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?endNode  <"+ dateTimeValue +"> ?endField-value .\n"+
         "?endNode  <"+ dateTimePrecision +"> ?endField-precision .";
 
-    final static String deptAssertion  =      
+    final static String deptAssertion  =
         "?edTraining <"+ deptPred +"> ?dept .";
 
-    final static String infoAssertion  =      
+    final static String infoAssertion  =
         "?edTraining <"+ infoPred +"> ?info .";
 
     /* Queries for editing an existing educational training entry */
 
-    final static String existingAwardedDegreeQuery =      
+    final static String existingAwardedDegreeQuery =
         "SELECT ?existingAwardedDegree WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . }\n";
 
-    final static String existingAwardedDegreeLabelQuery =      
+    final static String existingAwardedDegreeLabelQuery =
         "SELECT ?existingAwardedDegreeLabel WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n" +
         "?existingAwardedDegree <"+ label +"> ?existingAwardedDegreeLabel }\n";
 
-    final static String existingOrgQuery  =      
+    final static String existingOrgQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingOrg WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingOrg . \n" +
@@ -282,7 +282,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingOrg a ?existingOrgType . \n " +
         "?existingOrgType rdfs:subClassOf <"+ orgClass +"> . }";
 
-    final static String orgLabelQuery  =      
+    final static String orgLabelQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingOrgLabel WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingOrg . \n" +
@@ -293,7 +293,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
 
     /* Limit type to subclasses of foaf:Organization. Otherwise, sometimes owl:Thing or another
     type is returned and we don't get a match to the select element options. */
-    final static String orgTypeQuery  =      
+    final static String orgTypeQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingOrgType WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingOrg . \n" +
@@ -302,12 +302,12 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingOrgType rdfs:subClassOf <"+ orgClass +"> .\n"+
         "}";
 
-    final static String trainingTypeQuery = 
+    final static String trainingTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "SELECT ?existingTrainingType WHERE { \n" + 
+        "SELECT ?existingTrainingType WHERE { \n" +
         "  ?edTraining vitro:mostSpecificType ?existingTrainingType .  }";
-        
-    final static String degreeTypeQuery  =      
+
+    final static String degreeTypeQuery  =
         "PREFIX core: <"+ vivoCore +"> \n"+
         "SELECT ?existingDegreeType WHERE {\n"+
         "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n"+
@@ -315,31 +315,31 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingAwardedDegree core:relates ?existingDegreeType .  \n" +
         "?existingDegreeType a core:AcademicDegree }";
 
-    final static String majorFieldQuery  =  
+    final static String majorFieldQuery  =
         "SELECT ?existingMajorField WHERE {\n"+
         "?edTraining <"+ majorFieldPred +"> ?existingMajorField . }";
 
-    final static String deptQuery  =  
+    final static String deptQuery  =
         "SELECT ?existingDept WHERE {\n"+
         "?edTraining <"+ deptPred +"> ?existingDept . }";
 
-    final static String infoQuery  =  
+    final static String infoQuery  =
         "SELECT ?existingInfo WHERE {\n"+
         "?edTraining <"+ infoPred +"> ?existingInfo . }";
 
-    final static String existingIntervalNodeQuery  =  
+    final static String existingIntervalNodeQuery  =
         "SELECT ?existingIntervalNode WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?existingIntervalNode .\n"+
         "?existingIntervalNode <"+ type +"> <"+ intervalType +"> . }";
-     
-    final static String existingStartNodeQuery  =  
+
+    final static String existingStartNodeQuery  =
         "SELECT ?existingStartNode WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
         "?intervalNode <"+ intervalToStart +"> ?existingStartNode . \n"+
         "?existingStartNode <"+ type +"> <"+ dateTimeValueType +"> .}";
 
-    final static String existingStartDateQuery  =  
+    final static String existingStartDateQuery  =
         "SELECT ?existingDateStart WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
@@ -347,7 +347,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?startNode <"+ type +"> <"+ dateTimeValueType +"> .\n"+
         "?startNode <"+ dateTimeValue +"> ?existingDateStart . }";
 
-    final static String existingStartPrecisionQuery  =  
+    final static String existingStartPrecisionQuery  =
         "SELECT ?existingStartPrecision WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
@@ -355,14 +355,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?startNode <"+ type +"> <"+ dateTimeValueType +"> . \n"+
         "?startNode <"+ dateTimePrecision +"> ?existingStartPrecision . }";
 
-    final static String existingEndNodeQuery  =  
+    final static String existingEndNodeQuery  =
         "SELECT ?existingEndNode WHERE { \n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
         "?intervalNode <"+ intervalToEnd +"> ?existingEndNode . \n"+
         "?existingEndNode <"+ type +"> <"+ dateTimeValueType +"> .}";
 
-    final static String existingEndDateQuery  =  
+    final static String existingEndDateQuery  =
         "SELECT ?existingEndDate WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
@@ -370,28 +370,28 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?endNode <"+ type +"> <"+ dateTimeValueType +"> .\n"+
         "?endNode <"+ dateTimeValue +"> ?existingEndDate . }";
 
-    final static String existingEndPrecisionQuery  =  
+    final static String existingEndPrecisionQuery  =
         "SELECT ?existingEndPrecision WHERE {\n"+
         "?edTraining <"+ toInterval +"> ?intervalNode .\n"+
         "?intervalNode <"+ type +"> <"+ intervalType +"> .\n"+
         "?intervalNode <"+ intervalToEnd +"> ?endNode .\n"+
         "?endNode <"+ type +"> <"+ dateTimeValueType +"> .\n"+
         "?endNode <"+ dateTimePrecision +"> ?existingEndPrecision . }";
-    
+
     //Query for inverse property
     final static String inverseTrainingAtOrgQuery  =
     	  "PREFIX owl:  <http://www.w3.org/2002/07/owl#>"
 			+ " SELECT ?inverseTrainingAtOrg "
 			+ "    WHERE { ?inverseTrainingAtOrg owl:inverseOf <http://vivoweb.org/ontology/core#relates> . } ";
-    
-    
+
+
   //Adding form specific data such as edit mode
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
 		formSpecificData.put("editMode", getEditMode(vreq).name().toLowerCase());
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
+
 	public EditMode getEditMode(VitroRequest vreq) {
 		List<String> predicates = new ArrayList<String>();
 		predicates.add("http://vivoweb.org/ontology/core#relates");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java
index a5fe505234..0ee5f9552f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java
@@ -21,25 +21,25 @@
 public class PersonHasEmailGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
     private Log log = LogFactory.getLog(PersonHasEmailGenerator.class);
-       
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);  
-        String emailUri = getEmailUri(vreq); 
-        String rangeUri = getRangeUri(vreq); 
-        
+        initObjectPropForm(conf, vreq);
+        String emailUri = getEmailUri(vreq);
+        String rangeUri = getRangeUri(vreq);
+
         conf.setTemplate("personHasEmailAddress.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("individualVcard");
-        
+
         if ( rangeUri.equals("http://www.w3.org/2006/vcard/ns#Work") ) {
             conf.setN3Required( Arrays.asList( n3ForNewPrimaryEmail ) );
         }
@@ -48,12 +48,12 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         }
 
         conf.setN3Optional( Arrays.asList( emailAddressAssertion ) );
-        
+
         conf.addNewResource("email", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("individualVcard", DEFAULT_NS_FOR_NEW_RESOURCE);
-                
+
         conf.setLiteralsOnForm(Arrays.asList("emailAddress" ));
-        
+
         conf.addSparqlForExistingLiteral("emailAddress", emailAddressQuery);
         conf.addSparqlForAdditionalUrisInScope("individualVcard", individualVcardQuery);
 
@@ -63,37 +63,37 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             conf.addUrisInScope(urisInScope);
         }
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("emailAddress")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
-        
+
         conf.addValidator(new AntiXssValidation());
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewEmail = 
+    final static String n3ForNewEmail =
         "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?person . \n" +
         "?individualVcard <http://www.w3.org/2006/vcard/ns#hasEmail> ?email . \n" +
-        "?email a <http://www.w3.org/2006/vcard/ns#Email> . " ;    
-    
-    final static String n3ForNewPrimaryEmail = 
+        "?email a <http://www.w3.org/2006/vcard/ns#Email> . " ;
+
+    final static String n3ForNewPrimaryEmail =
         "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?person . \n" +
         "?individualVcard <http://www.w3.org/2006/vcard/ns#hasEmail> ?email . \n" +
         "?email a <http://www.w3.org/2006/vcard/ns#Email> . \n" +
-        "?email a <http://www.w3.org/2006/vcard/ns#Work> ." ;    
+        "?email a <http://www.w3.org/2006/vcard/ns#Work> ." ;
 
-    final static String emailAddressAssertion  =      
+    final static String emailAddressAssertion  =
         "?email <http://www.w3.org/2006/vcard/ns#email> ?emailAddress .";
-    
+
     /* Queries for editing an existing entry */
 
     final static String individualVcardQuery =
@@ -101,18 +101,18 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?existingIndividualVcard . \n" +
         "}";
 
-    final static String emailAddressQuery  =      
+    final static String emailAddressQuery  =
         "SELECT ?existingEmailAddress WHERE {\n"+
         "?email <http://www.w3.org/2006/vcard/ns#email> ?existingEmailAddress . }";
 
 	private String getRangeUri(VitroRequest vreq) {
-        String rangeUri = vreq.getParameter("rangeUri"); 
-        
+        String rangeUri = vreq.getParameter("rangeUri");
+
 		return rangeUri;
 	}
 	private String getEmailUri(VitroRequest vreq) {
-	    String emailUri = vreq.getParameter("emailUri"); 
-        
+	    String emailUri = vreq.getParameter("emailUri");
+
 		return emailUri;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
index 8c400a7ced..5f412c6a3a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
@@ -33,50 +33,50 @@ public class PersonHasIssuedCredentialGenerator extends VivoBaseGenerator implem
     final static String dateTimeValueType = vivoCore + "DateTimeValue";
     final static String dateTimeValue = vivoCore + "dateTime";
     final static String dateTimePrecision = vivoCore + "dateTimePrecision";
-    
+
     public PersonHasIssuedCredentialGenerator() {}
-    
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("personHasIssuedCredential.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("issuedCredential");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewIssuedCredential, n3ForICTypeAssertion) );
-        conf.setN3Optional( Arrays.asList( n3ForNewCredentialAssertion, 
-                                           n3ForExistingCredentialAssertion, 
-                                           n3ForYearCredentialed, 
-                                           n3ForStart, 
+        conf.setN3Optional( Arrays.asList( n3ForNewCredentialAssertion,
+                                           n3ForExistingCredentialAssertion,
+                                           n3ForYearCredentialed,
+                                           n3ForStart,
                                            n3ForEnd ) );
-        
+
         conf.addNewResource("credential", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("issuedCredential", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("yearCredentialedNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
-        //literals in scope: none 
-        
+
+        //uris in scope: none
+        //literals in scope: none
+
         conf.setUrisOnform(Arrays.asList("existingCredential", "issuedCredentialType", "credentialType"));
         conf.setLiteralsOnForm(Arrays.asList("yearCredentialedDisplay","credentialLabel", "credentialLabelDisplay" ));
-        
+
         conf.addSparqlForExistingLiteral("credentialLabel", credentialLabelQuery);
         conf.addSparqlForExistingLiteral("yearCredentialed-value", existingYearCredentialedQuery);
         conf.addSparqlForExistingLiteral("startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
-        
+
         conf.addSparqlForExistingUris("existingCredential", existingCredentialQuery);
         conf.addSparqlForExistingUris("credentialType", existingCredentialTypeQuery);
         conf.addSparqlForExistingUris("issuedCredentialType", issuedCredentialTypeQuery);
@@ -87,20 +87,20 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addSparqlForExistingUris("yearCredentialed-precision", existingYearCredentialedPrecisionQuery);
         conf.addSparqlForExistingUris("startField-precision", existingStartPrecisionQuery);
         conf.addSparqlForExistingUris("endField-precision", existingEndPrecisionQuery);
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("issuedCredentialType").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString()))
                 );
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("credentialType").
                 setOptions(getCredentialTypeFieldOptions(vreq)));
 
         conf.addField( new FieldVTwo(). // options will be added in browser by auto complete JS
                 setName("existingCredential")
-        );        
+        );
 
         conf.addField( new FieldVTwo().
                 setName("credentialLabel").
@@ -121,24 +121,24 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 );
 
         conf.addField( new FieldVTwo().setName("yearCredentialed").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
                 );
 
         conf.addField( new FieldVTwo().setName("startField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
                 );
 
         conf.addField( new FieldVTwo().setName("endField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                                 )
@@ -147,7 +147,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new AutocompleteRequiredInputValidator("existingCredential", "credentialLabel"));
-        
+
         addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
@@ -155,46 +155,46 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 
     /* N3 assertions  */
 
-    final static String n3ForNewIssuedCredential = 
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+    final static String n3ForNewIssuedCredential =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?person vivo:relatedBy  ?issuedCredential . \n" +
-        "?issuedCredential a  <" + issuedCredentialTypeClass + "> . \n" +              
-        "?issuedCredential vivo:relates ?person . " ;    
-    
-    final static String n3ForICTypeAssertion  =      
+        "?issuedCredential a  <" + issuedCredentialTypeClass + "> . \n" +
+        "?issuedCredential vivo:relates ?person . " ;
+
+    final static String n3ForICTypeAssertion  =
         "?issuedCredential a ?issuedCredentialType .";
-    
-    final static String n3ForNewCredentialAssertion  =      
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+
+    final static String n3ForNewCredentialAssertion  =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?issuedCredential vivo:relates ?credential . \n" +
         "?credential a <" + credentialTypeClass + ">  . \n" +
         "?credential vivo:relatedBy ?issuedCredential . \n" +
         "?credential a ?credentialType . \n" +
         "?credential <"+ label + "> ?credentialLabel .";
-    
-    final static String n3ForExistingCredentialAssertion  =      
-        "@prefix vivo: <" + vivoCore + "> . \n\n" +   
+
+    final static String n3ForExistingCredentialAssertion  =
+        "@prefix vivo: <" + vivoCore + "> . \n\n" +
         "?issuedCredential vivo:relates ?existingCredential . \n" +
 /*        "?existingCredential a <" + credentialTypeClass + ">  . \n" +
         "?existingCredential a ?credentialType . \n" +  */
         "?existingCredential vivo:relatedBy ?issuedCredential . " ;
-    
-	final static String n3ForYearCredentialed = 
+
+	final static String n3ForYearCredentialed =
         "?issuedCredential <" + yearCredentialedPred + "> ?yearCredentialedNode . \n" +
         "?yearCredentialedNode a <" + dateTimeValueType + "> . \n" +
         "?yearCredentialedNode  <" + dateTimeValue + "> ?yearCredentialed-value . \n" +
         "?yearCredentialedNode  <" + dateTimePrecision + "> ?yearCredentialed-precision .";
-        
+
     final static String n3ForStart =
-        "?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +    
+        "?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
-        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +    
+        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode  <" + dateTimeValue + "> ?startField-value . \n" +
         "?startNode  <" + dateTimePrecision + "> ?startField-precision . \n";
-    
+
     final static String n3ForEnd =
-        "?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +    
+        "?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
         "?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n" +
@@ -233,13 +233,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         " ?existingCredential <" + label + "> ?existingCredentialLabel . \n" +
         "}";
 
-    final static String existingYearCredentialedQuery = 
+    final static String existingYearCredentialedQuery =
         "SELECT ?existingYearCredentialedValue WHERE { \n" +
         "  ?issuedCredential <" + yearCredentialedPred + "> ?yearCredentialedNode . \n" +
         "  ?yearCredentialedNode a <" + dateTimeValueType + "> . \n" +
         "  ?yearCredentialedNode <" + dateTimeValue + "> ?existingYearCredentialedValue }";
 
-    final static String existingYearCredentialedNodeQuery = 
+    final static String existingYearCredentialedNodeQuery =
         "SELECT ?existingYearCredentialedNode WHERE { \n" +
         "  ?issuedCredential <" + yearCredentialedPred + "> ?existingYearCredentialedNode . }";
 
@@ -250,7 +250,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "  ?startNode a <" + dateTimeValueType +"> . \n" +
         "  ?startNode <" + dateTimeValue + "> ?existingStartDate . }";
-    
+
     final static String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
         "  ?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +
@@ -260,44 +260,44 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?endNode <" + dateTimeValue + "> ?existingEndDate . }";
 
     final static String existingIntervalNodeQuery =
-        "SELECT ?existingIntervalNode WHERE { \n" + 
+        "SELECT ?existingIntervalNode WHERE { \n" +
         "  ?issuedCredential <" + issuedCredentialToInterval + "> ?existingIntervalNode . \n" +
         "  ?existingIntervalNode a <" + intervalType + "> . }";
 
-    final static String existingStartNodeQuery = 
+    final static String existingStartNodeQuery =
         "SELECT ?existingStartNode WHERE { \n" +
         "  ?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + 
+        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
         "  ?existingStartNode a <" + dateTimeValueType + "> . }   ";
 
-    final static String existingEndNodeQuery = 
+    final static String existingEndNodeQuery =
         "SELECT ?existingEndNode WHERE { \n" +
         "  ?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" + 
-        "  ?existingEndNode a <" + dateTimeValueType + "> } ";              
+        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" +
+        "  ?existingEndNode a <" + dateTimeValueType + "> } ";
 
-    final static String existingYearCredentialedPrecisionQuery = 
+    final static String existingYearCredentialedPrecisionQuery =
         "SELECT ?existingYearCredentialedPrecision WHERE { \n" +
         "  ?issuedCredential <" + yearCredentialedPred + "> ?yearCredentialed . \n" +
-        "  ?yearCredentialed a  <" + dateTimeValueType + "> . \n" +           
+        "  ?yearCredentialed a  <" + dateTimeValueType + "> . \n" +
         "  ?yearCredentialed <" + dateTimePrecision + "> ?existingYearCredentialedPrecision . }";
 
-    final static String existingStartPrecisionQuery = 
+    final static String existingStartPrecisionQuery =
         "SELECT ?existingStartPrecision WHERE { \n" +
         "  ?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
-        "  ?startNode a  <" + dateTimeValueType + "> . \n" +           
+        "  ?startNode a  <" + dateTimeValueType + "> . \n" +
         "  ?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
 
-    final static String existingEndPrecisionQuery = 
+    final static String existingEndPrecisionQuery =
         "SELECT ?existingEndPrecision WHERE { \n" +
         "  ?issuedCredential <" + issuedCredentialToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
-        "  ?endNode a <" + dateTimeValueType + "> . \n" +          
+        "  ?endNode a <" + dateTimeValueType + "> . \n" +
         "  ?endNode <" + dateTimePrecision + "> ?existingEndPrecision . }";
 
     //Form specific data
@@ -306,7 +306,7 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
         formSpecificData.put("credentialTypeMap", getCredentialTypeMap());
         editConfiguration.setFormSpecificData(formSpecificData);
     }
-    
+
     // Issued Credentials relate a Credential to a person. The class type of a Credential and its subclasses
     // are different than -- but correspond to -- the class type of an Issued Credential and its subclasses.
     // When a user picks a type of credential in the GUI, we need to set the corresponding type for the issued
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
index b7c1ffda8b..832f2457be 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
@@ -37,64 +37,64 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
     final static String dateTimeValueType = vivoCore + "DateTimeValue";
     final static String dateTimeValue = vivoCore + "dateTime";
     final static String dateTimePrecision = vivoCore + "dateTimePrecision";
-    
+
     public PersonHasPositionHistoryGenerator() {}
 
-    // There are 4 modes that this form can be in: 
-    //  1. Add. There is a subject and a predicate but no position and 
-    //     nothing else. 
-    //        
-    //  2. Normal edit where everything should already be filled out.  
+    // There are 4 modes that this form can be in:
+    //  1. Add. There is a subject and a predicate but no position and
+    //     nothing else.
+    //
+    //  2. Normal edit where everything should already be filled out.
     //     There is a subject, a object and an individual on
-    //     the other end of the object's core:personInOrganization stmt. 
-    //  
-    //  3. Repair a bad role node.  There is a subject, predicate and object 
-    //     but there is no individual on the other end of the object's 
-    //     core:personInOrganization stmt.  This should be similar to an add 
+    //     the other end of the object's core:personInOrganization stmt.
+    //
+    //  3. Repair a bad role node.  There is a subject, predicate and object
+    //     but there is no individual on the other end of the object's
+    //     core:personInOrganization stmt.  This should be similar to an add
     //     but the form should be expanded.
-    //     
-    //  4. Really bad node. multiple core:personInOrganization statements.   
-    
+    //
+    //  4. Really bad node. multiple core:personInOrganization statements.
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("personHasPositionHistory.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("position");
-        
-        conf.setN3Required( Arrays.asList( n3ForNewPosition, 
-                                           positionTitleAssertion, 
+
+        conf.setN3Required( Arrays.asList( n3ForNewPosition,
+                                           positionTitleAssertion,
                                            positionTypeAssertion ) );
         conf.setN3Optional( Arrays.asList( n3ForNewOrg, n3ForExistingOrg, n3ForStart, n3ForEnd ) );
-        
+
         conf.addNewResource("position", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newOrg", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform(Arrays.asList("existingOrg", "orgType", "positionType"));
         conf.setLiteralsOnForm(Arrays.asList("positionTitle", "orgLabel", "orgLabelDisplay"));
-        
+
         conf.addSparqlForExistingLiteral("orgLabel", orgLabelQuery);
         conf.addSparqlForExistingLiteral("positionTitle", positionTitleQuery);
         conf.addSparqlForExistingLiteral(
                 "startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral(
                 "endField-value", existingEndDateQuery);
-     
+
         conf.addSparqlForExistingUris("existingOrg", existingOrgQuery);
         conf.addSparqlForExistingUris("orgType", orgTypeQuery);
         conf.addSparqlForExistingUris("positionType", positionTypeQuery);
@@ -102,26 +102,26 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
                 "intervalNode", existingIntervalNodeQuery);
         conf.addSparqlForExistingUris("startNode", existingStartNodeQuery);
         conf.addSparqlForExistingUris("endNode", existingEndNodeQuery);
-        conf.addSparqlForExistingUris("startField-precision", 
+        conf.addSparqlForExistingUris("startField-precision",
                 existingStartPrecisionQuery);
-        conf.addSparqlForExistingUris("endField-precision", 
+        conf.addSparqlForExistingUris("endField-precision",
                 existingEndPrecisionQuery);
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("positionTitle")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ) );
-        
+
         conf.addField( new FieldVTwo().
                 setName("positionType").
-                setValidators( list("nonempty") ). 
-                setOptions( 
+                setValidators( list("nonempty") ).
+                setOptions(
                         new ChildVClassesWithParent(positionClass)));
- 
+
 
         conf.addField( new FieldVTwo().
                 setName("existingOrg")); //options set in browser by auto complete JS
-        
+
         conf.addField( new FieldVTwo().
                 setName("orgLabel").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
@@ -130,89 +130,89 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         conf.addField( new FieldVTwo().
                 setName("orgLabelDisplay").
                 setRangeDatatypeUri(XSD.xstring.toString() ) );
-        
+
         conf.addField( new FieldVTwo().
                 setName("orgType").
-                setOptions( 
+                setOptions(
                         new ChildVClassesWithParent(orgClass)));
-        
+
         conf.addField( new FieldVTwo().setName("startField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                               )
                 );
-        
+
         conf.addField( new FieldVTwo().setName("endField").
-                setEditElement( 
-                        new DateTimeWithPrecisionVTwo(null, 
+                setEditElement(
+                        new DateTimeWithPrecisionVTwo(null,
                                 VitroVocabulary.Precision.YEAR.uri(),
                                 VitroVocabulary.Precision.NONE.uri())
                               )
                 );
-        
+
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new AutocompleteRequiredInputValidator("existingOrg", "orgLabel"));
-        
+
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
     }
 
-    final static String n3ForNewPosition = 
-        "@prefix core: <" + vivoCore + "> . \n" +   
+    final static String n3ForNewPosition =
+        "@prefix core: <" + vivoCore + "> . \n" +
         "?person core:relatedBy  ?position . \n" +
-        "?position a  ?positionType . \n" +              
-        "?position core:relates ?person ; ";    
-    
+        "?position a  ?positionType . \n" +
+        "?position core:relates ?person ; ";
+
     final static String positionTitleAssertion =
         "?position <" + label + "> ?positionTitle .";
-    
+
     final static String positionTypeAssertion =
-        "?position a ?positionType .";  
+        "?position a ?positionType .";
 
-    final static String n3ForNewOrg = 
+    final static String n3ForNewOrg =
         "?position <" + positionInOrgPred + "> ?newOrg . \n" +
         "?newOrg <" + orgForPositionPred + "> ?position . \n" +
         "?newOrg <" + label + "> ?orgLabel . \n" +
-        "?newOrg a ?orgType .";    
+        "?newOrg a ?orgType .";
 
-    final static String n3ForExistingOrg = 
+    final static String n3ForExistingOrg =
         "?position <" + positionInOrgPred + "> ?existingOrg . \n" +
         "?existingOrg <" + orgForPositionPred + "> ?position . \n" +
         "?existingOrg a ?orgType .";
-        
+
     final static String n3ForStart =
-        "?position <" + positionToInterval + "> ?intervalNode . \n" +    
+        "?position <" + positionToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
-        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +    
+        "?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode  <" + dateTimeValue + "> ?startField-value . \n" +
         "?startNode  <" + dateTimePrecision + "> ?startField-precision . \n";
-    
+
     final static String n3ForEnd =
-        "?position <" + positionToInterval + "> ?intervalNode . \n" +    
+        "?position <" + positionToInterval + "> ?intervalNode . \n" +
         "?intervalNode a <" + intervalType + "> . \n" +
         "?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n" +
         "?endNode  <" + dateTimeValue + "> ?endField-value . \n" +
         "?endNode  <" + dateTimePrecision + "> ?endField-precision . \n";
-    
-// Queries for existing values 
+
+// Queries for existing values
     final static String orgLabelQuery =
         "SELECT ?existingOrgLabel WHERE { \n" +
         "  ?position <" + positionInOrgPred + "> ?existingOrg . \n" +
         "  ?existingOrg a <" + orgClass + "> . \n" +
         "  ?existingOrg <" + label + "> ?existingOrgLabel . \n" +
         "}";
-    
+
     final static String positionTitleQuery =
         "SELECT ?existingPositionTitle WHERE { \n" +
         "?position <" + label + "> ?existingPositionTitle . }";
-    
+
     final static String existingStartDateQuery =
         "SELECT ?existingDateStart WHERE { \n" +
         "  ?position <" + positionToInterval + "> ?intervalNode . \n" +
@@ -220,7 +220,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
         "  ?startNode a <" + dateTimeValueType +"> . \n" +
         "  ?startNode <" + dateTimeValue + "> ?existingDateStart . }";
-    
+
     final static String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
         "  ?position <" + positionToInterval + "> ?intervalNode . \n" +
@@ -229,60 +229,60 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "  ?endNode a <" + dateTimeValueType + "> . \n" +
         "  ?endNode <" + dateTimeValue + "> ?existingEndDate . }";
 
-    final static String existingOrgQuery = 
+    final static String existingOrgQuery =
         "SELECT ?existingOrg WHERE { \n" +
         "  ?position <" + positionInOrgPred + "> ?existingOrg . \n" +
         "  ?existingOrg a <" + orgClass + ">  }";
-    
-    final static String orgTypeQuery = 
-        "PREFIX rdfs: <" + rdfs + "> \n" +   
+
+    final static String orgTypeQuery =
+        "PREFIX rdfs: <" + rdfs + "> \n" +
         "SELECT ?existingOrgType WHERE { \n" +
         "  ?position <" + positionInOrgPred + "> ?existingOrg . \n" +
         "  ?existingOrg a ?existingOrgType . \n" +
         "  ?existingOrgType rdfs:subClassOf <" + orgClass + "> " +
         "} ";
-    
+
     //Huda: changed this from rdf:type to vitro:mostSpecificType since returning thing
-    final static String positionTypeQuery = 
+    final static String positionTypeQuery =
     	"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
-        "SELECT ?existingPositionType WHERE { \n" + 
+        "SELECT ?existingPositionType WHERE { \n" +
         "  ?position vitro:mostSpecificType ?existingPositionType . }";
-        
+
     final static String existingIntervalNodeQuery =
-        "SELECT ?existingIntervalNode WHERE { \n" + 
+        "SELECT ?existingIntervalNode WHERE { \n" +
         "  ?position <" + positionToInterval + "> ?existingIntervalNode . \n" +
         "  ?existingIntervalNode a <" + intervalType + "> . }";
-    
-    final static String existingStartNodeQuery = 
+
+    final static String existingStartNodeQuery =
         "SELECT ?existingStartNode WHERE { \n" +
         "  ?position <" + positionToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + 
+        "  ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
         "  ?existingStartNode a <" + dateTimeValueType + "> .}   ";
-    
-    final static String existingEndNodeQuery = 
+
+    final static String existingEndNodeQuery =
         "SELECT ?existingEndNode WHERE { \n" +
         "  ?position <" + positionToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
-        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" + 
-        "  ?existingEndNode a <" + dateTimeValueType + "> } ";              
-    
-    final static String existingStartPrecisionQuery = 
+        "  ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" +
+        "  ?existingEndNode a <" + dateTimeValueType + "> } ";
+
+    final static String existingStartPrecisionQuery =
         "SELECT ?existingStartPrecision WHERE { \n" +
         "  ?position <" + positionToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
-        "  ?startNode a  <" + dateTimeValueType + "> . \n" +           
+        "  ?startNode a  <" + dateTimeValueType + "> . \n" +
         "  ?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
-    
-    final static String existingEndPrecisionQuery = 
+
+    final static String existingEndPrecisionQuery =
         "SELECT ?existingEndPrecision WHERE { \n" +
         "  ?position <" + positionToInterval + "> ?intervalNode . \n" +
         "  ?intervalNode a <" + intervalType + "> . \n" +
         "  ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
-        "  ?endNode a <" + dateTimeValueType + "> . \n" +          
+        "  ?endNode a <" + dateTimeValueType + "> . \n" +
         "  ?endNode <" + dateTimePrecision + "> ?existingEndPrecision . }";
-    
+
     //Adding form specific data such as edit mode
   	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
   		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java
index ccc7155139..131c8ff90b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java
@@ -21,64 +21,64 @@
 public class PersonHasPreferredTitleGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
     private Log log = LogFactory.getLog(PersonHasPreferredTitleGenerator.class);
-       
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);  
-        String titleUri = getTitleUri(vreq);  
-        
+        initObjectPropForm(conf, vreq);
+        String titleUri = getTitleUri(vreq);
+
         conf.setTemplate("personHasPreferredTitle.ftl");
-        
+
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("individualVcard");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewPhone ) );
         conf.setN3Optional( Arrays.asList( preferredTitleAssertion ) );
-        
+
         conf.addNewResource("title", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("individualVcard", DEFAULT_NS_FOR_NEW_RESOURCE);
-                
+
         conf.setLiteralsOnForm(Arrays.asList("preferredTitle" ));
-        
+
         conf.addSparqlForExistingLiteral("preferredTitle", preferredTitleQuery);
         conf.addSparqlForAdditionalUrisInScope("individualVcard", individualVcardQuery);
-        
+
         if ( conf.isUpdate() ) {
             HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
             urisInScope.put("title", Arrays.asList(new String[]{titleUri}));
             conf.addUrisInScope(urisInScope);
         }
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("preferredTitle")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
-        
+
         conf.addValidator(new AntiXssValidation());
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewPhone = 
+    final static String n3ForNewPhone =
         "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?person . \n" +
         "?individualVcard <http://www.w3.org/2006/vcard/ns#hasTitle> ?title . \n" +
-        "?title a <http://www.w3.org/2006/vcard/ns#Title> . " ;    
-    
-    final static String preferredTitleAssertion  =      
+        "?title a <http://www.w3.org/2006/vcard/ns#Title> . " ;
+
+    final static String preferredTitleAssertion  =
         "?title <http://www.w3.org/2006/vcard/ns#title> ?preferredTitle .";
-    
+
     /* Queries for editing an existing entry */
 
     final static String individualVcardQuery =
@@ -86,13 +86,13 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?existingIndividualVcard . \n" +
         "}";
 
-    final static String preferredTitleQuery  =      
+    final static String preferredTitleQuery  =
         "SELECT ?existingPreferredTitle WHERE {\n"+
         "?title <http://www.w3.org/2006/vcard/ns#title> ?existingPreferredTitle . }";
 
 	private String getTitleUri(VitroRequest vreq) {
-        String titleUri = vreq.getParameter("titleUri"); 
-        
+        String titleUri = vreq.getParameter("titleUri");
+
 		return titleUri;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java
index c0f7e7851e..83d03a552d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java
@@ -18,48 +18,48 @@
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
 
-public class ProjectHasParticipantGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator{            
+public class ProjectHasParticipantGenerator  extends VivoBaseGenerator implements EditConfigurationGenerator{
 
     //TODO: can we get rid of the session and get it form the vreq?
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
- 
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-                
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("projectHasParticipant.ftl");
-        
+
         conf.setVarNameForSubject("project");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("projectRole");
-                
+
         conf.setN3Required( Arrays.asList( n3ForNewProjectRole ) );
         conf.setN3Optional(Arrays.asList( n3ForNewPerson, n3ForExistingPerson, firstNameAssertion, lastNameAssertion ) );
-        
+
         conf.addNewResource("projectRole", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("newPerson",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardPerson", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("vcardName", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
-        //uris in scope: none   
+
+        //uris in scope: none
         //literals in scope: none
-        
+
         conf.setUrisOnform( Arrays.asList( "existingPerson"));
-        conf.setLiteralsOnForm( Arrays.asList("personLabel", "personLabelDisplay", "roleLabel", 
+        conf.setLiteralsOnForm( Arrays.asList("personLabel", "personLabelDisplay", "roleLabel",
                                               "roleLabeldisplay", "firstName", "lastName"));
 
         conf.addSparqlForExistingLiteral("personLabel", personLabelQuery);
         conf.addSparqlForExistingLiteral("roleLabel", roleLabelQuery);
 
         conf.addSparqlForExistingUris("existingPerson", existingPersonQuery);
-                        
+
         conf.addField( new FieldVTwo().
                 setName("existingPerson")
-                //options will be added in browser by auto complete JS  
-                );        
-        
+                //options will be added in browser by auto complete JS
+                );
+
         conf.addField( new FieldVTwo().
                 setName("personLabel").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
@@ -69,7 +69,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
                 setName("roleLabel").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString(),"nonempty")));
-            
+
         conf.addField( new FieldVTwo().
                 setName("personLabelDisplay").
                 setRangeDatatypeUri(XSD.xstring.toString() ));
@@ -77,7 +77,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         conf.addField( new FieldVTwo().
                 setName("roleLabelDisplay").
                 setRangeDatatypeUri(XSD.xstring.toString() ));
-                
+
         conf.addField( new FieldVTwo().
                 setName("firstName").
                 setRangeDatatypeUri(XSD.xstring.toString() ).
@@ -93,16 +93,16 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         //Add validator
         conf.addValidator(new AntiXssValidation());
         conf.addValidator(new FirstAndLastNameValidator("existingPerson"));
-        
+
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
         prepare(vreq, conf);
         return conf;
     }
-    
+
     /* N3 assertions for working with educational training */
-    
-    final static String n3ForNewProjectRole =       
+
+    final static String n3ForNewProjectRole =
         "@prefix core: <"+ vivoCore +"> .\n" +
 		"@prefix rdfs: <"+ rdfs +">  . \n"+
         "?project <http://purl.obolibrary.org/obo/BFO_0000055>  ?projectRole .\n" +
@@ -110,42 +110,42 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?projectRole <http://purl.obolibrary.org/obo/BFO_0000054> ?project . \n" +
         "?projectRole <"+ label +"> ?roleLabel . \n" ;
 
-    final static String n3ForNewPerson  =      
+    final static String n3ForNewPerson  =
         "?projectRole <http://purl.obolibrary.org/obo/RO_0000052> ?newPerson . \n" +
         "?newPerson <http://purl.obolibrary.org/obo/RO_0000053> ?projectRole . \n" +
         "?newPerson a <http://xmlns.com/foaf/0.1/Person> . \n" +
         "?newPerson <"+ label +"> ?personLabel . ";
 
-    final static String n3ForExistingPerson  =      
+    final static String n3ForExistingPerson  =
         "?projectRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingPerson . \n" +
         "?existingPerson <http://purl.obolibrary.org/obo/RO_0000053> ?projectRole . \n" +
         " ";
-    
-    final static String firstNameAssertion  =      
+
+    final static String firstNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
         "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardPerson vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:givenName ?firstName .";
-    
-    final static String lastNameAssertion  =      
+
+    final static String lastNameAssertion  =
         "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
         "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
         "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+        "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?vcardPerson vcard:hasName  ?vcardName . \n" +
-        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+        "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
         "?vcardName vcard:familyName ?lastName .";
 
     /* Queries for editing an existing educational training entry */
 
-    final static String roleLabelQuery =      
+    final static String roleLabelQuery =
         "SELECT ?roleLabel WHERE {\n"+
         "?projectRole <"+ label +"> ?roleLabel }\n";
 
-    final static String existingPersonQuery  =      
+    final static String existingPersonQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPerson WHERE {\n"+
         "?projectRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingPerson . \n" +
@@ -153,7 +153,7 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
 
-    final static String personLabelQuery  =      
+    final static String personLabelQuery  =
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPersonLabel WHERE {\n"+
         "?projectRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingPerson . \n" +
@@ -162,14 +162,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
 
-    
+
   //Adding form specific data such as edit mode
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
 		formSpecificData.put("editMode", getEditMode(vreq).name().toLowerCase());
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
+
 	public EditMode getEditMode(VitroRequest vreq) {
 		List<String> predicates = new ArrayList<String>();
 		predicates.add("http://purl.obolibrary.org/obo/RO_0000053");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java
index 93d33a3160..a36f630fe4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java
@@ -21,42 +21,42 @@
 public class SubjectHasMailingAddressGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
     private Log log = LogFactory.getLog(SubjectHasMailingAddressGenerator.class);
-       
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);  
-        String addressUri = vreq.getParameter("addressUri"); 
-        
+        initObjectPropForm(conf, vreq);
+        String addressUri = vreq.getParameter("addressUri");
+
         conf.setTemplate("subjectHasMailingAddress.ftl");
-        
+
         conf.setVarNameForSubject("subject");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("individualVcard");
-        
+
         conf.setN3Required( Arrays.asList( n3ForNewAddress ) );
-        conf.setN3Optional( Arrays.asList( streetAddressAssertion, 
-                                           localityAssertion, 
-                                           regionAssertion, 
-                                           countryAssertion, 
+        conf.setN3Optional( Arrays.asList( streetAddressAssertion,
+                                           localityAssertion,
+                                           regionAssertion,
+                                           countryAssertion,
                                            postalCodeAssertion ) );
-        
+
         conf.addNewResource("address", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("individualVcard", DEFAULT_NS_FOR_NEW_RESOURCE);
-                
+
         conf.setLiteralsOnForm(Arrays.asList("streetAddress", "locality", "postalCode", "country", "region" ));
-        
+
         conf.addSparqlForExistingLiteral("streetAddress", streetAddressQuery);
         conf.addSparqlForExistingLiteral("locality", localityQuery);
         conf.addSparqlForExistingLiteral("postalCode", postalCodeQuery);
         conf.addSparqlForExistingLiteral("region", regionQuery);
-        conf.addSparqlForExistingLiteral("country", countryQuery); 
-        
+        conf.addSparqlForExistingLiteral("country", countryQuery);
+
         if ( conf.isUpdate() ) {
             HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
             urisInScope.put("address", Arrays.asList(new String[]{addressUri}));
@@ -66,58 +66,58 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             conf.addSparqlForAdditionalUrisInScope("individualVcard", individualVcardQuery);
         }
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("streetAddress")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
-        
-        conf.addField( new FieldVTwo().                        
+
+        conf.addField( new FieldVTwo().
                 setName("country")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("postalCode")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("locality")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ) );
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("region")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("datatype:" + XSD.xstring.toString()) ) );
 
         conf.addValidator(new AntiXssValidation());
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewAddress = 
+    final static String n3ForNewAddress =
         "?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?subject . \n" +
         "?individualVcard <http://www.w3.org/2006/vcard/ns#hasAddress> ?address . \n" +
-        "?address a <http://www.w3.org/2006/vcard/ns#Address> . " ;    
-    
-    final static String streetAddressAssertion  =      
+        "?address a <http://www.w3.org/2006/vcard/ns#Address> . " ;
+
+    final static String streetAddressAssertion  =
         "?address <http://www.w3.org/2006/vcard/ns#streetAddress> ?streetAddress .";
-    
-    final static String localityAssertion  =      
+
+    final static String localityAssertion  =
         "?address <http://www.w3.org/2006/vcard/ns#locality> ?locality .";
 
-    final static String postalCodeAssertion  =      
-        "?address <http://www.w3.org/2006/vcard/ns#postalCode> ?postalCode .";    
-    
-    final static String regionAssertion  =      
-        "?address <http://www.w3.org/2006/vcard/ns#region> ?region .";    
-        
+    final static String postalCodeAssertion  =
+        "?address <http://www.w3.org/2006/vcard/ns#postalCode> ?postalCode .";
+
+    final static String regionAssertion  =
+        "?address <http://www.w3.org/2006/vcard/ns#region> ?region .";
+
     final static String countryAssertion =
         "?address <http://www.w3.org/2006/vcard/ns#country> ?country .";
 
@@ -129,23 +129,23 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
         "}";
 
-    final static String streetAddressQuery  =      
+    final static String streetAddressQuery  =
         "SELECT ?existingStreetAddress WHERE {\n"+
         "?address <http://www.w3.org/2006/vcard/ns#streetAddress> ?existingStreetAddress . }";
 
-    final static String localityQuery  =  
+    final static String localityQuery  =
         "SELECT ?existingLocality WHERE {\n"+
         "?address <http://www.w3.org/2006/vcard/ns#locality> ?existingLocality . }";
 
-    final static String regionQuery  =  
+    final static String regionQuery  =
         "SELECT ?existingRegion WHERE {\n"+
         "?address <http://www.w3.org/2006/vcard/ns#region> ?existingRegion . }";
 
-    final static String postalCodeQuery  =  
+    final static String postalCodeQuery  =
         "SELECT ?existingPostalCode WHERE {\n"+
         "?address <http://www.w3.org/2006/vcard/ns#postalCode> ?existingPostalCode . }";
 
-    final static String countryQuery  =  
+    final static String countryQuery  =
         "SELECT ?existingCountry WHERE {\n"+
         "?address <http://www.w3.org/2006/vcard/ns#country> ?existingCountry . }";
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java
index a09534544d..2744d8daa9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java
@@ -25,27 +25,27 @@
 public class SubjectHasPhoneFaxNumberGenerator extends VivoBaseGenerator implements
         EditConfigurationGenerator {
     private Log log = LogFactory.getLog(SubjectHasPhoneFaxNumberGenerator.class);
-       
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
-        
+
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
         Model model = ModelFactory.createDefaultModel();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);  
-        String phoneUri = getPhoneUri(vreq);  
+        initObjectPropForm(conf, vreq);
+        String phoneUri = getPhoneUri(vreq);
         String rangeUri = getRangeUri(vreq);
-        Literal numberType = null; 
-        
+        Literal numberType = null;
+
         conf.setTemplate("subjectHasPhoneFaxNumber.ftl");
-        
+
         conf.setVarNameForSubject("subject");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("individualVcard");
-        
+
         if ( rangeUri.equals("http://www.w3.org/2006/vcard/ns#Fax") ) {
             conf.setN3Required( Arrays.asList( n3ForNewFaxNumber ) );
             numberType = model.createLiteral("fax");
@@ -56,15 +56,15 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         }
 
         conf.setN3Optional( Arrays.asList( telephoneNumberAssertion ) );
-        
+
         conf.addNewResource("phone", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("individualVcard", DEFAULT_NS_FOR_NEW_RESOURCE);
-                
+
         conf.setLiteralsOnForm(Arrays.asList("telephoneNumber" ));
-        
+
         conf.addSparqlForExistingLiteral("telephoneNumber", telephoneNumberQuery);
         conf.addSparqlForAdditionalUrisInScope("individualVcard", individualVcardQuery);
-        
+
         conf.addLiteralInScope("numberType", numberType);
 
         if ( conf.isUpdate() ) {
@@ -73,37 +73,37 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             conf.addUrisInScope(urisInScope);
         }
 
-        conf.addField( new FieldVTwo().                        
+        conf.addField( new FieldVTwo().
                 setName("telephoneNumber")
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
-        
+
         conf.addValidator(new AntiXssValidation());
-        
+
         prepare(vreq, conf);
         return conf;
     }
 
     /* N3 assertions  */
 
-    final static String n3ForNewPhoneNumber = 
+    final static String n3ForNewPhoneNumber =
         "?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?subject . \n" +
         "?individualVcard <http://www.w3.org/2006/vcard/ns#hasTelephone> ?phone . \n" +
-        "?phone a <http://www.w3.org/2006/vcard/ns#Telephone> . " ;    
-    
-    final static String n3ForNewFaxNumber = 
+        "?phone a <http://www.w3.org/2006/vcard/ns#Telephone> . " ;
+
+    final static String n3ForNewFaxNumber =
         "?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard . \n" +
-        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +              
+        "?individualVcard a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
         "?individualVcard <http://purl.obolibrary.org/obo/ARG_2000029> ?subject . \n" +
         "?individualVcard <http://www.w3.org/2006/vcard/ns#hasTelephone> ?phone . \n" +
-        "?phone a <http://www.w3.org/2006/vcard/ns#Telephone> . \n " +    
-        "?phone a <http://www.w3.org/2006/vcard/ns#Fax> . " ;    
+        "?phone a <http://www.w3.org/2006/vcard/ns#Telephone> . \n " +
+        "?phone a <http://www.w3.org/2006/vcard/ns#Fax> . " ;
 
-    final static String telephoneNumberAssertion  =      
+    final static String telephoneNumberAssertion  =
         "?phone <http://www.w3.org/2006/vcard/ns#telephone> ?telephoneNumber .";
-    
+
     /* Queries for editing an existing entry */
 
     final static String individualVcardQuery =
@@ -111,19 +111,19 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
         "?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?existingIndividualVcard . \n" +
         "}";
 
-    final static String telephoneNumberQuery  =      
+    final static String telephoneNumberQuery  =
         "SELECT ?existingTelephoneNumber WHERE {\n"+
         "?phone <http://www.w3.org/2006/vcard/ns#telephone> ?existingTelephoneNumber . }";
 
 	private String getPhoneUri(VitroRequest vreq) {
-        String phoneUri = vreq.getParameter("phoneUri"); 
-        
+        String phoneUri = vreq.getParameter("phoneUri");
+
 		return phoneUri;
 	}
 	private String getRangeUri(VitroRequest vreq) {
-        String rangeUri = vreq.getParameter("rangeUri"); 
-        
+        String rangeUri = vreq.getParameter("rangeUri");
+
 		return rangeUri;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java
index 711d877cb0..e8783690f4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java
@@ -22,7 +22,7 @@
  *
  */
 public class VIVODefaultAddMissingIndividualFormGenerator extends DefaultAddMissingIndividualFormGenerator {
-	
+
 	private Log log = LogFactory.getLog(VIVODefaultAddMissingIndividualFormGenerator.class);
 
     protected Map<String, String> generateNewResources(VitroRequest vreq) {
@@ -37,11 +37,11 @@ protected List<String> getN3Prefixes() {
     	prefixStrings.add("@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .");
     	return prefixStrings;
     }
-    
+
     protected String getN3ForName() {
     	return "?" + objectVarName + " rdfs:label ?label .";
     }
-    
+
     protected List<String> generateN3Optional(VitroRequest vreq) {
     	List<String> n3Optional = super.generateN3Optional(vreq);
     	n3Optional.add(getN3PrefixesAsString()
@@ -52,7 +52,7 @@ protected List<String> generateN3Optional(VitroRequest vreq) {
             + " ?newVcardName a vcard:Name . \n"
             + " ?newVcardName vcard:givenName ?firstName . \n"
             + " ?newVcardName vcard:familyName ?lastName . \n");
-    	n3Optional.add(getN3PrefixesAsString() 
+    	n3Optional.add(getN3PrefixesAsString()
     	    + "?" + objectVarName +  "<http://purl.obolibrary.org/obo/ARG_2000028> ?newVcardInd . \n"
             + " ?newVcardInd a vcard:Individual . \n"
             + " ?newVcardInd vcard:hasName  ?newVcardName . \n"
@@ -75,39 +75,39 @@ protected void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration,
     protected void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
     	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
     	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)) {
-    		    			      
+
     	    //make name field
     	    FieldVTwo labelField = new FieldVTwo();
-	        labelField.setName("label");      	        
-	        
+	        labelField.setName("label");
+
     	    FieldVTwo firstNameField = new FieldVTwo();
-	        firstNameField.setName("firstName");      	        
-	        
+	        firstNameField.setName("firstName");
+
     	    FieldVTwo middleNameField = new FieldVTwo();
-	        middleNameField.setName("middleName");      	        
-	        
+	        middleNameField.setName("middleName");
+
     	    FieldVTwo lastNameField = new FieldVTwo();
-	        lastNameField.setName("lastName");      	        
-	        
+	        lastNameField.setName("lastName");
+
 	        List<String> validators = new ArrayList<String>();
 	        validators.add("nonempty");
-	        if(!isPersonType(vreq)) { 
-	            labelField.setValidators(validators); 
+	        if(!isPersonType(vreq)) {
+	            labelField.setValidators(validators);
 	        }
-	        if(isPersonType(vreq)) {  
-	            firstNameField.setValidators(validators);   
-	            lastNameField.setValidators(validators);   
+	        if(isPersonType(vreq)) {
+	            firstNameField.setValidators(validators);
+	            lastNameField.setValidators(validators);
 	        }
-	                            
+
 	        fields.put(labelField.getName(), labelField);
 	        fields.put(firstNameField.getName(), firstNameField);
 	        fields.put(middleNameField.getName(), middleNameField);
 	        fields.put(lastNameField.getName(), lastNameField);
-    	        
+
     	} else {
     		log.error("Is not object property so fields not set");
     	}
-    	
+
     	editConfiguration.setFields(fields);
     }
 
@@ -131,11 +131,11 @@ private String getTypeName(VitroRequest vreq) {
 		VClass type = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(typeOfNew);
 		return type.getName();
 	}
-	
+
 	public String getFOAFPersonClassURI() {
 		return "http://xmlns.com/foaf/0.1/Person";
 	}
-	
+
 	public boolean isPersonType(VitroRequest vreq) {
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 		Boolean isPersonType = Boolean.FALSE;
@@ -150,7 +150,7 @@ public boolean isPersonType(VitroRequest vreq) {
 	    			isPersonType = Boolean.TRUE;
 	    			break;
 	    		}
-	    	}    	
+	    	}
 	    }
 	    return isPersonType;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java
index df95243981..e70b1cdbbb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVOManageLabelsGenerator.java
@@ -15,7 +15,7 @@
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 
 /**
- *This generator selects the actual generator to be employed based on whether the individual is a Person 
+ *This generator selects the actual generator to be employed based on whether the individual is a Person
  *or another individual.  Adding a label for a person relies on first/name last name information i.e. object properties.
  */
 public class VIVOManageLabelsGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
@@ -30,14 +30,14 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
     	} else {
     		//Non-Person individuals
     		e = new ManageLabelsForIndividualGenerator().getEditConfiguration(vreq, session);
-        	
+
     	}
-    	
+
     	return e;
-    	
+
     }
-    
-    
+
+
     public boolean isPersonType(String subjectUri, VitroRequest vreq) {
 		Boolean isPersonType = Boolean.FALSE;
 		String foafPersonType = getFOAFPersonClassURI();
@@ -49,17 +49,17 @@ public boolean isPersonType(String subjectUri, VitroRequest vreq) {
 	    			isPersonType = Boolean.TRUE;
 	    			break;
 	    		}
-	    	}    	
+	    	}
 	    }
 	    return isPersonType;
 	}
-    
+
   //Copied from NewIndividualFormGenerator
   	//TODO: Refactor so common code can be used by both generators
   	public String getFOAFPersonClassURI() {
   		return "http://xmlns.com/foaf/0.1/Person";
   	}
-  	
+
   //how to get the type of the individual in question
   	public List<VClass> getVClasses(String subjectUri, VitroRequest vreq) {
   		Individual subject = EditConfigurationUtils.getIndividual(vreq, subjectUri);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
index 3a4f937217..eee13bcb5a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
@@ -24,22 +24,22 @@
 
 /**
  * Generates the edit configuration for a default property form.
- * ModelChangePreprocessor creates the rdfs:label statement. 
+ * ModelChangePreprocessor creates the rdfs:label statement.
  */
 public class VIVONewIndividualFormGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
 
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
-        
+
     	EditConfigurationVTwo config = new EditConfigurationVTwo();
-    	
+
     	config.setTemplate( "newIndividualForm.ftl" );
-    	
+
     	config.setN3Required( list(
     	        "?newInd <" + VitroVocabulary.RDF_TYPE  + "> <" + getTypeOfNew(vreq) + "> ."
-    	));    
+    	));
     	//Optional because user may have selected either person or individual of another kind
-    	//Person uses first name and last name whereas individual of other class would use label 
+    	//Person uses first name and last name whereas individual of other class would use label
     	//middle name is also optional
     	config.setN3Optional(list(
     	        N3_PREFIX + "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .\n"
@@ -58,55 +58,55 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
     	                  + " ?newVcardName a vcard:Name . \n"
     	                  + " ?newVcardName <http://vivoweb.org/ontology/core#middleName> ?middleName ."
     	));
-    	                    
+
     	config.addNewResource("newInd", vreq.getWebappDaoFactory().getDefaultNamespace());
     	config.addNewResource("newVcardInd", vreq.getWebappDaoFactory().getDefaultNamespace());
     	config.addNewResource("newVcardName", vreq.getWebappDaoFactory().getDefaultNamespace());
-    	    	
+
     	config.setUrisOnform(list ());
-        config.setLiteralsOnForm( list( "label", "firstName", "lastName", "middleName" ));            	
+        config.setLiteralsOnForm( list( "label", "firstName", "lastName", "middleName" ));
     	setUrisAndLiteralsInScope(config);
-    	//No SPARQL queries for existing since this is only used to create new, never for edit    	
-    	    	
+    	//No SPARQL queries for existing since this is only used to create new, never for edit
+
     	config.addField(new FieldVTwo().
     	        setName("firstName").
     	        setRangeDatatypeUri(XSD.xstring.getURI()).
     	        setValidators(getFirstNameValidators(vreq)));
-    	
+
     	config.addField(new FieldVTwo().
     	        setName("middleName").
     	        setRangeDatatypeUri(XSD.xstring.getURI()).
     	        setValidators(getMiddleNameValidators(vreq)));
-    	
+
     	config.addField(new FieldVTwo().
                 setName("lastName").
     	        setRangeDatatypeUri(XSD.xstring.getURI()).
-                setValidators(getLastNameValidators(vreq)));    	
-    
+                setValidators(getLastNameValidators(vreq)));
+
     	config.addField(new FieldVTwo().
                 setName("label").
     	        setRangeDatatypeUri(XSD.xstring.getURI()).
-                setValidators(getLabelValidators(vreq)));    	  
-    	    	
-        addFormSpecificData(config, vreq);        
-        
+                setValidators(getLabelValidators(vreq)));
+
+        addFormSpecificData(config, vreq);
+
         config.addValidator(new AntiXssValidation());
-        
+
         //This combines the first and last name into the rdfs:label
         // currently being done via javascript in the template. May use this again
         // when/if updated to ISF ontology.  tlw72
-//        config.addModelChangePreprocessor(new FoafNameToRdfsLabelPreprocessor());        
+//        config.addModelChangePreprocessor(new FoafNameToRdfsLabelPreprocessor());
 
-        String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);       
+        String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
         config.setFormUrl(formUrl);
-        
+
         //Note, the spaces are important - they were added by ProcessRdfFormController earlier
         //as a means of ensuring the substitution worked correctly - as the regex expects spaces
         config.setEntityToReturnTo(" ?newInd ");
         prepare(vreq, config);
     	return config;
     }
-    
+
     private List<String> getMiddleNameValidators(VitroRequest vreq) {
     	List<String> validators = new ArrayList<String>();
 		return validators;
@@ -144,9 +144,9 @@ private String getTypeOfNew(VitroRequest vreq) {
         if( typeUri == null || typeUri.trim().isEmpty() )
             return getFOAFPersonClassURI();
         else
-            return typeUri; 
+            return typeUri;
     }
-    
+
     //Form specific data
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
@@ -167,11 +167,11 @@ private String getTypeName(VitroRequest vreq) {
 		VClass type = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(typeOfNew);
 		return type.getName();
 	}
-	
+
 	public String getFOAFPersonClassURI() {
 		return "http://xmlns.com/foaf/0.1/Person";
 	}
-	
+
 	public boolean isPersonType(VitroRequest vreq) {
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 		Boolean isPersonType = Boolean.FALSE;
@@ -186,22 +186,22 @@ public boolean isPersonType(VitroRequest vreq) {
 	    			isPersonType = Boolean.TRUE;
 	    			break;
 	    		}
-	    	}    	
+	    	}
 	    }
 	    return isPersonType;
 	}
 	 private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration) {
 	    	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
 	    	//note that at this point the subject, predicate, and object var parameters have already been processed
-	    	urisInScope.put(editConfiguration.getVarNameForSubject(), 
+	    	urisInScope.put(editConfiguration.getVarNameForSubject(),
 	    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-	    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
+	    	urisInScope.put(editConfiguration.getVarNameForPredicate(),
 	    			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
 	    	editConfiguration.setUrisInScope(urisInScope);
 	    	//Uris in scope include subject, predicate, and object var
-	    	
+
 	    	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
 	    }
-	
+
 	private String N3_PREFIX = "@prefix foaf: <http://xmlns.com/foaf/0.1/> .\n";
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
index 2ea0413d49..220f18dbe3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
@@ -5,7 +5,7 @@
 
 /**
  * Adds static Strings that may be useful for forms that are part of VIVO.
- *  
+ *
  * @author bdc34
  *
  */
@@ -14,18 +14,18 @@ public abstract class VivoBaseGenerator extends BaseEditConfigurationGenerator i
     final static String vivoCore ="http://vivoweb.org/ontology/core#" ;
     final static String rdfs =VitroVocabulary.RDFS ;
     final static String foaf = "http://xmlns.com/foaf/0.1/";
-    final static String type =VitroVocabulary.RDF_TYPE ;            
+    final static String type =VitroVocabulary.RDF_TYPE ;
     final static String label =rdfs+"label" ;
     final static String bibo = "http://purl.org/ontology/bibo/";
-    
-    final static String edProcessClass = vivoCore+"EducationalProcess" ;    
-    final static String degreeTypeClass =vivoCore+"AcademicDegree" ;    
+
+    final static String edProcessClass = vivoCore+"EducationalProcess" ;
+    final static String degreeTypeClass =vivoCore+"AcademicDegree" ;
     final static String majorFieldPred =vivoCore+"majorField" ;
     final static String deptPred =vivoCore+"departmentOrSchool" ;
     final static String infoPred =vivoCore+"supplementalInformation" ;
     final static String authorRankPredicate = vivoCore + "authorRank";
     final static String linkedAuthorPredicate = vivoCore + "relates";
-    
+
     final static String dateTimeValue =vivoCore+"dateTime";
     final static String dateTimeValueType =vivoCore+"DateTimeValue";
     final static String dateTimePrecision =vivoCore+"dateTimePrecision";
@@ -37,5 +37,5 @@ public abstract class VivoBaseGenerator extends BaseEditConfigurationGenerator i
 
     final static String orgClass ="http://xmlns.com/foaf/0.1/Organization" ;
     final static String personClass = foaf + "Person";
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
index 856de69c59..82792291ca 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
@@ -1,875 +1,875 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jena.ontology.OntModel;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.vocabulary.OWL;
-import org.apache.jena.vocabulary.RDF;
-import org.apache.jena.vocabulary.RDFS;
-import org.apache.jena.vocabulary.XSD;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
-
-public class AddAssociatedConceptsPreprocessor extends
-		BaseEditSubmissionPreprocessorVTwo {
-
-	protected static final Log log = LogFactory
-			.getLog(AddAssociatedConceptsPreprocessor.class.getName());
-	protected OntModel ontModel = null;
-	protected WebappDaoFactory wdf = null;
-	// Field names/variables names for n3 - these will have numbers added as
-	// suffix if more than one term
-	private static String conceptNodeBase = "conceptNode";
-	private static String sourceBase = "conceptSource";
-	private static String labelBase = "conceptLabel";
-	private static String conceptSemanticTypeLabelBase = "conceptSemanticTypeLabel";
-	private static String conceptSemanticTypeURIBase = "conceptSemanticTypeURI";
-	private static String conceptBroaderURIBase = "conceptBroaderURI";
-	private static String conceptNarrowerURIBase = "conceptNarrowerURI";
-
-	//keyed off label variable, specifies which uri variable should be used, useful if same label repeated twice
-	private HashMap<String, String> labelVarToUriVarHash = null;
-	private HashMap<String, List<String>> conceptSemanticTypeURIVarToValueMap = null;
-	//Also storing submission values
-	private static String conceptNodeValues = null;
-	private static String conceptLabelValues = null;
-	private static String conceptSourceValues = null;
-	private static String conceptSemanticTypeLabelValues = null;
-	private static String conceptSemanticTypeURIValues = null;
-	private static List<String> conceptBroaderURIValues =  null;
-	private static List<String> conceptNarrowerURIValues = null;
-	private static MultiValueEditSubmission submission = null;
-	
-	private static String SKOSBroaderURI = "http://www.w3.org/2004/02/skos/core#broader";
-	private static String SKOSNarrowerURI = "http://www.w3.org/2004/02/skos/core#narrower";
-	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";	
-
-	// String datatype
-
-	// Will be editing the edit configuration as well as edit submission here
-
-	public AddAssociatedConceptsPreprocessor(EditConfigurationVTwo editConfig) {
-		super(editConfig);
-		this.labelVarToUriVarHash = new HashMap<String, String>();
-		//Saves values of concept type uris
-		this.conceptSemanticTypeURIVarToValueMap = new HashMap<String, List<String>>();
-	}
-
-	public void preprocess(MultiValueEditSubmission inputSubmission, VitroRequest vreq) {
-		submission = inputSubmission;
-		this.wdf = vreq.getWebappDaoFactory();
-		this.ontModel = ModelAccess.on(vreq).getOntModel();
-		//Set the models that we need here
-		// Get the input elements for concept node and concept label as well
-		// as vocab uri (which is based on thge
-		// For query parameters, check whether CUI
-		copySubmissionValues();
-		
-		
-		if (conceptNodeValues != null) {
-			String[] conceptNodes = convertDelimitedStringToArray(conceptNodeValues);
-			int numberConcepts = conceptNodes.length;
-			//This will put the URI value in scope for the first semantic type label
-			//and generate the rest if need be
-			processConceptSemanticValues();
-			//Also need to see if any broader or narrower uris for the concepts that already exist in the system
-			//and set up the appropriate relationships between this concept and the broader/narrower uri
-			getExistingConceptRelationships();
-			if (numberConcepts > 1) {
-				processConceptNodes(numberConcepts);
-			}
-
-		} else {
-			log.error("No concept nodes were added from the service");
-		}
-
-	}
-	
-	
-
-	//Since we will change the uris and literals from form, we should make copies
-	//of the original values and store them, this will also make iterations
-	//and updates to the submission independent from accessing the values
-	private void copySubmissionValues() {
-		conceptLabelValues = getConceptLabelValues();
-		conceptNodeValues = getConceptNodeValues();
-		conceptSourceValues = getConceptSourceValues();
-		conceptBroaderURIValues = getConceptBroaderURIValues();
-		conceptNarrowerURIValues = getConceptNarrowerURIValues();
-		log.debug("concept label values are " + conceptLabelValues);
-
-	}
-	
-	
-	//For broader and narrower relationships, we will be 
-	//linking the concept to broader and narrower terms where those terms already 
-	//exist in the system
-	//This method or approach may change later in which case this method should change
-	private void getExistingConceptRelationships() {
-		List<String> existingNarrowerURIs = getExistingNarrowerURIs(conceptNarrowerURIValues);
-		List<String> existingBroaderURIs = getExistingBroaderURIs(conceptBroaderURIValues);
-		//Now set the submission values to these, overwriting the original
-		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
-		if(existingNarrowerURIs.size() > 0) {
-			urisFromForm.put("conceptNarrowerURI", existingNarrowerURIs);
-		} else {
-			//The original code for submission wouldn't put in a key if the values were null or size 0
-			urisFromForm.remove("conceptNarrowerURI");
-		}
-		//Set the copied values to this value as well so when if there are multiple
-		//concepts, the inputs get copied correctly for each of them
-		this.conceptNarrowerURIValues = existingNarrowerURIs;
-		if(existingBroaderURIs.size() > 0) {
-			urisFromForm.put("conceptBroaderURI", existingBroaderURIs);
-		} else {
-			urisFromForm.remove("conceptBroaderURI");
-		}
-		this.conceptBroaderURIValues = existingBroaderURIs;
-	}
-	
-	//get the broader and narrower uri values that already exist in the system from the ones returned in the search
-	//and use those to populate relationships between the concept and other concepts already in the system
-	//We should also make sure to use bidirectional n3 so the graph has both sets of relationships represented
-	private List<String> getConceptNarrowerURIValues() {
-		return this.getJSONFormURIValues("conceptNarrowerURI");
-	}
-
-	private List<String> getConceptBroaderURIValues() {
-		return this.getJSONFormURIValues("conceptBroaderURI");
-	}
-	
-	private List<String> getJSONFormURIValues(String varName) {
-		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
-		List<String> uris =  urisFromForm.get(varName);
-		//This should be a JSON object stringified
-		if(uris.size() > 0) {
-			String jsonString = uris.get(0);
-			if(jsonString != null && !jsonString.isEmpty()) {
-				JsonNode json = JacksonUtils.parseJson(jsonString);
-				//This should be an array
-				if(json.isArray()) {
-					ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(jsonString);
-					//Convert to list of strings
-					return convertJsonArrayToList(jsonArray);
-				}
-			}
-		}
-		return uris;
-	}
-
-	private List<String> convertJsonArrayToList(ArrayNode jsonArray) {
-		List<String> stringList = new ArrayList<String>();
-		int len = jsonArray.size();
-		int i = 0;
-		for(i = 0; i < len; i++) {
-			stringList.add(jsonArray.get(i).asText());
-		}
-		return stringList;
-	}
-
-	private List<String> getExistingBroaderURIs(List<String> broaderURIs) {
-		if(broaderURIs == null) {
-			return new ArrayList<String>();
-		}
-		List<String> existingBroaderURIs = this.getExistingURIs(broaderURIs);
-		return existingBroaderURIs;
-	}
-	
-	private List<String> getExistingNarrowerURIs(List<String> narrowerURIs) {
-		if(narrowerURIs == null) 
-			return new ArrayList<String>();
-		List<String> existingNarrowerURIs = this.getExistingURIs(narrowerURIs);
-		return existingNarrowerURIs;
-	}
-	
-	//We need to keep the number of elements the same if there are any entries at all in the original
-	//So we will use an empty string or null 
-	private List<String> getExistingURIs(List<String> uris) {
-		//Important to keep the same formatting as original, because a comma delimited string as an element in the array
-		//refers to a list of uris appropriate for a given concept, where each element in the array corresponds to a different
-		//concept
-		List<String> existingURIs = new ArrayList<String>();
-		for(String uri:uris) {
-			if(uri.indexOf(",") != -1) {
-				List<String> existingURISet = new ArrayList<String>();
-				String[] uriSet = uri.split(",");
-				for(String u: uriSet) {
-					if(u !=  null && !u.isEmpty() && this.wdf.hasExistingURI(u)) {
-						existingURISet.add(u);
-					}
-				}
-				//Now add the comma delimited version back to the array
-				if(existingURISet.size() > 0) {
-					existingURIs.add(StringUtils.join(existingURISet, ","));
-				} else {
-					//add empty string to indicate no value here
-					existingURIs.add("");
-				}
-			} else {
-				if(uri != null && !uri.isEmpty() && this.wdf.hasExistingURI(uri)) {
-					existingURIs.add(uri);
-				} 
-				else 
-				{
-					existingURIs.add("");
-				}
-				
-			}
-		}
-		return existingURIs;
-	}
-	 
-	
-	//Process the semantic type label and URI values for the concepts
-	private void processConceptSemanticValues() {
-		conceptSemanticTypeLabelValues = getConceptSemanticTypeLabelValues();
-		conceptSemanticTypeURIValues = getConceptSemanticTypeURIValues();
-		
-		//We are first going to handle the single value case and then handle additional values
-		//where the rest of the additional values are handled
-		
-	}
-
-
-	//This is for additional concept nodes (i.e. if user selects more than one concept)
-	private void processConceptNodes(int numberConcepts) {
-		//There are no "new" resources b/c the concept nodes are URIs from external vocabularies
-		//New resources for concept semantic type uris
-		addNewResources(numberConcepts);
-		// Add N3Required
-		addN3Required(numberConcepts);
-		//Add N3 Optional as well
-		addN3Optional(numberConcepts);
-		// Add URIs on Form and Add Literals On Form
-		addLiteralsAndUrisOnForm(numberConcepts);
-		// Add fields
-		addFields(numberConcepts);
-		//Add input values to submission
-		addInputsToSubmission(numberConcepts);
-
-	}
-
-	//This is specifically for concept semantic type URIs which may need to be generated
-	private void addNewResources(int numberConcepts) {
-		// TODO Auto-generated method stub
-		addConceptSemanticTypeURIResources(numberConcepts);
-	}
-
-	private void addConceptSemanticTypeURIResources(int numberConcepts) {
-		//Iterate through the labels and get the corresponding uris
-		HashSet<String> urisToAdd = new HashSet<String>();
-		String[] conceptSemanticTypeLabels= convertDelimitedStringToArray(conceptSemanticTypeLabelValues);
-		//the number of existing values may not match up, or at least existing populated ones
-		//Now we can't determine whether all concepts will have semantic types - at some point what if
-		//we ran a search across all external vocabularies? So we can't compare labels to number of concepts
-		//but we can ensure that it isn't greater than then number of concepts
-		if(conceptSemanticTypeLabels != null && conceptSemanticTypeLabels.length <= numberConcepts) {
-			int i;
-			for(i = 0; i < numberConcepts; i++) {
-				int suffix = i + 1;
-				String conceptSemanticTypeLabelVar = conceptSemanticTypeLabelBase + suffix;
-				if(this.labelVarToUriVarHash.containsKey(conceptSemanticTypeLabelVar)) {
-					String newResourceName = this.labelVarToUriVarHash.get(conceptSemanticTypeLabelVar);
-					if(!urisToAdd.contains(newResourceName)) {
-						urisToAdd.add(newResourceName);
-						editConfiguration.addNewResource(newResourceName, null);
-					}
-				}
-				
-			}
-		} else if(conceptSemanticTypeLabels != null && conceptSemanticTypeLabels.length > numberConcepts){
-			log.error("Number of concept semantic type labels is greater than number of concepts");
-		} else{
-			log.error("Concept semantic type labels returned are null");
-		}		
-		
-	}
-
-	//This is where the actual values will be submitted as if they were separate input fields
-	//Each field name will correspond to the names of the fileds/uris on form/literals on form
-	//generated here
-
-	private void addInputsToSubmission(int numberConcepts) {
-		//This will essentially manufacture a set of query parameters
-		//And will add the appropriate fields to the multivalue submission
-		addConceptNodeInputs(numberConcepts);
-		addConceptSourceInputs(numberConcepts);
-		addConceptLabelInputs(numberConcepts);
-		//for concept semantic type  labels and uris where they exist
-		addConceptSemanticTypeLabelAndURIInputs(numberConcepts);
-		//For broader and narrower uris where they exist (this of course is in the case of multiple broader and narrower uris
-		addConceptBroaderURIInputs(numberConcepts);
-		addConceptNarrowerURIInputs(numberConcepts);
-	}
-
-	private void addConceptNodeInputs(int numberConcepts) {
-		
-		String[] conceptNodes = convertDelimitedStringToArray(conceptNodeValues);
-		if(conceptNodes != null && conceptNodes.length == numberConcepts) {
-			int i;
-			//iterate through the concept nodes converted string array
-			for(i = 0; i < numberConcepts; i++) {
-				int suffix = i + 1;
-				String conceptInputName = conceptNodeBase + suffix;
-				String[] nodeValues = new String[1];
-				nodeValues[0] = conceptNodes[i];
-				//Add value for uri to form
-				submission.addUriToForm(editConfiguration, conceptInputName, nodeValues);
-			}
-		} else if(conceptNodes != null && conceptNodes.length != numberConcepts){
-			log.error("Number of concept nodes did not match the number of concepts to be added");
-		} else{
-			log.error("Concept nodes returned were null");
-		}
-		
-	}
-
-	private void addConceptSourceInputs(int numberConcepts) {
-		String[] conceptSources = convertDelimitedStringToArray(conceptSourceValues);
-		if(conceptSources != null && conceptSources.length == numberConcepts) {
-			int i;
-			for(i = 0; i < numberConcepts; i++) {
-				int suffix = i + 1;
-				String conceptInputName = sourceBase + suffix;
-				String[] sourceValues = new String[1];
-				sourceValues[0] = conceptSources[i];
-				//Add value for uri to form
-				submission.addUriToForm(editConfiguration, conceptInputName, sourceValues);
-			}
-		} else if(conceptSources != null && conceptSources.length != numberConcepts){
-			log.error("Number of concept nodes did not match the number of concepts to be added");
-		} else{
-			log.error("Concept nodes returned were null");
-		}
-	}
-
-	private void addConceptLabelInputs(int numberConcepts) {
-		String[] labels = convertDelimitedStringToArray(conceptLabelValues);
-		if(labels != null && labels.length == numberConcepts) {
-			int i;
-			for(i = 0; i < numberConcepts; i++) {
-				int suffix = i + 1;
-				String labelInputName = labelBase + suffix;
-				String[] labelValues = new String[1];
-				labelValues[0] = labels[i];
-				//TODO: Check if there are no funky typed information also stored
-				//At this point the field should already have been added to edit configuration
-				FieldVTwo labelField = editConfiguration.getField(labelInputName);
-				if(labelField != null) {
-					submission.addLiteralToForm(editConfiguration, labelField, labelInputName, labelValues);
-				} else {
-					log.error("Corresponding field for " + labelInputName + " was not added to edit configuration");
-				}
-				
-			}
-		} else if(labels != null && labels.length != numberConcepts){
-			log.error("Number of concept labels did not match the number of concepts to be added");
-		} else{
-			log.error("Concept labels returned were null");
-		}
-	}
-	
-	private void addConceptSemanticTypeLabelAndURIInputs(int numberConcepts) {
-		String[] labels = convertDelimitedStringToArray(conceptSemanticTypeLabelValues);
-		HashSet<String> uniqueLabelValues = new HashSet<String>();
-		if(labels != null && labels.length == numberConcepts) {
-			int i;
-			for(i = 0; i < numberConcepts; i++) {
-				String thisLabel = labels[i];
-				int suffix = i + 1;
-				String labelInputName = conceptSemanticTypeLabelBase + suffix;
-				String[] labelValues = new String[1];
-				labelValues[0] = thisLabel;
-				//TODO: Check if there are no funky typed information also stored
-				//At this point the field should already have been added to edit configuration
-				FieldVTwo labelField = editConfiguration.getField(labelInputName);
-				//TODO: Also check to see whether the label is actually populate or will n3 editing take care of that?
-				if(labelField != null) {
-					submission.addLiteralToForm(editConfiguration, labelField, labelInputName, labelValues);
-					//Associate URI
-					if(!uniqueLabelValues.contains(thisLabel)) {
-						uniqueLabelValues.add(thisLabel);
-						this.addConceptSemanticTypeURIInputForLabel(labelInputName, suffix);
-					}
-				} else {
-					log.error("Corresponding field for " + labelInputName + " was not added to edit configuration");
-				}
-				
-			}
-		} else if(labels != null && labels.length != numberConcepts){
-			log.error("Number of concept semantic type labels did not match the number of concepts to be added");
-		} else{
-			log.error("Concept labels returned were null");
-		}	
-	}
-	
-	private void addConceptSemanticTypeURIInputForLabel(String conceptSemanticTypeLabel, int suffix) {
-		//String[] conceptSemanticTypeURIs= convertDelimitedStringToArray(conceptSemanticTypeURIValues);
-		
-		//Get the semantic type URI variable name associated with this label
-		String uriInputName = this.getConceptSemanticTypeURIFieldName(conceptSemanticTypeLabel, suffix);
-		//List<>
-		if(this.conceptSemanticTypeURIVarToValueMap.containsKey(uriInputName)) {
-			List<String> uriVals = this.conceptSemanticTypeURIVarToValueMap.get(uriInputName);
-			String[] uriValuesArray = uriVals.toArray(new String[uriVals.size()]);
-			submission.addUriToForm(editConfiguration, uriInputName, uriValuesArray);
-		}
-	}
-
-	private void addConceptBroaderURIInputs(int numberConcepts) {
-		int i;
-		//Add inputs based on if there are any broader uris to add
-		//Can't really compare number of existing broader uris to concepts
-		//as each concept may or may not have a broader uri
-		if(this.conceptBroaderURIValues.size() > 0 && this.conceptBroaderURIValues.size() <= numberConcepts) {
-			for(i = 0; i < numberConcepts; i++) {
-				int suffix = i + 1;
-				String conceptBroaderURIInputName = conceptBroaderURIBase + suffix;
-				String broaderURIs = this.conceptBroaderURIValues.get(i);
-				if(broaderURIs != null && !broaderURIs.isEmpty()) {
-					String[] broaderURISet = new String[1];
-					if(broaderURIs.indexOf(",") != -1) {
-						broaderURISet = broaderURIs.split(",");
-					} else {
-						broaderURISet[0] = broaderURIs;
-					}
-					//Add value for uri to form
-					submission.addUriToForm(editConfiguration, conceptBroaderURIInputName, broaderURISet);
-				}
-			}
-		} 
-		
-	}
-	private void addConceptNarrowerURIInputs(int numberConcepts) {
-		int i;
-		if(this.conceptNarrowerURIValues.size() > 0 && this.conceptNarrowerURIValues.size() <= numberConcepts) {
-			for(i = 0; i < numberConcepts; i++) {
-				int suffix = i + 1;
-				String conceptNarrowerURIInputName = conceptNarrowerURIBase + suffix;
-				String narrowerURIs = this.conceptNarrowerURIValues.get(i);
-				if(narrowerURIs != null && !narrowerURIs.isEmpty()) {
-					String[] narrowerURISet = new String[1];
-					if(narrowerURIs.indexOf(",") != -1) {
-						narrowerURISet = narrowerURIs.split(",");
-					} else {
-						narrowerURISet[0] = narrowerURIs;
-					}
-					//Add value for uri to form
-					submission.addUriToForm(editConfiguration, conceptNarrowerURIInputName, narrowerURISet);
-				}
-			}
-		} 	
-	}
-	
-	//Fields
-	
-	private void addFields(int numberConcepts) {
-		//Clear out all fields in edit configuration first
-		editConfiguration.setFields(new HashMap<String, FieldVTwo>());
-		int index;
-		HashSet<String> conceptSemanticTypeUris = new HashSet<String>();
-		// First one already included in generator so add additional ones here
-		for (index = 1; index <= numberConcepts; index++) {
-			int suffix = index;
-			String conceptNode = conceptNodeBase + suffix;
-			String label = labelBase + suffix;
-			String source = sourceBase + suffix;
-			String conceptSemanticTypeLabel = conceptSemanticTypeLabelBase + suffix;
-			String conceptSemanticTypeURI = this.getConceptSemanticTypeURIFieldName(conceptSemanticTypeLabel, suffix);
-			String conceptBroaderURI = conceptBroaderURIBase + suffix;
-			String conceptNarrowerURI = conceptNarrowerURIBase + suffix;
-			addConceptNodeField(conceptNode);
-			addLabelField(label);
-			addSourceField(source);
-			//Also add fields for concept semantic type label
-			addConceptSemanticTypeLabelField(conceptSemanticTypeLabel);
-			//and concept semantic type URI
-			if(!conceptSemanticTypeUris.contains(conceptSemanticTypeURI)) {
-				conceptSemanticTypeUris.add(conceptSemanticTypeURI);
-				addConceptSemanticTypeURIField(conceptSemanticTypeURI);
-			}
-			
-			//add fields for concept broader and narrower uris
-			addConceptBroaderURIField(conceptBroaderURI);
-			addConceptNarrowerURIField(conceptNarrowerURI);
-		}
-	}
-	
-
-
-	private void addConceptNodeField(String conceptNode) {
-		List<String> validators = new ArrayList<String>();
-		validators.add("nonempty");
-		editConfiguration.addField(new FieldVTwo().
-				setName(conceptNode).
-				setValidators(validators));		
-	}
-
-	private void addLabelField(String label) {
-		editConfiguration.addField(new FieldVTwo().
-				setName(label).
-				setRangeDatatypeUri(XSD.xstring.toString())
-				);
-		
-	}
-
-	private void addSourceField(String source) {
-		editConfiguration.addField(new FieldVTwo().
-				setName(source));
-		
-	}
-	
-	//TODO: Do we need to check if label is empty string?
-	private void addConceptSemanticTypeLabelField(String label) {
-		if(label != null) {
-			editConfiguration.addField(new FieldVTwo().
-					setName(label).
-					setRangeDatatypeUri(XSD.xstring.toString())
-					);
-		}
-		
-	}
-	
-	private void addConceptSemanticTypeURIField(String conceptSemanticTypeURI) {
-		if(conceptSemanticTypeURI != null) {
-			editConfiguration.addField(new FieldVTwo().
-					setName(conceptSemanticTypeURI));		
-		}
-	}
-
-	private void addConceptNarrowerURIField(String conceptNarrowerURI) {
-		editConfiguration.addField(new FieldVTwo().
-				setName(conceptNarrowerURI));
-		
-	}
-
-	private void addConceptBroaderURIField(String conceptBroaderURI) {
-		editConfiguration.addField(new FieldVTwo().
-				setName(conceptBroaderURI));
-		
-	}
-	
-	//original literals on form: label, uris on form: conceptNode and conceptSource
-	//This will overwrite the original values in the edit configuration
-	private void addLiteralsAndUrisOnForm(int numberTerms) {
-		List<String> urisOnForm = new ArrayList<String>();
-		List<String> literalsOnForm = new ArrayList<String>();
-
-		int index;
-		HashSet<String> conceptSemanticTypeURIs = new HashSet<String>();
-		// First one already included so add new ones here
-		for (index = 1; index <= numberTerms; index++) {
-			int suffix = index;
-			String conceptNode = conceptNodeBase + suffix;
-			String label = labelBase + suffix;
-			String source = sourceBase + suffix;
-			String conceptSemanticTypeLabel = conceptSemanticTypeLabelBase + suffix;
-			//String conceptSemanticTypeURI = conceptSemanticTypeURIBase + suffix;
-			String conceptSemanticTypeURI = this.getConceptSemanticTypeURIFieldName(conceptSemanticTypeLabel, suffix);
-			String conceptBroaderURI = conceptBroaderURIBase + suffix;
-			String conceptNarrowerURI = conceptNarrowerURIBase + suffix;
-			urisOnForm.add(conceptNode);
-			urisOnForm.add(source); 
-			if(!conceptSemanticTypeURIs.contains(conceptSemanticTypeURI)) {
-				conceptSemanticTypeURIs.add(conceptSemanticTypeURI);
-				urisOnForm.add(conceptSemanticTypeURI);
-			}
-			urisOnForm.add(conceptBroaderURI);
-			urisOnForm.add(conceptNarrowerURI);
-			literalsOnForm.add(label);
-			literalsOnForm.add(conceptSemanticTypeLabel);
-		}
-		editConfiguration.setUrisOnform(urisOnForm);
-		editConfiguration.setLiteralsOnForm(literalsOnForm);
-	}
-
-	// N3 being reproduced
-	/*
-	 * ?subject ?predicate ?conceptNode .
-	 */
-	//This will overwrite the original with the set of new n3 required
-	private void addN3Required(int numberConcepts) {
-		// List<String> n3Required = editConfig.getN3Required();
-		List<String> n3Required = new ArrayList<String>();
-		int index;
-		String nodeBase = "?" + conceptNodeBase;
-		
-		String prefixStr = "@prefix core: <http://vivoweb.org/ontology/core#> .";
-		// First one already included so add new ones here
-		for (index = 1; index <= numberConcepts; index++) {
-			int suffix = index;
-			String node = nodeBase + suffix;
-			String n3String = prefixStr;
-			n3String += "?subject ?predicate " + node + " . \n" + 
-			node + " <" + RDF.type.getURI() + "> <" + this.SKOSConceptType + "> .";
-			n3Required.add(n3String);
-		}
-		editConfiguration.setN3Required(n3Required);
-	}
-	//Add n3 optional
-	//TODO: Rewrite optional N3
-	private void addN3Optional(int numberConcepts) {
-		List<String> n3Optional = new ArrayList<String>();
-		int index;
-		String nodeBase = "?" + conceptNodeBase;
-		String labelVar = "?" + labelBase;
-		String sourceVar = "?" + sourceBase;
-		String conceptSemanticTypeLabelVar = "?" + conceptSemanticTypeLabelBase;
-		String conceptBroaderURIVar = "?" + conceptBroaderURIBase;
-		String conceptNarrowerURIVar = "?" + conceptNarrowerURIBase;
-		String prefixStr = "@prefix core: <http://vivoweb.org/ontology/core#> .";
-		// First one already included so add new ones here
-		//We already have a label var to uri var setup
-		for (index = 1; index <= numberConcepts; index++) {
-			//Set up the variables based on which concept node
-			int suffix = index;
-			String node = nodeBase + suffix;
-			String label = labelVar + suffix;
-			String source = sourceVar + suffix;
-			String conceptSemanticTypeLabel = conceptSemanticTypeLabelVar + suffix;
-			//get the URI appropriate for the concept semantic type label var
-			String conceptSemanticTypeURI = getConceptSemanticTypeURIVar(conceptSemanticTypeLabelBase + suffix, suffix); 
-			String conceptBroaderURI = conceptBroaderURIVar + suffix;
-			String conceptNarrowerURI = conceptNarrowerURIVar + suffix;
-			//Set up the n3 strings
-			String n3String = prefixStr;
-			n3String += node + " <" + RDFS.label.getURI() + "> " + label + " .\n" + 
-			        node + " <" + RDFS.isDefinedBy.getURI() + "> " + source + " ."; 
-			String n3ConceptTypeString = prefixStr;
-			n3ConceptTypeString += node + " <" + RDF.type.getURI() + "> " + conceptSemanticTypeURI + " ." + 
-			conceptSemanticTypeURI +  " <" + RDFS.label.getURI() + "> " + conceptSemanticTypeLabel + " .\n" + 
-	        conceptSemanticTypeURI +  " <" + RDFS.subClassOf.getURI() + "> <http://www.w3.org/2004/02/skos/core#Concept> .\n"  ;
-			//String representing the broader and narrower uri(s) for each of the concepts - these may or may not exist
-			String n3ConceptBroaderURI = prefixStr + node + " <" + this.SKOSNarrowerURI + "> " + conceptNarrowerURI + " ." + 
-		 	        conceptNarrowerURI + " <" + this.SKOSBroaderURI + "> " + node + " .";
-			String n3ConceptNarrowerURI = prefixStr + node + " <" + this.SKOSBroaderURI + "> " + conceptBroaderURI + " ." + 
-		 	    	conceptBroaderURI + " <" + this.SKOSNarrowerURI + "> " + node + " .";
-			
-			n3Optional.add(n3String);
-			//adding separately so their resolution does not depend on each other
-			n3Optional.add(n3ConceptTypeString);
-			n3Optional.add(n3ConceptBroaderURI);
-			n3Optional.add(n3ConceptNarrowerURI);
-
-		}
-		//Already have n3 required so need to add to that
-		
-		editConfiguration.setN3Optional(n3Optional);
-	}
-
-	//get the URI variable that is associated with this concept type URI, which might not be
-	//the same suffix because the same label value might be repeated and we need to use the same URI
-	//representing that concept semantic type
-	private String getConceptSemanticTypeURIVar(String labelVar, int suffix) {
-		// TODO Auto-generated method stub
-		return "?" + this.getConceptSemanticTypeURIFieldName(labelVar, suffix);
-	}
-	
-	private String getConceptSemanticTypeURIFieldName(String labelVar, int suffix) {
-		// TODO Auto-generated method stub
-		if(this.labelVarToUriVarHash.containsKey(labelVar)) {
-			return this.labelVarToUriVarHash.get(labelVar);
-		}
-		return this.conceptSemanticTypeURIBase + suffix;
-	}
-
-	private String[] convertDelimitedStringToArray(String inputString) {
-		String[] inputArray = new String[1];
-		if (inputString.indexOf(",") != -1) {
-			inputArray = inputString.split(",");
-		} else {
-			inputArray[0] = inputString;
-		}
-		return inputArray;
-
-	}
-	
-	
-	//Get values from submission 
-	private String getConceptNodeValues() {
-		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
-		List<String> conceptNodes =  urisFromForm.get("conceptNode");
-		return (String) getFirstElement(conceptNodes);
-	}
-	
-	private String getConceptSourceValues() {
-		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
-		return (String) getFirstElement(urisFromForm.get("conceptSource"));
-	}
-	
-	private String getConceptLabelValues() {
-		Map<String, List<Literal>> literalsFromForm = submission.getLiteralsFromForm();
-		Map<String, List<String>> transformed = EditConfigurationUtils.transformLiteralMap(literalsFromForm);
-		return (String) getFirstElement(transformed.get("conceptLabel"));
-
-	}
-	
-	private String getConceptSemanticTypeLabelValues() {
-		Map<String, List<Literal>> literalsFromForm = submission.getLiteralsFromForm();
-		Map<String, List<String>> transformed = EditConfigurationUtils.transformLiteralMap(literalsFromForm);
-		String label = (String) getFirstElement(transformed.get("conceptSemanticTypeLabel"));
-		if(label == null) {
-			label = "";
-		}
-		
-		return label;
-	}
-	
-	//This will either generate or retrieve URIs for the concept semantic type labels if they exist
-	//We will then update the submission to include this 
-		private String getConceptSemanticTypeURIValues() {
-			StringBuilder pseudoInputString = new StringBuilder();
-			if(conceptSemanticTypeLabelValues !=  null && !conceptSemanticTypeLabelValues.isEmpty()) {
-				String[] conceptSemanticTypeLabels = convertDelimitedStringToArray(conceptSemanticTypeLabelValues);
-				//keep track of what label values already exist and to which label variables they map
-				HashMap<String, List<Integer>> labelValueToVarSuffix = new HashMap<String, List<Integer>>();
-				int numberLabels = conceptSemanticTypeLabels.length;
-				
-				//The rest of this code is really only relevant for multiple values, so we could break out the old code above
-				//as we don't need to set up hashes etc. if there is only one concept node being added
-				if(numberLabels == 1) {
-					String label = conceptSemanticTypeLabels[0];
-					String  uri = getURIForSemanticTypeLabel(label);
-					if(!StringUtils.isEmpty(uri)) {
-						String[] urisToAdd = new String[1];
-						urisToAdd[0] = uri;
-						pseudoInputString = new StringBuilder(uri);
-						log.debug("uris to add" + uri);
-						submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd);
-					}
-					
-				}
-				//if there is more than one concept node, we may have duplicate semantic types
-				//which will need to be referred to by the same semantic type uri
-				else if (numberLabels > 1){
-				
-					for(int i = 0; i < numberLabels; i++) {
-						int suffix = i + 1;
-						String label = conceptSemanticTypeLabels[i];
-						String labelVar = this.conceptSemanticTypeLabelBase + suffix;
-						//if label has not already been encountered, create entry for label value
-						//and list with the label variables that would refer to it
-						//for unique values, the uri variable will be the same as label
-						Integer thisSuffix = new Integer(suffix);
-						if(!labelValueToVarSuffix.containsKey(label)) {
-							labelValueToVarSuffix.put(label, new ArrayList<Integer>());
-							//Add suffix to list if not already there
-							labelValueToVarSuffix.get(label).add(thisSuffix);
-						} else {
-							//in this case, the label already exists, get the very first element in the list
-							//and use that as the uri variable
-							List<Integer> suffixList = labelValueToVarSuffix.get(label);
-							if(suffixList != null && suffixList.size() > 0) {
-								thisSuffix = suffixList.get(0);
-							}
-							
-						}
-						
-						//Now add the uri var to the hash mapping label variable to uri variable
-						String uriVar = this.conceptSemanticTypeURIBase + thisSuffix.intValue();
-						this.labelVarToUriVarHash.put(labelVar, uriVar);
-						
-						
-						//Make or retrieve URI for this label
-						//TODO: Do we create this string with empty inputs ?
-						String  uri = getURIForSemanticTypeLabel(label);
-						if(!StringUtils.isEmpty(uri)) {
-							//uri var shouldn't be repeated?
-							if(!this.conceptSemanticTypeURIVarToValueMap.containsKey(uriVar)) {
-							this.conceptSemanticTypeURIVarToValueMap.put(uriVar, new ArrayList<String>());
-							this.conceptSemanticTypeURIVarToValueMap.get(uriVar).add(uri);
-							}
-						}
-						if(i != 0) {
-							pseudoInputString.append(",");
-						}
-						pseudoInputString.append(uri);
-					
-					}
-					
-					//Add this string to the uris for the form
-					String[] urisToAdd = new String[1];
-					urisToAdd[0] = pseudoInputString.toString();
-					log.debug("uris to add" + pseudoInputString);
-					submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd);
-					
-				}
-			}
-			return pseudoInputString.toString();
-		}
-		
-	private String getURIForSemanticTypeLabel(String label) {
-		String existingURI = this.getExistingSemanticTypeURI(label);
-		if(existingURI != null) {
-			return existingURI;
-		}
-		//if we leave this as null, we should be able to generate a new resource
-		//empty string because there may be more than one value returned for labels
-		else return "";
-		
-	}
-	
-	private String getExistingSemanticTypeURI(String label) {
-		String queryStr = "SELECT ?semanticType WHERE { ?semanticType <" + RDF.type.getURI() + "> <" + OWL.Class.getURI() + "> . " + 
-				"?semanticType <" + RDFS.label.getURI() + "> \"" + label + "\"^^<http://www.w3.org/2001/XMLSchema#string>  . }";
-		 QueryExecution qe = null;
-	        try{
-	            Query query = QueryFactory.create(queryStr);
-	            qe = QueryExecutionFactory.create(query, this.ontModel);
-                ResultSet results = null;
-                results = qe.execSelect();
-                
-                while( results.hasNext()){
-                	QuerySolution qs = results.nextSolution();
-                	if(qs.get("semanticType") != null) {
-                		Resource semanticTypeURI = qs.getResource("semanticType");
-                		log.debug("Semantic Type URI returned " + semanticTypeURI.getURI());
-                		return semanticTypeURI.getURI();
-                	}
-                }
-	        }catch(Exception ex){
-	            throw new Error("Error in executing query string: \n" + queryStr + '\n' + ex.getMessage());
-	        }finally{
-	            if( qe != null)
-	                qe.close();
-	        }
-		return null;
-	}
-	
-	private Object getFirstElement(List inputList) {
-		if(inputList == null || inputList.size() == 0)
-			return null;
-		return inputList.get(0);
-	}
-	
-	
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.vocabulary.OWL;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
+import org.apache.jena.vocabulary.XSD;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
+
+public class AddAssociatedConceptsPreprocessor extends
+		BaseEditSubmissionPreprocessorVTwo {
+
+	protected static final Log log = LogFactory
+			.getLog(AddAssociatedConceptsPreprocessor.class.getName());
+	protected OntModel ontModel = null;
+	protected WebappDaoFactory wdf = null;
+	// Field names/variables names for n3 - these will have numbers added as
+	// suffix if more than one term
+	private static String conceptNodeBase = "conceptNode";
+	private static String sourceBase = "conceptSource";
+	private static String labelBase = "conceptLabel";
+	private static String conceptSemanticTypeLabelBase = "conceptSemanticTypeLabel";
+	private static String conceptSemanticTypeURIBase = "conceptSemanticTypeURI";
+	private static String conceptBroaderURIBase = "conceptBroaderURI";
+	private static String conceptNarrowerURIBase = "conceptNarrowerURI";
+
+	//keyed off label variable, specifies which uri variable should be used, useful if same label repeated twice
+	private HashMap<String, String> labelVarToUriVarHash = null;
+	private HashMap<String, List<String>> conceptSemanticTypeURIVarToValueMap = null;
+	//Also storing submission values
+	private static String conceptNodeValues = null;
+	private static String conceptLabelValues = null;
+	private static String conceptSourceValues = null;
+	private static String conceptSemanticTypeLabelValues = null;
+	private static String conceptSemanticTypeURIValues = null;
+	private static List<String> conceptBroaderURIValues =  null;
+	private static List<String> conceptNarrowerURIValues = null;
+	private static MultiValueEditSubmission submission = null;
+
+	private static String SKOSBroaderURI = "http://www.w3.org/2004/02/skos/core#broader";
+	private static String SKOSNarrowerURI = "http://www.w3.org/2004/02/skos/core#narrower";
+	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";
+
+	// String datatype
+
+	// Will be editing the edit configuration as well as edit submission here
+
+	public AddAssociatedConceptsPreprocessor(EditConfigurationVTwo editConfig) {
+		super(editConfig);
+		this.labelVarToUriVarHash = new HashMap<String, String>();
+		//Saves values of concept type uris
+		this.conceptSemanticTypeURIVarToValueMap = new HashMap<String, List<String>>();
+	}
+
+	public void preprocess(MultiValueEditSubmission inputSubmission, VitroRequest vreq) {
+		submission = inputSubmission;
+		this.wdf = vreq.getWebappDaoFactory();
+		this.ontModel = ModelAccess.on(vreq).getOntModel();
+		//Set the models that we need here
+		// Get the input elements for concept node and concept label as well
+		// as vocab uri (which is based on thge
+		// For query parameters, check whether CUI
+		copySubmissionValues();
+
+
+		if (conceptNodeValues != null) {
+			String[] conceptNodes = convertDelimitedStringToArray(conceptNodeValues);
+			int numberConcepts = conceptNodes.length;
+			//This will put the URI value in scope for the first semantic type label
+			//and generate the rest if need be
+			processConceptSemanticValues();
+			//Also need to see if any broader or narrower uris for the concepts that already exist in the system
+			//and set up the appropriate relationships between this concept and the broader/narrower uri
+			getExistingConceptRelationships();
+			if (numberConcepts > 1) {
+				processConceptNodes(numberConcepts);
+			}
+
+		} else {
+			log.error("No concept nodes were added from the service");
+		}
+
+	}
+
+
+
+	//Since we will change the uris and literals from form, we should make copies
+	//of the original values and store them, this will also make iterations
+	//and updates to the submission independent from accessing the values
+	private void copySubmissionValues() {
+		conceptLabelValues = getConceptLabelValues();
+		conceptNodeValues = getConceptNodeValues();
+		conceptSourceValues = getConceptSourceValues();
+		conceptBroaderURIValues = getConceptBroaderURIValues();
+		conceptNarrowerURIValues = getConceptNarrowerURIValues();
+		log.debug("concept label values are " + conceptLabelValues);
+
+	}
+
+
+	//For broader and narrower relationships, we will be
+	//linking the concept to broader and narrower terms where those terms already
+	//exist in the system
+	//This method or approach may change later in which case this method should change
+	private void getExistingConceptRelationships() {
+		List<String> existingNarrowerURIs = getExistingNarrowerURIs(conceptNarrowerURIValues);
+		List<String> existingBroaderURIs = getExistingBroaderURIs(conceptBroaderURIValues);
+		//Now set the submission values to these, overwriting the original
+		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
+		if(existingNarrowerURIs.size() > 0) {
+			urisFromForm.put("conceptNarrowerURI", existingNarrowerURIs);
+		} else {
+			//The original code for submission wouldn't put in a key if the values were null or size 0
+			urisFromForm.remove("conceptNarrowerURI");
+		}
+		//Set the copied values to this value as well so when if there are multiple
+		//concepts, the inputs get copied correctly for each of them
+		this.conceptNarrowerURIValues = existingNarrowerURIs;
+		if(existingBroaderURIs.size() > 0) {
+			urisFromForm.put("conceptBroaderURI", existingBroaderURIs);
+		} else {
+			urisFromForm.remove("conceptBroaderURI");
+		}
+		this.conceptBroaderURIValues = existingBroaderURIs;
+	}
+
+	//get the broader and narrower uri values that already exist in the system from the ones returned in the search
+	//and use those to populate relationships between the concept and other concepts already in the system
+	//We should also make sure to use bidirectional n3 so the graph has both sets of relationships represented
+	private List<String> getConceptNarrowerURIValues() {
+		return this.getJSONFormURIValues("conceptNarrowerURI");
+	}
+
+	private List<String> getConceptBroaderURIValues() {
+		return this.getJSONFormURIValues("conceptBroaderURI");
+	}
+
+	private List<String> getJSONFormURIValues(String varName) {
+		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
+		List<String> uris =  urisFromForm.get(varName);
+		//This should be a JSON object stringified
+		if(uris.size() > 0) {
+			String jsonString = uris.get(0);
+			if(jsonString != null && !jsonString.isEmpty()) {
+				JsonNode json = JacksonUtils.parseJson(jsonString);
+				//This should be an array
+				if(json.isArray()) {
+					ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(jsonString);
+					//Convert to list of strings
+					return convertJsonArrayToList(jsonArray);
+				}
+			}
+		}
+		return uris;
+	}
+
+	private List<String> convertJsonArrayToList(ArrayNode jsonArray) {
+		List<String> stringList = new ArrayList<String>();
+		int len = jsonArray.size();
+		int i = 0;
+		for(i = 0; i < len; i++) {
+			stringList.add(jsonArray.get(i).asText());
+		}
+		return stringList;
+	}
+
+	private List<String> getExistingBroaderURIs(List<String> broaderURIs) {
+		if(broaderURIs == null) {
+			return new ArrayList<String>();
+		}
+		List<String> existingBroaderURIs = this.getExistingURIs(broaderURIs);
+		return existingBroaderURIs;
+	}
+
+	private List<String> getExistingNarrowerURIs(List<String> narrowerURIs) {
+		if(narrowerURIs == null)
+			return new ArrayList<String>();
+		List<String> existingNarrowerURIs = this.getExistingURIs(narrowerURIs);
+		return existingNarrowerURIs;
+	}
+
+	//We need to keep the number of elements the same if there are any entries at all in the original
+	//So we will use an empty string or null
+	private List<String> getExistingURIs(List<String> uris) {
+		//Important to keep the same formatting as original, because a comma delimited string as an element in the array
+		//refers to a list of uris appropriate for a given concept, where each element in the array corresponds to a different
+		//concept
+		List<String> existingURIs = new ArrayList<String>();
+		for(String uri:uris) {
+			if(uri.indexOf(",") != -1) {
+				List<String> existingURISet = new ArrayList<String>();
+				String[] uriSet = uri.split(",");
+				for(String u: uriSet) {
+					if(u !=  null && !u.isEmpty() && this.wdf.hasExistingURI(u)) {
+						existingURISet.add(u);
+					}
+				}
+				//Now add the comma delimited version back to the array
+				if(existingURISet.size() > 0) {
+					existingURIs.add(StringUtils.join(existingURISet, ","));
+				} else {
+					//add empty string to indicate no value here
+					existingURIs.add("");
+				}
+			} else {
+				if(uri != null && !uri.isEmpty() && this.wdf.hasExistingURI(uri)) {
+					existingURIs.add(uri);
+				}
+				else
+				{
+					existingURIs.add("");
+				}
+
+			}
+		}
+		return existingURIs;
+	}
+
+
+	//Process the semantic type label and URI values for the concepts
+	private void processConceptSemanticValues() {
+		conceptSemanticTypeLabelValues = getConceptSemanticTypeLabelValues();
+		conceptSemanticTypeURIValues = getConceptSemanticTypeURIValues();
+
+		//We are first going to handle the single value case and then handle additional values
+		//where the rest of the additional values are handled
+
+	}
+
+
+	//This is for additional concept nodes (i.e. if user selects more than one concept)
+	private void processConceptNodes(int numberConcepts) {
+		//There are no "new" resources b/c the concept nodes are URIs from external vocabularies
+		//New resources for concept semantic type uris
+		addNewResources(numberConcepts);
+		// Add N3Required
+		addN3Required(numberConcepts);
+		//Add N3 Optional as well
+		addN3Optional(numberConcepts);
+		// Add URIs on Form and Add Literals On Form
+		addLiteralsAndUrisOnForm(numberConcepts);
+		// Add fields
+		addFields(numberConcepts);
+		//Add input values to submission
+		addInputsToSubmission(numberConcepts);
+
+	}
+
+	//This is specifically for concept semantic type URIs which may need to be generated
+	private void addNewResources(int numberConcepts) {
+		// TODO Auto-generated method stub
+		addConceptSemanticTypeURIResources(numberConcepts);
+	}
+
+	private void addConceptSemanticTypeURIResources(int numberConcepts) {
+		//Iterate through the labels and get the corresponding uris
+		HashSet<String> urisToAdd = new HashSet<String>();
+		String[] conceptSemanticTypeLabels= convertDelimitedStringToArray(conceptSemanticTypeLabelValues);
+		//the number of existing values may not match up, or at least existing populated ones
+		//Now we can't determine whether all concepts will have semantic types - at some point what if
+		//we ran a search across all external vocabularies? So we can't compare labels to number of concepts
+		//but we can ensure that it isn't greater than then number of concepts
+		if(conceptSemanticTypeLabels != null && conceptSemanticTypeLabels.length <= numberConcepts) {
+			int i;
+			for(i = 0; i < numberConcepts; i++) {
+				int suffix = i + 1;
+				String conceptSemanticTypeLabelVar = conceptSemanticTypeLabelBase + suffix;
+				if(this.labelVarToUriVarHash.containsKey(conceptSemanticTypeLabelVar)) {
+					String newResourceName = this.labelVarToUriVarHash.get(conceptSemanticTypeLabelVar);
+					if(!urisToAdd.contains(newResourceName)) {
+						urisToAdd.add(newResourceName);
+						editConfiguration.addNewResource(newResourceName, null);
+					}
+				}
+
+			}
+		} else if(conceptSemanticTypeLabels != null && conceptSemanticTypeLabels.length > numberConcepts){
+			log.error("Number of concept semantic type labels is greater than number of concepts");
+		} else{
+			log.error("Concept semantic type labels returned are null");
+		}
+
+	}
+
+	//This is where the actual values will be submitted as if they were separate input fields
+	//Each field name will correspond to the names of the fileds/uris on form/literals on form
+	//generated here
+
+	private void addInputsToSubmission(int numberConcepts) {
+		//This will essentially manufacture a set of query parameters
+		//And will add the appropriate fields to the multivalue submission
+		addConceptNodeInputs(numberConcepts);
+		addConceptSourceInputs(numberConcepts);
+		addConceptLabelInputs(numberConcepts);
+		//for concept semantic type  labels and uris where they exist
+		addConceptSemanticTypeLabelAndURIInputs(numberConcepts);
+		//For broader and narrower uris where they exist (this of course is in the case of multiple broader and narrower uris
+		addConceptBroaderURIInputs(numberConcepts);
+		addConceptNarrowerURIInputs(numberConcepts);
+	}
+
+	private void addConceptNodeInputs(int numberConcepts) {
+
+		String[] conceptNodes = convertDelimitedStringToArray(conceptNodeValues);
+		if(conceptNodes != null && conceptNodes.length == numberConcepts) {
+			int i;
+			//iterate through the concept nodes converted string array
+			for(i = 0; i < numberConcepts; i++) {
+				int suffix = i + 1;
+				String conceptInputName = conceptNodeBase + suffix;
+				String[] nodeValues = new String[1];
+				nodeValues[0] = conceptNodes[i];
+				//Add value for uri to form
+				submission.addUriToForm(editConfiguration, conceptInputName, nodeValues);
+			}
+		} else if(conceptNodes != null && conceptNodes.length != numberConcepts){
+			log.error("Number of concept nodes did not match the number of concepts to be added");
+		} else{
+			log.error("Concept nodes returned were null");
+		}
+
+	}
+
+	private void addConceptSourceInputs(int numberConcepts) {
+		String[] conceptSources = convertDelimitedStringToArray(conceptSourceValues);
+		if(conceptSources != null && conceptSources.length == numberConcepts) {
+			int i;
+			for(i = 0; i < numberConcepts; i++) {
+				int suffix = i + 1;
+				String conceptInputName = sourceBase + suffix;
+				String[] sourceValues = new String[1];
+				sourceValues[0] = conceptSources[i];
+				//Add value for uri to form
+				submission.addUriToForm(editConfiguration, conceptInputName, sourceValues);
+			}
+		} else if(conceptSources != null && conceptSources.length != numberConcepts){
+			log.error("Number of concept nodes did not match the number of concepts to be added");
+		} else{
+			log.error("Concept nodes returned were null");
+		}
+	}
+
+	private void addConceptLabelInputs(int numberConcepts) {
+		String[] labels = convertDelimitedStringToArray(conceptLabelValues);
+		if(labels != null && labels.length == numberConcepts) {
+			int i;
+			for(i = 0; i < numberConcepts; i++) {
+				int suffix = i + 1;
+				String labelInputName = labelBase + suffix;
+				String[] labelValues = new String[1];
+				labelValues[0] = labels[i];
+				//TODO: Check if there are no funky typed information also stored
+				//At this point the field should already have been added to edit configuration
+				FieldVTwo labelField = editConfiguration.getField(labelInputName);
+				if(labelField != null) {
+					submission.addLiteralToForm(editConfiguration, labelField, labelInputName, labelValues);
+				} else {
+					log.error("Corresponding field for " + labelInputName + " was not added to edit configuration");
+				}
+
+			}
+		} else if(labels != null && labels.length != numberConcepts){
+			log.error("Number of concept labels did not match the number of concepts to be added");
+		} else{
+			log.error("Concept labels returned were null");
+		}
+	}
+
+	private void addConceptSemanticTypeLabelAndURIInputs(int numberConcepts) {
+		String[] labels = convertDelimitedStringToArray(conceptSemanticTypeLabelValues);
+		HashSet<String> uniqueLabelValues = new HashSet<String>();
+		if(labels != null && labels.length == numberConcepts) {
+			int i;
+			for(i = 0; i < numberConcepts; i++) {
+				String thisLabel = labels[i];
+				int suffix = i + 1;
+				String labelInputName = conceptSemanticTypeLabelBase + suffix;
+				String[] labelValues = new String[1];
+				labelValues[0] = thisLabel;
+				//TODO: Check if there are no funky typed information also stored
+				//At this point the field should already have been added to edit configuration
+				FieldVTwo labelField = editConfiguration.getField(labelInputName);
+				//TODO: Also check to see whether the label is actually populate or will n3 editing take care of that?
+				if(labelField != null) {
+					submission.addLiteralToForm(editConfiguration, labelField, labelInputName, labelValues);
+					//Associate URI
+					if(!uniqueLabelValues.contains(thisLabel)) {
+						uniqueLabelValues.add(thisLabel);
+						this.addConceptSemanticTypeURIInputForLabel(labelInputName, suffix);
+					}
+				} else {
+					log.error("Corresponding field for " + labelInputName + " was not added to edit configuration");
+				}
+
+			}
+		} else if(labels != null && labels.length != numberConcepts){
+			log.error("Number of concept semantic type labels did not match the number of concepts to be added");
+		} else{
+			log.error("Concept labels returned were null");
+		}
+	}
+
+	private void addConceptSemanticTypeURIInputForLabel(String conceptSemanticTypeLabel, int suffix) {
+		//String[] conceptSemanticTypeURIs= convertDelimitedStringToArray(conceptSemanticTypeURIValues);
+
+		//Get the semantic type URI variable name associated with this label
+		String uriInputName = this.getConceptSemanticTypeURIFieldName(conceptSemanticTypeLabel, suffix);
+		//List<>
+		if(this.conceptSemanticTypeURIVarToValueMap.containsKey(uriInputName)) {
+			List<String> uriVals = this.conceptSemanticTypeURIVarToValueMap.get(uriInputName);
+			String[] uriValuesArray = uriVals.toArray(new String[uriVals.size()]);
+			submission.addUriToForm(editConfiguration, uriInputName, uriValuesArray);
+		}
+	}
+
+	private void addConceptBroaderURIInputs(int numberConcepts) {
+		int i;
+		//Add inputs based on if there are any broader uris to add
+		//Can't really compare number of existing broader uris to concepts
+		//as each concept may or may not have a broader uri
+		if(this.conceptBroaderURIValues.size() > 0 && this.conceptBroaderURIValues.size() <= numberConcepts) {
+			for(i = 0; i < numberConcepts; i++) {
+				int suffix = i + 1;
+				String conceptBroaderURIInputName = conceptBroaderURIBase + suffix;
+				String broaderURIs = this.conceptBroaderURIValues.get(i);
+				if(broaderURIs != null && !broaderURIs.isEmpty()) {
+					String[] broaderURISet = new String[1];
+					if(broaderURIs.indexOf(",") != -1) {
+						broaderURISet = broaderURIs.split(",");
+					} else {
+						broaderURISet[0] = broaderURIs;
+					}
+					//Add value for uri to form
+					submission.addUriToForm(editConfiguration, conceptBroaderURIInputName, broaderURISet);
+				}
+			}
+		}
+
+	}
+	private void addConceptNarrowerURIInputs(int numberConcepts) {
+		int i;
+		if(this.conceptNarrowerURIValues.size() > 0 && this.conceptNarrowerURIValues.size() <= numberConcepts) {
+			for(i = 0; i < numberConcepts; i++) {
+				int suffix = i + 1;
+				String conceptNarrowerURIInputName = conceptNarrowerURIBase + suffix;
+				String narrowerURIs = this.conceptNarrowerURIValues.get(i);
+				if(narrowerURIs != null && !narrowerURIs.isEmpty()) {
+					String[] narrowerURISet = new String[1];
+					if(narrowerURIs.indexOf(",") != -1) {
+						narrowerURISet = narrowerURIs.split(",");
+					} else {
+						narrowerURISet[0] = narrowerURIs;
+					}
+					//Add value for uri to form
+					submission.addUriToForm(editConfiguration, conceptNarrowerURIInputName, narrowerURISet);
+				}
+			}
+		}
+	}
+
+	//Fields
+
+	private void addFields(int numberConcepts) {
+		//Clear out all fields in edit configuration first
+		editConfiguration.setFields(new HashMap<String, FieldVTwo>());
+		int index;
+		HashSet<String> conceptSemanticTypeUris = new HashSet<String>();
+		// First one already included in generator so add additional ones here
+		for (index = 1; index <= numberConcepts; index++) {
+			int suffix = index;
+			String conceptNode = conceptNodeBase + suffix;
+			String label = labelBase + suffix;
+			String source = sourceBase + suffix;
+			String conceptSemanticTypeLabel = conceptSemanticTypeLabelBase + suffix;
+			String conceptSemanticTypeURI = this.getConceptSemanticTypeURIFieldName(conceptSemanticTypeLabel, suffix);
+			String conceptBroaderURI = conceptBroaderURIBase + suffix;
+			String conceptNarrowerURI = conceptNarrowerURIBase + suffix;
+			addConceptNodeField(conceptNode);
+			addLabelField(label);
+			addSourceField(source);
+			//Also add fields for concept semantic type label
+			addConceptSemanticTypeLabelField(conceptSemanticTypeLabel);
+			//and concept semantic type URI
+			if(!conceptSemanticTypeUris.contains(conceptSemanticTypeURI)) {
+				conceptSemanticTypeUris.add(conceptSemanticTypeURI);
+				addConceptSemanticTypeURIField(conceptSemanticTypeURI);
+			}
+
+			//add fields for concept broader and narrower uris
+			addConceptBroaderURIField(conceptBroaderURI);
+			addConceptNarrowerURIField(conceptNarrowerURI);
+		}
+	}
+
+
+
+	private void addConceptNodeField(String conceptNode) {
+		List<String> validators = new ArrayList<String>();
+		validators.add("nonempty");
+		editConfiguration.addField(new FieldVTwo().
+				setName(conceptNode).
+				setValidators(validators));
+	}
+
+	private void addLabelField(String label) {
+		editConfiguration.addField(new FieldVTwo().
+				setName(label).
+				setRangeDatatypeUri(XSD.xstring.toString())
+				);
+
+	}
+
+	private void addSourceField(String source) {
+		editConfiguration.addField(new FieldVTwo().
+				setName(source));
+
+	}
+
+	//TODO: Do we need to check if label is empty string?
+	private void addConceptSemanticTypeLabelField(String label) {
+		if(label != null) {
+			editConfiguration.addField(new FieldVTwo().
+					setName(label).
+					setRangeDatatypeUri(XSD.xstring.toString())
+					);
+		}
+
+	}
+
+	private void addConceptSemanticTypeURIField(String conceptSemanticTypeURI) {
+		if(conceptSemanticTypeURI != null) {
+			editConfiguration.addField(new FieldVTwo().
+					setName(conceptSemanticTypeURI));
+		}
+	}
+
+	private void addConceptNarrowerURIField(String conceptNarrowerURI) {
+		editConfiguration.addField(new FieldVTwo().
+				setName(conceptNarrowerURI));
+
+	}
+
+	private void addConceptBroaderURIField(String conceptBroaderURI) {
+		editConfiguration.addField(new FieldVTwo().
+				setName(conceptBroaderURI));
+
+	}
+
+	//original literals on form: label, uris on form: conceptNode and conceptSource
+	//This will overwrite the original values in the edit configuration
+	private void addLiteralsAndUrisOnForm(int numberTerms) {
+		List<String> urisOnForm = new ArrayList<String>();
+		List<String> literalsOnForm = new ArrayList<String>();
+
+		int index;
+		HashSet<String> conceptSemanticTypeURIs = new HashSet<String>();
+		// First one already included so add new ones here
+		for (index = 1; index <= numberTerms; index++) {
+			int suffix = index;
+			String conceptNode = conceptNodeBase + suffix;
+			String label = labelBase + suffix;
+			String source = sourceBase + suffix;
+			String conceptSemanticTypeLabel = conceptSemanticTypeLabelBase + suffix;
+			//String conceptSemanticTypeURI = conceptSemanticTypeURIBase + suffix;
+			String conceptSemanticTypeURI = this.getConceptSemanticTypeURIFieldName(conceptSemanticTypeLabel, suffix);
+			String conceptBroaderURI = conceptBroaderURIBase + suffix;
+			String conceptNarrowerURI = conceptNarrowerURIBase + suffix;
+			urisOnForm.add(conceptNode);
+			urisOnForm.add(source);
+			if(!conceptSemanticTypeURIs.contains(conceptSemanticTypeURI)) {
+				conceptSemanticTypeURIs.add(conceptSemanticTypeURI);
+				urisOnForm.add(conceptSemanticTypeURI);
+			}
+			urisOnForm.add(conceptBroaderURI);
+			urisOnForm.add(conceptNarrowerURI);
+			literalsOnForm.add(label);
+			literalsOnForm.add(conceptSemanticTypeLabel);
+		}
+		editConfiguration.setUrisOnform(urisOnForm);
+		editConfiguration.setLiteralsOnForm(literalsOnForm);
+	}
+
+	// N3 being reproduced
+	/*
+	 * ?subject ?predicate ?conceptNode .
+	 */
+	//This will overwrite the original with the set of new n3 required
+	private void addN3Required(int numberConcepts) {
+		// List<String> n3Required = editConfig.getN3Required();
+		List<String> n3Required = new ArrayList<String>();
+		int index;
+		String nodeBase = "?" + conceptNodeBase;
+
+		String prefixStr = "@prefix core: <http://vivoweb.org/ontology/core#> .";
+		// First one already included so add new ones here
+		for (index = 1; index <= numberConcepts; index++) {
+			int suffix = index;
+			String node = nodeBase + suffix;
+			String n3String = prefixStr;
+			n3String += "?subject ?predicate " + node + " . \n" +
+			node + " <" + RDF.type.getURI() + "> <" + this.SKOSConceptType + "> .";
+			n3Required.add(n3String);
+		}
+		editConfiguration.setN3Required(n3Required);
+	}
+	//Add n3 optional
+	//TODO: Rewrite optional N3
+	private void addN3Optional(int numberConcepts) {
+		List<String> n3Optional = new ArrayList<String>();
+		int index;
+		String nodeBase = "?" + conceptNodeBase;
+		String labelVar = "?" + labelBase;
+		String sourceVar = "?" + sourceBase;
+		String conceptSemanticTypeLabelVar = "?" + conceptSemanticTypeLabelBase;
+		String conceptBroaderURIVar = "?" + conceptBroaderURIBase;
+		String conceptNarrowerURIVar = "?" + conceptNarrowerURIBase;
+		String prefixStr = "@prefix core: <http://vivoweb.org/ontology/core#> .";
+		// First one already included so add new ones here
+		//We already have a label var to uri var setup
+		for (index = 1; index <= numberConcepts; index++) {
+			//Set up the variables based on which concept node
+			int suffix = index;
+			String node = nodeBase + suffix;
+			String label = labelVar + suffix;
+			String source = sourceVar + suffix;
+			String conceptSemanticTypeLabel = conceptSemanticTypeLabelVar + suffix;
+			//get the URI appropriate for the concept semantic type label var
+			String conceptSemanticTypeURI = getConceptSemanticTypeURIVar(conceptSemanticTypeLabelBase + suffix, suffix);
+			String conceptBroaderURI = conceptBroaderURIVar + suffix;
+			String conceptNarrowerURI = conceptNarrowerURIVar + suffix;
+			//Set up the n3 strings
+			String n3String = prefixStr;
+			n3String += node + " <" + RDFS.label.getURI() + "> " + label + " .\n" +
+			        node + " <" + RDFS.isDefinedBy.getURI() + "> " + source + " .";
+			String n3ConceptTypeString = prefixStr;
+			n3ConceptTypeString += node + " <" + RDF.type.getURI() + "> " + conceptSemanticTypeURI + " ." +
+			conceptSemanticTypeURI +  " <" + RDFS.label.getURI() + "> " + conceptSemanticTypeLabel + " .\n" +
+	        conceptSemanticTypeURI +  " <" + RDFS.subClassOf.getURI() + "> <http://www.w3.org/2004/02/skos/core#Concept> .\n"  ;
+			//String representing the broader and narrower uri(s) for each of the concepts - these may or may not exist
+			String n3ConceptBroaderURI = prefixStr + node + " <" + this.SKOSNarrowerURI + "> " + conceptNarrowerURI + " ." +
+		 	        conceptNarrowerURI + " <" + this.SKOSBroaderURI + "> " + node + " .";
+			String n3ConceptNarrowerURI = prefixStr + node + " <" + this.SKOSBroaderURI + "> " + conceptBroaderURI + " ." +
+		 	    	conceptBroaderURI + " <" + this.SKOSNarrowerURI + "> " + node + " .";
+
+			n3Optional.add(n3String);
+			//adding separately so their resolution does not depend on each other
+			n3Optional.add(n3ConceptTypeString);
+			n3Optional.add(n3ConceptBroaderURI);
+			n3Optional.add(n3ConceptNarrowerURI);
+
+		}
+		//Already have n3 required so need to add to that
+
+		editConfiguration.setN3Optional(n3Optional);
+	}
+
+	//get the URI variable that is associated with this concept type URI, which might not be
+	//the same suffix because the same label value might be repeated and we need to use the same URI
+	//representing that concept semantic type
+	private String getConceptSemanticTypeURIVar(String labelVar, int suffix) {
+		// TODO Auto-generated method stub
+		return "?" + this.getConceptSemanticTypeURIFieldName(labelVar, suffix);
+	}
+
+	private String getConceptSemanticTypeURIFieldName(String labelVar, int suffix) {
+		// TODO Auto-generated method stub
+		if(this.labelVarToUriVarHash.containsKey(labelVar)) {
+			return this.labelVarToUriVarHash.get(labelVar);
+		}
+		return this.conceptSemanticTypeURIBase + suffix;
+	}
+
+	private String[] convertDelimitedStringToArray(String inputString) {
+		String[] inputArray = new String[1];
+		if (inputString.indexOf(",") != -1) {
+			inputArray = inputString.split(",");
+		} else {
+			inputArray[0] = inputString;
+		}
+		return inputArray;
+
+	}
+
+
+	//Get values from submission
+	private String getConceptNodeValues() {
+		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
+		List<String> conceptNodes =  urisFromForm.get("conceptNode");
+		return (String) getFirstElement(conceptNodes);
+	}
+
+	private String getConceptSourceValues() {
+		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
+		return (String) getFirstElement(urisFromForm.get("conceptSource"));
+	}
+
+	private String getConceptLabelValues() {
+		Map<String, List<Literal>> literalsFromForm = submission.getLiteralsFromForm();
+		Map<String, List<String>> transformed = EditConfigurationUtils.transformLiteralMap(literalsFromForm);
+		return (String) getFirstElement(transformed.get("conceptLabel"));
+
+	}
+
+	private String getConceptSemanticTypeLabelValues() {
+		Map<String, List<Literal>> literalsFromForm = submission.getLiteralsFromForm();
+		Map<String, List<String>> transformed = EditConfigurationUtils.transformLiteralMap(literalsFromForm);
+		String label = (String) getFirstElement(transformed.get("conceptSemanticTypeLabel"));
+		if(label == null) {
+			label = "";
+		}
+
+		return label;
+	}
+
+	//This will either generate or retrieve URIs for the concept semantic type labels if they exist
+	//We will then update the submission to include this
+		private String getConceptSemanticTypeURIValues() {
+			StringBuilder pseudoInputString = new StringBuilder();
+			if(conceptSemanticTypeLabelValues !=  null && !conceptSemanticTypeLabelValues.isEmpty()) {
+				String[] conceptSemanticTypeLabels = convertDelimitedStringToArray(conceptSemanticTypeLabelValues);
+				//keep track of what label values already exist and to which label variables they map
+				HashMap<String, List<Integer>> labelValueToVarSuffix = new HashMap<String, List<Integer>>();
+				int numberLabels = conceptSemanticTypeLabels.length;
+
+				//The rest of this code is really only relevant for multiple values, so we could break out the old code above
+				//as we don't need to set up hashes etc. if there is only one concept node being added
+				if(numberLabels == 1) {
+					String label = conceptSemanticTypeLabels[0];
+					String  uri = getURIForSemanticTypeLabel(label);
+					if(!StringUtils.isEmpty(uri)) {
+						String[] urisToAdd = new String[1];
+						urisToAdd[0] = uri;
+						pseudoInputString = new StringBuilder(uri);
+						log.debug("uris to add" + uri);
+						submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd);
+					}
+
+				}
+				//if there is more than one concept node, we may have duplicate semantic types
+				//which will need to be referred to by the same semantic type uri
+				else if (numberLabels > 1){
+
+					for(int i = 0; i < numberLabels; i++) {
+						int suffix = i + 1;
+						String label = conceptSemanticTypeLabels[i];
+						String labelVar = this.conceptSemanticTypeLabelBase + suffix;
+						//if label has not already been encountered, create entry for label value
+						//and list with the label variables that would refer to it
+						//for unique values, the uri variable will be the same as label
+						Integer thisSuffix = new Integer(suffix);
+						if(!labelValueToVarSuffix.containsKey(label)) {
+							labelValueToVarSuffix.put(label, new ArrayList<Integer>());
+							//Add suffix to list if not already there
+							labelValueToVarSuffix.get(label).add(thisSuffix);
+						} else {
+							//in this case, the label already exists, get the very first element in the list
+							//and use that as the uri variable
+							List<Integer> suffixList = labelValueToVarSuffix.get(label);
+							if(suffixList != null && suffixList.size() > 0) {
+								thisSuffix = suffixList.get(0);
+							}
+
+						}
+
+						//Now add the uri var to the hash mapping label variable to uri variable
+						String uriVar = this.conceptSemanticTypeURIBase + thisSuffix.intValue();
+						this.labelVarToUriVarHash.put(labelVar, uriVar);
+
+
+						//Make or retrieve URI for this label
+						//TODO: Do we create this string with empty inputs ?
+						String  uri = getURIForSemanticTypeLabel(label);
+						if(!StringUtils.isEmpty(uri)) {
+							//uri var shouldn't be repeated?
+							if(!this.conceptSemanticTypeURIVarToValueMap.containsKey(uriVar)) {
+							this.conceptSemanticTypeURIVarToValueMap.put(uriVar, new ArrayList<String>());
+							this.conceptSemanticTypeURIVarToValueMap.get(uriVar).add(uri);
+							}
+						}
+						if(i != 0) {
+							pseudoInputString.append(",");
+						}
+						pseudoInputString.append(uri);
+
+					}
+
+					//Add this string to the uris for the form
+					String[] urisToAdd = new String[1];
+					urisToAdd[0] = pseudoInputString.toString();
+					log.debug("uris to add" + pseudoInputString);
+					submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd);
+
+				}
+			}
+			return pseudoInputString.toString();
+		}
+
+	private String getURIForSemanticTypeLabel(String label) {
+		String existingURI = this.getExistingSemanticTypeURI(label);
+		if(existingURI != null) {
+			return existingURI;
+		}
+		//if we leave this as null, we should be able to generate a new resource
+		//empty string because there may be more than one value returned for labels
+		else return "";
+
+	}
+
+	private String getExistingSemanticTypeURI(String label) {
+		String queryStr = "SELECT ?semanticType WHERE { ?semanticType <" + RDF.type.getURI() + "> <" + OWL.Class.getURI() + "> . " +
+				"?semanticType <" + RDFS.label.getURI() + "> \"" + label + "\"^^<http://www.w3.org/2001/XMLSchema#string>  . }";
+		 QueryExecution qe = null;
+	        try{
+	            Query query = QueryFactory.create(queryStr);
+	            qe = QueryExecutionFactory.create(query, this.ontModel);
+                ResultSet results = null;
+                results = qe.execSelect();
+
+                while( results.hasNext()){
+                	QuerySolution qs = results.nextSolution();
+                	if(qs.get("semanticType") != null) {
+                		Resource semanticTypeURI = qs.getResource("semanticType");
+                		log.debug("Semantic Type URI returned " + semanticTypeURI.getURI());
+                		return semanticTypeURI.getURI();
+                	}
+                }
+	        }catch(Exception ex){
+	            throw new Error("Error in executing query string: \n" + queryStr + '\n' + ex.getMessage());
+	        }finally{
+	            if( qe != null)
+	                qe.close();
+	        }
+		return null;
+	}
+
+	private Object getFirstElement(List inputList) {
+		if(inputList == null || inputList.size() == 0)
+			return null;
+		return inputList.get(0);
+	}
+
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java
index cbd7dcb48d..300a21deff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java
@@ -28,39 +28,39 @@
 public class ConceptSemanticTypesPreprocessor implements ModelChangePreprocessor {
 
 	private static String VIVOCore = "http://vivoweb.org/ontology/core#";
-	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";	
+	private static String SKOSConceptType = "http://www.w3.org/2004/02/skos/core#Concept";
 	private Log log = LogFactory.getLog(ConceptSemanticTypesPreprocessor.class);
 
-	
+
 	//Custom constructor
 	public ConceptSemanticTypesPreprocessor() {
 	}
-	
+
 	@Override
 	public void preprocess(Model retractionsModel, Model additionsModel,
 			HttpServletRequest request) {
 		VitroRequest vreq = new VitroRequest(request);
 		//Run a construct query against the additions model
-		String prefixes = "PREFIX rdfs:<" + RDFS.getURI() + "> " + 
-		"PREFIX owl:<http://www.w3.org/2002/07/owl#> " + 
-		"PREFIX rdf:<" + RDF.getURI() + ">" + 
-		"PREFIX skos:<http://www.w3.org/2004/02/skos/core#>";		
-		String constructQuery = prefixes + " CONSTRUCT { " + 
-				"?semanticType rdf:type owl:Class.  " + 
-				"?semanticType rdfs:subClassOf skos:Concept .  " + 
-				"?semanticType rdfs:label ?label.  " + 
-			"} WHERE { " + 
-				"?concept rdf:type ?semanticType.  " + 
-				"?semanticType rdfs:label ?label . " + 
-				"?semanticType rdfs:subClassOf skos:Concept . " + 
+		String prefixes = "PREFIX rdfs:<" + RDFS.getURI() + "> " +
+		"PREFIX owl:<http://www.w3.org/2002/07/owl#> " +
+		"PREFIX rdf:<" + RDF.getURI() + ">" +
+		"PREFIX skos:<http://www.w3.org/2004/02/skos/core#>";
+		String constructQuery = prefixes + " CONSTRUCT { " +
+				"?semanticType rdf:type owl:Class.  " +
+				"?semanticType rdfs:subClassOf skos:Concept .  " +
+				"?semanticType rdfs:label ?label.  " +
+			"} WHERE { " +
+				"?concept rdf:type ?semanticType.  " +
+				"?semanticType rdfs:label ?label . " +
+				"?semanticType rdfs:subClassOf skos:Concept . " +
 			"}";
-		
-		//Execute construct query 
+
+		//Execute construct query
 		 Model constructedModel = ModelFactory.createDefaultModel();
-	        
-	       
+
+
         log.debug("CONSTRUCT query string " + constructQuery);
-        
+
         Query query = null;
         try {
             query = QueryFactory.create(constructQuery, Syntax.syntaxARQ);
@@ -69,13 +69,13 @@ public void preprocess(Model retractionsModel, Model additionsModel,
                       "string. " + th.getMessage());
             log.error(constructQuery);
             return;
-        } 
-	        
-	           
-	        
+        }
+
+
+
         additionsModel.getLock().enterCriticalSection(Lock.READ);
         QueryExecution qe = null;
-        try {                           
+        try {
             qe = QueryExecutionFactory.create(
                     query, additionsModel);
             qe.execConstruct(constructedModel);
@@ -87,7 +87,7 @@ public void preprocess(Model retractionsModel, Model additionsModel,
             }
             additionsModel.getLock().leaveCriticalSection();
         }
-        
+
         //Add constructed model to the designated update model
         OntModel toUpdateModel = ModelAccess.on(vreq).getOntModelSelector().getTBoxModel();
         toUpdateModel.enterCriticalSection(Lock.WRITE);
@@ -98,7 +98,7 @@ public void preprocess(Model retractionsModel, Model additionsModel,
         } finally {
         	toUpdateModel.leaveCriticalSection();
         }
-        
+
         //Take this constructed model and remove from the additions model
         additionsModel.enterCriticalSection(Lock.WRITE);
         try {
@@ -108,9 +108,9 @@ public void preprocess(Model retractionsModel, Model additionsModel,
         } finally {
             additionsModel.leaveCriticalSection();
         }
-        
+
     }
-		
+
 
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java
index b9321cac5f..ab37d97864 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java
@@ -18,14 +18,14 @@
 
 public class ManageLabelsForPersonPreprocessor extends ManageLabelsForIndividualPreprocessor {
 
-	
 
-	
+
+
 	public ManageLabelsForPersonPreprocessor(EditConfigurationVTwo editConfig) {
 		super(editConfig);
-		
+
 	}
-	
+
 	@Override
 	public void preprocess(MultiValueEditSubmission inputSubmission, VitroRequest vreq) {
 		//Use the ManageLabelsForIndividualPreprocessor in addition to this code specific for person
@@ -42,27 +42,27 @@ public void preprocess(MultiValueEditSubmission inputSubmission, VitroRequest vr
 			if(inputSubmission.hasLiteralValue("middleName")) {
 				middleNames = literalsFromForm.get("middleName");
 			}
-			
-			
+
+
 			//Expecting only one language
 			if(firstNames.size() > 0 && lastNames.size() > 0 && newLabelLanguages.size() > 0) {
 				Literal newLabelLanguage = newLabelLanguages.get(0);
 				Literal firstNameLiteral = firstNames.get(0);
 				Literal lastNameLiteral = lastNames.get(0);
-				
+
 				//Get the string
 				String lang = this.getLanguage(newLabelLanguage.getString());
 				String firstNameValue = firstNameLiteral.getString();
 				String lastNameValue = lastNameLiteral.getString();
-				
+
 				//Now add the language category to the literal
-				Literal firstNameWithLanguage = inputSubmission.createLiteral(firstNameValue, 
-						null, 
+				Literal firstNameWithLanguage = inputSubmission.createLiteral(firstNameValue,
+						null,
 						lang);
-				Literal lastNameWithLanguage = inputSubmission.createLiteral(lastNameValue, 
-						null, 
+				Literal lastNameWithLanguage = inputSubmission.createLiteral(lastNameValue,
+						null,
 						lang);
-				
+
 				firstNames = new ArrayList<Literal>();
 				lastNames = new ArrayList<Literal>();
 				firstNames.add(firstNameWithLanguage);
@@ -70,25 +70,25 @@ public void preprocess(MultiValueEditSubmission inputSubmission, VitroRequest vr
 				//replace the label with one with language, again assuming only one label being returned
 				literalsFromForm.put("firstName", firstNames);
 				literalsFromForm.put("lastName", lastNames);
-				
+
 				//Middle name handling
 				if(middleNames.size() > 0) {
 					Literal middleNameLiteral = middleNames.get(0);
 					String middleNameValue = middleNameLiteral.getString();
-					Literal middleNameWithLanguage = inputSubmission.createLiteral(middleNameValue, 
-							null, 
+					Literal middleNameWithLanguage = inputSubmission.createLiteral(middleNameValue,
+							null,
 							lang);
 					middleNames = new ArrayList<Literal>();
 					middleNames.add(middleNameWithLanguage);
 					literalsFromForm.put("middleName", middleNames);
 				}
-				
+
 				//Set literals
 				inputSubmission.setLiteralsFromForm(literalsFromForm);
 			}
 		}
-		
+
 	}
-	
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java
index db5e7f7f4a..7a4c9d7176 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java
@@ -1,34 +1,34 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
-
-import java.util.Map;
-import java.util.List;
-
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-
-public class RoleToActivityPredicatePreprocessor extends RoleToPredicatePreprocessor {
-	public RoleToActivityPredicatePreprocessor(EditConfigurationVTwo editConfig, WebappDaoFactory wadf) {
-        super(editConfig, wadf);
-    }
-
-    protected void setupVariableNames() {
-    	this.itemType = "roleActivityType";
-    	this.roleToItemPredicate = "roleToActivityPredicate";
-    	this.itemToRolePredicate = "activityToRolePredicate";
-    }
-    
-    protected String getItemType(MultiValueEditSubmission submission) {
-    	String type = null;
-    	Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
-		//Get the type of the activity selected
-		List<String> itemTypes = urisFromForm.get(itemType);
-		//Really should just be one here
-		if(itemTypes != null && itemTypes.size() > 0) {
-			type = itemTypes.get(0);
-		}
-		return type;
-    }
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
+
+import java.util.Map;
+import java.util.List;
+
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
+
+public class RoleToActivityPredicatePreprocessor extends RoleToPredicatePreprocessor {
+	public RoleToActivityPredicatePreprocessor(EditConfigurationVTwo editConfig, WebappDaoFactory wadf) {
+        super(editConfig, wadf);
+    }
+
+    protected void setupVariableNames() {
+    	this.itemType = "roleActivityType";
+    	this.roleToItemPredicate = "roleToActivityPredicate";
+    	this.itemToRolePredicate = "activityToRolePredicate";
+    }
+
+    protected String getItemType(MultiValueEditSubmission submission) {
+    	String type = null;
+    	Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
+		//Get the type of the activity selected
+		List<String> itemTypes = urisFromForm.get(itemType);
+		//Really should just be one here
+		if(itemTypes != null && itemTypes.size() > 0) {
+			type = itemTypes.get(0);
+		}
+		return type;
+    }
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java
index d7ded27588..de47eaf6f0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java
@@ -1,83 +1,83 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
-
-import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-
-import org.vivoweb.webapp.util.ModelUtils;
-
-public abstract class RoleToPredicatePreprocessor extends BaseEditSubmissionPreprocessorVTwo {
-
-    protected static final Log log = LogFactory.getLog(RoleToPredicatePreprocessor.class.getName());
-    protected WebappDaoFactory wadf = null;
-    protected static String itemType;
-    protected static String roleToItemPredicate;
-    protected static String itemToRolePredicate;
-    //Need the webapp dao factory to try to figure out what the predicate should be
-    public RoleToPredicatePreprocessor(EditConfigurationVTwo editConfig, WebappDaoFactory wadf) {
-        super(editConfig);
-        this.wadf = wadf;
-        setupVariableNames();
-    }
-
-    //Instantiate itemType etc. based on which version of preprocessor required
-    abstract protected void setupVariableNames();
-
-	public void preprocess(MultiValueEditSubmission submission, VitroRequest vreq) {
-    	//Query for all statements using the original roleIn predicate replace
-    	//with the appropriate roleRealizedIn or roleContributesTo
-    	//In addition, need to ensure the inverse predicate is also set correctly
-	
-    	try {
-    		//Get the uris from form
-    		String type = getItemType(submission);
-    		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
-    		if(type != null) {
-    			ObjectProperty roleToItemProperty = getCorrectProperty(type, wadf);
-    			String roleToItemPredicateURI = roleToItemProperty.getURI();
-    			String itemToRolePredicateURI = roleToItemProperty.getURIInverse();
-    			List<String> predicates = new ArrayList<String>();
-    			predicates.add(roleToItemPredicateURI);
-
-    			List<String> inversePredicates = new ArrayList<String>();
-    			inversePredicates.add(itemToRolePredicateURI);
-    			//Populate the two fields in edit submission
-    			if(urisFromForm.containsKey(roleToItemPredicate)) {
-    				urisFromForm.remove(roleToItemPredicate);
-    			}
-    			
-    			urisFromForm.put(roleToItemPredicate, predicates);
-    			
-    			if(urisFromForm.containsKey(itemToRolePredicate)) {
-    				urisFromForm.remove(itemToRolePredicate);
-    			}
-    			urisFromForm.put(itemToRolePredicate, inversePredicates);
-
-    		}
-    		
-        } catch (Exception e) {
-            log.error("Error retrieving name values from edit submission.");
-        }
-        
-    }
-	
-	abstract protected String getItemType(MultiValueEditSubmission submission);
-    
-	private ObjectProperty getCorrectProperty(String uri, WebappDaoFactory wadf) {
-    	ObjectProperty correctProperty = 	ModelUtils.getPropertyForRoleInClass(uri, wadf);
-		return correctProperty;
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
+
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
+
+import org.vivoweb.webapp.util.ModelUtils;
+
+public abstract class RoleToPredicatePreprocessor extends BaseEditSubmissionPreprocessorVTwo {
+
+    protected static final Log log = LogFactory.getLog(RoleToPredicatePreprocessor.class.getName());
+    protected WebappDaoFactory wadf = null;
+    protected static String itemType;
+    protected static String roleToItemPredicate;
+    protected static String itemToRolePredicate;
+    //Need the webapp dao factory to try to figure out what the predicate should be
+    public RoleToPredicatePreprocessor(EditConfigurationVTwo editConfig, WebappDaoFactory wadf) {
+        super(editConfig);
+        this.wadf = wadf;
+        setupVariableNames();
+    }
+
+    //Instantiate itemType etc. based on which version of preprocessor required
+    abstract protected void setupVariableNames();
+
+	public void preprocess(MultiValueEditSubmission submission, VitroRequest vreq) {
+    	//Query for all statements using the original roleIn predicate replace
+    	//with the appropriate roleRealizedIn or roleContributesTo
+    	//In addition, need to ensure the inverse predicate is also set correctly
+
+    	try {
+    		//Get the uris from form
+    		String type = getItemType(submission);
+    		Map<String, List<String>> urisFromForm = submission.getUrisFromForm();
+    		if(type != null) {
+    			ObjectProperty roleToItemProperty = getCorrectProperty(type, wadf);
+    			String roleToItemPredicateURI = roleToItemProperty.getURI();
+    			String itemToRolePredicateURI = roleToItemProperty.getURIInverse();
+    			List<String> predicates = new ArrayList<String>();
+    			predicates.add(roleToItemPredicateURI);
+
+    			List<String> inversePredicates = new ArrayList<String>();
+    			inversePredicates.add(itemToRolePredicateURI);
+    			//Populate the two fields in edit submission
+    			if(urisFromForm.containsKey(roleToItemPredicate)) {
+    				urisFromForm.remove(roleToItemPredicate);
+    			}
+
+    			urisFromForm.put(roleToItemPredicate, predicates);
+
+    			if(urisFromForm.containsKey(itemToRolePredicate)) {
+    				urisFromForm.remove(itemToRolePredicate);
+    			}
+    			urisFromForm.put(itemToRolePredicate, inversePredicates);
+
+    		}
+
+        } catch (Exception e) {
+            log.error("Error retrieving name values from edit submission.");
+        }
+
+    }
+
+	abstract protected String getItemType(MultiValueEditSubmission submission);
+
+	private ObjectProperty getCorrectProperty(String uri, WebappDaoFactory wadf) {
+    	ObjectProperty correctProperty = 	ModelUtils.getPropertyForRoleInClass(uri, wadf);
+		return correctProperty;
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
index 97dfc6dcad..a89e05272b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
@@ -1,225 +1,225 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jena.ontology.OntModel;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-
-//Returns the appropriate n3 for selection of classes from within class group
-public  class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClassesDataGetterN3 {
-	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter";
-
-	private static String internalClassVarNameBase = "isInternal";
-	private Log log = LogFactory.getLog(ProcessInternalClassDataGetterN3.class);
-
-	public ProcessInternalClassDataGetterN3(){
-		super();
-		
-	}
-	//Pass in variable that represents the counter 
-	//Saving both type and class group here
-    //That can be included here if need be, but for now just adding the type alone
-    public List<String> retrieveN3Required(int counter) {
-    	return super.retrieveN3Required(counter);
-    }
-    
-    
-    //returns n3 defining internal class
-	private List<String> addInternalClassN3(int counter) {
-		List<String> internalClassN3 = new ArrayList<String>();
-    	String dataGetterVar = getDataGetterVar(counter);
-		internalClassN3.add(dataGetterVar + " <" + DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> " + 
-				this.getN3VarName(internalClassVarNameBase, counter) + " .");
-		return internalClassN3;
-		
-	}
-	
-	public List<String> retrieveN3Optional(int counter) {
-		List<String> optionalN3 = new ArrayList<String>();
-		//If internal add that as well
-    	optionalN3.addAll(this.addInternalClassN3(counter));
-    	return optionalN3;
-    }
-    
-    //These methods will return the literals and uris expected within the n3
-    //and the counter is used to ensure they are numbered correctly 
-    
-    public List<String> retrieveLiteralsOnForm(int counter) {
-    	//no literals, just the class group URI
-    	List<String> literalsOnForm = new ArrayList<String>();
-    	literalsOnForm.add(getVarName(internalClassVarNameBase, counter));
-    	return literalsOnForm;
-    	
-    }
-    
-    //URIs on form are same as individuals for class group so no need to reimplement
-    //i.e. class groups and individuals selected within class group
-    
-   public List<FieldVTwo> retrieveFields(int counter) {
-	   List<FieldVTwo> fields = super.retrieveFields(counter);
-	   fields.add(new FieldVTwo().setName(getVarName(internalClassVarNameBase, counter)));
-	 
-	   return fields;
-   }
-   
-   //These var names  match the names of the elements within the json object returned with the info required for the data getter
-   
-   public List<String> getLiteralVarNamesBase() {
-	   return Arrays.asList(internalClassVarNameBase);   
-   }
-
-   //get URI Var Names base is same as ProcessIndividualsForClassGroup: classGroup and individualClassVarNameBase
-   
-   @Override
-   public String getClassType() {
-	   return classType;
-   }
-      
-   public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel) {
-	   //First, put dataGetterURI within scope as well
-	   //((ProcessDataGetterAbstract)this).populateExistingDataGetterURI(dataGetterURI, counter);
-	   this.populateExistingDataGetterURI(dataGetterURI, counter);
-	   //Put in type
-	   this.populateExistingClassType(this.getClassType(), counter);
-	   //Sparql queries for values to be executed
-	   //And then placed in the correct place/literal or uri
-	   String querystr = getExistingValuesInternalClass(dataGetterURI);
-	   QueryExecution qe = null;
-	   Literal internalClassLiteral = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           String classGroupURI = null;
-           List<String> individualsForClasses = new ArrayList<String>();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   //Class group
-        	   Resource classGroupResource = qs.getResource("classGroup");
-        	   String classGroupVarName = this.getVarName(classGroupVarBase, counter);
-        	   if(classGroupURI == null) {
-	        	   //Put both literals in existing literals
-	        	   existingUriValues.put(this.getVarName(classGroupVarBase, counter),
-	        			   new ArrayList<String>(Arrays.asList(classGroupResource.getURI())));
-        	   }
-        	   //Individuals For classes
-        	   Resource individualForClassResource = qs.getResource("individualForClass");
-        	   individualsForClasses.add(individualForClassResource.getURI());
-        	   //If internal class value is present and we have not already saved it in a previous result iteration
-        	   if(qs.get("internalClass") != null && internalClassLiteral == null) {
-        		   
-        		   internalClassLiteral= qs.getLiteral("internalClass");
-        		   existingLiteralValues.put(this.getVarName(internalClassVarNameBase, counter),
-	        			   new ArrayList<Literal>(Arrays.asList(internalClassLiteral)));
-        	   }
-           }
-           //Put array of individuals for classes within 
-           existingUriValues.put(this.getVarName(individualClassVarNameBase, counter),
-    			   new ArrayList<String>(individualsForClasses));
-           //Final check, in case no internal class flag was returned, set to false
-           if(internalClassLiteral == null) {
-        	   existingLiteralValues.put(this.getVarName(internalClassVarNameBase, counter),
-        			   new ArrayList<Literal>(
-        					   Arrays.asList(ResourceFactory.createPlainLiteral("false"))
-        					   ));
-           }
-       } catch(Exception ex) {
-    	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
-       }
-	   
-	   
-   }
-  
-   
-   //?dataGetter a FixedHTMLDataGetter ; display:saveToVar ?saveToVar; display:htmlValue ?htmlValue .
-   protected String getExistingValuesInternalClass(String dataGetterURI) {
-	   String query = this.getSparqlPrefix() + " SELECT ?classGroup  ?individualForClass ?internalClass WHERE {" + 
-			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
-			   "OPTIONAL {<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . }\n" + 
-			   "OPTIONAL {<" + dataGetterURI + "> <" + DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?internalClass .} \n" + 
-			   "}";
-	   return query;
-   }
-
-   
-   public ObjectNode getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
-	   ObjectNode jObject = new ObjectMapper().createObjectNode();
-	   jObject.put("dataGetterClass", classType);
-	   //Update to include class type as variable
-	   jObject.put(classTypeVarBase, classType);
-	   //Get selected class group, if internal class, and classes selected from class group
-	   getExistingClassGroupAndInternalClass(dataGetterURI, jObject, queryModel);
-	   //Get all classes in the class group
-	   ((ProcessClassGroupDataGetterN3) this).getExistingClassesInClassGroup(context, dataGetterURI, jObject);
-	   return jObject;
-   }
-   
-   private void getExistingClassGroupAndInternalClass(String dataGetterURI, ObjectNode jObject, OntModel queryModel) {
-	   String querystr = getExistingValuesInternalClass(dataGetterURI);
-	   QueryExecution qe = null;
-	   Literal internalClassLiteral = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           ArrayNode individualsForClasses = new ObjectMapper().createArrayNode();
-           String classGroupURI = null;
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   if(classGroupURI == null) {
-	        	   Resource classGroupResource = qs.getResource("classGroup");
-	        	   classGroupURI = classGroupResource.getURI();
-        	   }
-        	   //individuals for classes - this may also be optional in case entire class group selected and internal class
-        	   if(qs.get("individualForClass") != null ) {
-        		   Resource individualForClassResource = qs.getResource("individualForClass");
-        		   individualsForClasses.add(individualForClassResource.getURI());
-        	   }
-        	 //Put both literals in existing literals
-        	 //If internal class value is present and we have not already saved it in a previous result iteration
-        	   if(qs.get("internalClass") != null && internalClassLiteral == null) {
-        		   internalClassLiteral= qs.getLiteral("internalClass");
-        	   }
-           }
-           
-           
-          jObject.put("classGroup", classGroupURI);
-          //this is a json array
-          jObject.set(individualClassVarNameBase, individualsForClasses);
-          //Internal class - if null then add false otherwise use the value
-          if(internalClassLiteral != null) {
-        	  jObject.put(internalClassVarNameBase, internalClassLiteral.getString());
-          } else {
-        	  jObject.put(internalClassVarNameBase, "false");
-          }
-       } catch(Exception ex) {
-    	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
-       }
-   }
-
-}
-
-
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+
+//Returns the appropriate n3 for selection of classes from within class group
+public  class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClassesDataGetterN3 {
+	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter";
+
+	private static String internalClassVarNameBase = "isInternal";
+	private Log log = LogFactory.getLog(ProcessInternalClassDataGetterN3.class);
+
+	public ProcessInternalClassDataGetterN3(){
+		super();
+
+	}
+	//Pass in variable that represents the counter
+	//Saving both type and class group here
+    //That can be included here if need be, but for now just adding the type alone
+    public List<String> retrieveN3Required(int counter) {
+    	return super.retrieveN3Required(counter);
+    }
+
+
+    //returns n3 defining internal class
+	private List<String> addInternalClassN3(int counter) {
+		List<String> internalClassN3 = new ArrayList<String>();
+    	String dataGetterVar = getDataGetterVar(counter);
+		internalClassN3.add(dataGetterVar + " <" + DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> " +
+				this.getN3VarName(internalClassVarNameBase, counter) + " .");
+		return internalClassN3;
+
+	}
+
+	public List<String> retrieveN3Optional(int counter) {
+		List<String> optionalN3 = new ArrayList<String>();
+		//If internal add that as well
+    	optionalN3.addAll(this.addInternalClassN3(counter));
+    	return optionalN3;
+    }
+
+    //These methods will return the literals and uris expected within the n3
+    //and the counter is used to ensure they are numbered correctly
+
+    public List<String> retrieveLiteralsOnForm(int counter) {
+    	//no literals, just the class group URI
+    	List<String> literalsOnForm = new ArrayList<String>();
+    	literalsOnForm.add(getVarName(internalClassVarNameBase, counter));
+    	return literalsOnForm;
+
+    }
+
+    //URIs on form are same as individuals for class group so no need to reimplement
+    //i.e. class groups and individuals selected within class group
+
+   public List<FieldVTwo> retrieveFields(int counter) {
+	   List<FieldVTwo> fields = super.retrieveFields(counter);
+	   fields.add(new FieldVTwo().setName(getVarName(internalClassVarNameBase, counter)));
+
+	   return fields;
+   }
+
+   //These var names  match the names of the elements within the json object returned with the info required for the data getter
+
+   public List<String> getLiteralVarNamesBase() {
+	   return Arrays.asList(internalClassVarNameBase);
+   }
+
+   //get URI Var Names base is same as ProcessIndividualsForClassGroup: classGroup and individualClassVarNameBase
+
+   @Override
+   public String getClassType() {
+	   return classType;
+   }
+
+   public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel) {
+	   //First, put dataGetterURI within scope as well
+	   //((ProcessDataGetterAbstract)this).populateExistingDataGetterURI(dataGetterURI, counter);
+	   this.populateExistingDataGetterURI(dataGetterURI, counter);
+	   //Put in type
+	   this.populateExistingClassType(this.getClassType(), counter);
+	   //Sparql queries for values to be executed
+	   //And then placed in the correct place/literal or uri
+	   String querystr = getExistingValuesInternalClass(dataGetterURI);
+	   QueryExecution qe = null;
+	   Literal internalClassLiteral = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           String classGroupURI = null;
+           List<String> individualsForClasses = new ArrayList<String>();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   //Class group
+        	   Resource classGroupResource = qs.getResource("classGroup");
+        	   String classGroupVarName = this.getVarName(classGroupVarBase, counter);
+        	   if(classGroupURI == null) {
+	        	   //Put both literals in existing literals
+	        	   existingUriValues.put(this.getVarName(classGroupVarBase, counter),
+	        			   new ArrayList<String>(Arrays.asList(classGroupResource.getURI())));
+        	   }
+        	   //Individuals For classes
+        	   Resource individualForClassResource = qs.getResource("individualForClass");
+        	   individualsForClasses.add(individualForClassResource.getURI());
+        	   //If internal class value is present and we have not already saved it in a previous result iteration
+        	   if(qs.get("internalClass") != null && internalClassLiteral == null) {
+
+        		   internalClassLiteral= qs.getLiteral("internalClass");
+        		   existingLiteralValues.put(this.getVarName(internalClassVarNameBase, counter),
+	        			   new ArrayList<Literal>(Arrays.asList(internalClassLiteral)));
+        	   }
+           }
+           //Put array of individuals for classes within
+           existingUriValues.put(this.getVarName(individualClassVarNameBase, counter),
+    			   new ArrayList<String>(individualsForClasses));
+           //Final check, in case no internal class flag was returned, set to false
+           if(internalClassLiteral == null) {
+        	   existingLiteralValues.put(this.getVarName(internalClassVarNameBase, counter),
+        			   new ArrayList<Literal>(
+        					   Arrays.asList(ResourceFactory.createPlainLiteral("false"))
+        					   ));
+           }
+       } catch(Exception ex) {
+    	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
+       }
+
+
+   }
+
+
+   //?dataGetter a FixedHTMLDataGetter ; display:saveToVar ?saveToVar; display:htmlValue ?htmlValue .
+   protected String getExistingValuesInternalClass(String dataGetterURI) {
+	   String query = this.getSparqlPrefix() + " SELECT ?classGroup  ?individualForClass ?internalClass WHERE {" +
+			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
+			   "OPTIONAL {<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . }\n" +
+			   "OPTIONAL {<" + dataGetterURI + "> <" + DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?internalClass .} \n" +
+			   "}";
+	   return query;
+   }
+
+
+   public ObjectNode getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
+	   ObjectNode jObject = new ObjectMapper().createObjectNode();
+	   jObject.put("dataGetterClass", classType);
+	   //Update to include class type as variable
+	   jObject.put(classTypeVarBase, classType);
+	   //Get selected class group, if internal class, and classes selected from class group
+	   getExistingClassGroupAndInternalClass(dataGetterURI, jObject, queryModel);
+	   //Get all classes in the class group
+	   ((ProcessClassGroupDataGetterN3) this).getExistingClassesInClassGroup(context, dataGetterURI, jObject);
+	   return jObject;
+   }
+
+   private void getExistingClassGroupAndInternalClass(String dataGetterURI, ObjectNode jObject, OntModel queryModel) {
+	   String querystr = getExistingValuesInternalClass(dataGetterURI);
+	   QueryExecution qe = null;
+	   Literal internalClassLiteral = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           ArrayNode individualsForClasses = new ObjectMapper().createArrayNode();
+           String classGroupURI = null;
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   if(classGroupURI == null) {
+	        	   Resource classGroupResource = qs.getResource("classGroup");
+	        	   classGroupURI = classGroupResource.getURI();
+        	   }
+        	   //individuals for classes - this may also be optional in case entire class group selected and internal class
+        	   if(qs.get("individualForClass") != null ) {
+        		   Resource individualForClassResource = qs.getResource("individualForClass");
+        		   individualsForClasses.add(individualForClassResource.getURI());
+        	   }
+        	 //Put both literals in existing literals
+        	 //If internal class value is present and we have not already saved it in a previous result iteration
+        	   if(qs.get("internalClass") != null && internalClassLiteral == null) {
+        		   internalClassLiteral= qs.getLiteral("internalClass");
+        	   }
+           }
+
+
+          jObject.put("classGroup", classGroupURI);
+          //this is a json array
+          jObject.set(individualClassVarNameBase, individualsForClasses);
+          //Internal class - if null then add false otherwise use the value
+          if(internalClassLiteral != null) {
+        	  jObject.put(internalClassVarNameBase, internalClassLiteral.getString());
+          } else {
+        	  jObject.put(internalClassVarNameBase, "false");
+          }
+       } catch(Exception ex) {
+    	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
+       }
+   }
+
+}
+
+
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java
index dd1768b5c1..3acc05c772 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java
@@ -38,7 +38,7 @@ public class CalculateParameters implements DocumentModifier, ContextModelsUser
     private boolean shutdown = false;
 	private volatile Dataset dataset;
    // public static int totalInd=1;
-    
+
     private static final String prefix = "prefix owl: <http://www.w3.org/2002/07/owl#> "
 		+ " prefix vitroDisplay: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#>  "
 		+ " prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>  "
@@ -48,20 +48,20 @@ public class CalculateParameters implements DocumentModifier, ContextModelsUser
 		+ " prefix localNav: <http://vitro.mannlib.cornell.edu/ns/localnav#>  "
 		+ " prefix obo: <http://purl.obolibrary.org/obo/>  "
 		+ " prefix bibo: <http://purl.org/ontology/bibo/>  ";
-    
+
     private static final String betaQuery = prefix + " SELECT count(distinct ?inLinks) " +
     		" WHERE { " +
     		" ?uri rdf:type owl:Thing . " +
     		" ?inLinks ?prop ?uri . " +
     		" } ";
-    
+
     private static final String totalCountQuery = prefix + " SELECT count(distinct ?ind) " +
 	" WHERE { " +
 	" ?ind rdf:type owl:Thing . " +
 	" } ";
-     
+
     private static Log log = LogFactory.getLog(CalculateParameters.class);
-    
+
 	@Override
 	public void setContextModels(ContextModelAccess models) {
 		 this.dataset = DatasetFactory.create(models.getOntModel());
@@ -69,13 +69,13 @@ public void setContextModels(ContextModelAccess models) {
 
 	public float calculateBeta(String uri){
 		float beta=0;
-		int Conn=0; 
+		int Conn=0;
 		Query query;
 		QuerySolutionMap initialBinding = new QuerySolutionMap();
 		QuerySolution soln = null;
 		Resource uriResource = ResourceFactory.createResource(uri);
 		initialBinding.add("uri", uriResource);
-		dataset.getLock().enterCriticalSection(Lock.READ);		
+		dataset.getLock().enterCriticalSection(Lock.READ);
 		QueryExecution qexec=null;
 		try{
 			query = QueryFactory.create(betaQuery,Syntax.syntaxARQ);
@@ -90,29 +90,29 @@ public float calculateBeta(String uri){
 		    if( ! shutdown )
 		        log.error(t,t);
 		}finally{
-		    if( qexec != null ) 
-		        qexec.close();		    
+		    if( qexec != null )
+		        qexec.close();
 			dataset.getLock().leaveCriticalSection();
 		}
 
 		beta = (float)Conn;
 		//beta *= 100;
 		beta += 1;
-		
+
 		// sigmoid function to keep beta between 0 to 1;
-		
+
 		beta = (float) (1 / ( 1 + Math.pow(Math.E,(-beta))));
-		
+
 		if(beta > 1)
 			log.info("Beta higher than 1 : " + beta);
 		else if(beta <= 0)
 			log.info("Beta lower < = 0 : " + beta);
-		return beta; 
+		return beta;
     }
-	
-	
+
+
     public String[] getAdjacentNodes(String uri){
-		
+
     	List<String> queryList = new ArrayList<String>();
     	Set<String> adjacentNodes = new HashSet<String>();
     	Set<String> coauthorNames = new HashSet<String>();
@@ -121,8 +121,8 @@ public String[] getAdjacentNodes(String uri){
     	StringBuffer coauthorBuff = new StringBuffer();
     	adjacentNodesConcat.append("");
     	coauthorBuff.append("");
-    	
-    	queryList.add(prefix + 
+
+    	queryList.add(prefix +
     			" SELECT ?adjobj (str(?adjobjLabel) as ?coauthor) " +
     			" WHERE { " +
     			" ?uri rdf:type <http://xmlns.com/foaf/0.1/Person> . " +
@@ -167,24 +167,24 @@ public String[] getAdjacentNodes(String uri){
     			" UNION " +
     			" { ?adjobj rdf:type <http://vivoweb.org/ontology/core#Location> . } ." +
     	"}");
-	
+
     	Query query;
-    	
+
     	QuerySolution soln;
     	QuerySolutionMap initialBinding = new QuerySolutionMap();
 		Resource uriResource = ResourceFactory.createResource(uri);
-		
+
 		initialBinding.add("uri", uriResource);
-    	
+
     	Iterator<String> queryItr = queryList.iterator();
-    	
+
     	dataset.getLock().enterCriticalSection(Lock.READ);
     	Resource adjacentIndividual = null;
     	RDFNode coauthor = null;
     	try{
     		while(queryItr.hasNext()){
     			/*if(!isPerson){
-    				queryItr.next(); // we don't want first query to execute if the ind is not a person. 
+    				queryItr.next(); // we don't want first query to execute if the ind is not a person.
     			}*/
     			query = QueryFactory.create(queryItr.next(),Syntax.syntaxARQ);
     			QueryExecution qexec = QueryExecutionFactory.create(query,dataset,initialBinding);
@@ -196,35 +196,35 @@ public String[] getAdjacentNodes(String uri){
     						adjacentIndividual = (Resource)soln.get("adjobj");
     						if(adjacentIndividual!=null){
     							adjacentNodes.add(adjacentIndividual.getURI());
-    						}	
+    						}
 
     						coauthor = soln.get("coauthor");
     						if(coauthor!=null){
     							coauthorNames.add(" co-authors " + coauthor.toString() + " co-authors ");
-    						}	
+    						}
     					}
     			}catch(Exception e){
     			    if( ! shutdown )
     			        log.error("Error found in getAdjacentNodes method of SearchQueryHandler");
     			}finally{
     				qexec.close();
-    			}	
+    			}
     		}
-    		queryList = null;	
+    		queryList = null;
     		Iterator<String> itr = adjacentNodes.iterator();
     		while(itr.hasNext()){
     			adjacentNodesConcat.append(itr.next()).append(" ");
     		}
-    		
+
     		info[0] = adjacentNodesConcat.toString();
-    		
+
     		itr = coauthorNames.iterator();
     		while(itr.hasNext()){
     			coauthorBuff.append(itr.next());
     		}
-    		
+
     		info[1] = coauthorBuff.toString();
-    		
+
     	}
     	catch(Throwable t){
     	    if( ! shutdown )
@@ -237,24 +237,24 @@ public String[] getAdjacentNodes(String uri){
     	}
     	return info;
 	}
-   
+
 	@Override
 	public void modifyDocument(Individual individual, SearchInputDocument doc) {
 		// TODO Auto-generated method stub
-		 // calculate beta value.  
+		 // calculate beta value.
         log.debug("Parameter calculation starts..");
         float beta = calculateBeta(individual.getURI());
         doc.addField(VitroSearchTermNames.BETA, (Object) beta);
-        doc.setDocumentBoost(beta + doc.getDocumentBoost() );   
+        doc.setDocumentBoost(beta + doc.getDocumentBoost() );
         log.debug("Parameter calculation is done");
 	}
-	
-	
+
+
 	@Override
 	public void shutdown(){
         shutdown=true;
     }
-	
+
 
 	@Override
 	public String toString() {
@@ -267,11 +267,11 @@ class TotalInd implements Runnable{
 	private Dataset dataset;
 	private String totalCountQuery;
 	private static Log log = LogFactory.getLog(TotalInd.class);
-	
+
 	public TotalInd(Dataset dataset,String totalCountQuery){
 		this.dataset = dataset;
 		this.totalCountQuery = totalCountQuery;
-		
+
 	}
 	@Override
 	public void run(){
@@ -280,13 +280,13 @@ public void run(){
 	    	QuerySolution soln = null;
 			dataset.getLock().enterCriticalSection(Lock.READ);
 			QueryExecution qexec = null;
-			
+
 			try{
 				query = QueryFactory.create(totalCountQuery,Syntax.syntaxARQ);
 				qexec = QueryExecutionFactory.create(query,dataset);
 				ResultSet results = qexec.execSelect();
 				List<String> resultVars = results.getResultVars();
-				
+
 				if(resultVars!=null && resultVars.size()!=0){
 					soln = results.next();
 					totalInd = Integer.parseInt(soln.getLiteral(resultVars.get(0)).getLexicalForm());
@@ -296,10 +296,10 @@ public void run(){
 			}catch(Throwable t){
 				log.error(t,t);
 			}finally{
-			    if( qexec != null ) 
+			    if( qexec != null )
 			        qexec.close();
 				dataset.getLock().leaveCriticalSection();
 			}
-		
+
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java
index 2363360292..74ce7a1323 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java
@@ -35,22 +35,22 @@
  * If an individual has context nodes then the search document for that
  * individual should include the labels of the partners across those nodes. The
  * labels will be added to the ALLTEXT and ALLTEXTUNSTEMMED fields.
- * 
+ *
  * We must specify what property leads to a context node (incoming), and what
  * property leads from a context node (outgoing). We may add restrictions to say
  * that this only applies to individuals of certain types. We may also restrict
  * the type of the applicable context nodes.
- * 
+ *
  * An instance of this class acts as both a DocumentModifier and an
  * IndexingUriFinder:
- * 
+ *
  * As a DocumentModifier, it looks across approved context nodes to fetch the
  * labels of the partners.
- * 
+ *
  * As an IndexingUriFinder, it recognizes that this relationship can be changed
  * by a change to a "label" statement, or to a "relates" property, and finds all
  * partners as candidates for reindexing.
- * 
+ *
  * <pre>
  * Configuration:
  *     rdfs:label -- Optional. Appears in the timings and debug statements.
@@ -85,7 +85,7 @@ public class LabelsAcrossContextNodes implements IndexingUriFinder,
 
 	/**
 	 * URIs of the types of individuals to whom this instance applies.
-	 * 
+	 *
 	 * If this is not empty and an individual does not have any of these types,
 	 * then skip that individual.
 	 */
@@ -93,7 +93,7 @@ public class LabelsAcrossContextNodes implements IndexingUriFinder,
 
 	/**
 	 * URIs of the types of acceptable context nodes.
-	 * 
+	 *
 	 * If this is not empty and a context node does not have any of these types,
 	 * then skip that context node's label.
 	 */
@@ -296,7 +296,7 @@ public void startIndexing() {
 	/**
 	 * If this is a "label" statement, check to see if the subject has any
 	 * acceptable partners across acceptable context nodes.
-	 * 
+	 *
 	 * If this is a statement that involves the specified incoming property on
 	 * an acceptable context node, check to see if there are any acceptable
 	 * partners on this node.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
index 942fdf17f5..2bd227f17a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
@@ -1,91 +1,91 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.servlet; 
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import edu.cornell.mannlib.semservices.bo.Concept;
-import edu.cornell.mannlib.semservices.bo.ConceptInfo;
-import edu.cornell.mannlib.semservices.bo.SemanticServicesError;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService.ConceptSearchServiceUtils;
-
-@WebServlet(name = "ConceptSearchService", urlPatterns = {"/conceptSearchService"} )
-public class ConceptSearchServlet extends VitroHttpServlet {
-    
-    private static final long serialVersionUID = 1L;
-    private static final Log log = LogFactory.getLog(ConceptSearchServlet.class);
-    
-    @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        super.doGet(req, resp);
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        super.doGet(req, resp);
-        VitroRequest vreq = new VitroRequest(req);
-
-        try{
-        	ServletContext ctx = vreq.getSession().getServletContext();
-        	//Captures both concept list and any errors if they exist
-        	ConceptInfo conceptInfo = new ConceptInfo();
-    		conceptInfo.setSemanticServicesError(null);
-
-        	//Json output should be written out
-        	List<Concept> results =  null;
-        	try {
-        		results = ConceptSearchServiceUtils.getSearchResults(ctx, vreq);
-        	} 
-        	catch (Exception ex) {
-        		 SemanticServicesError semanticServicesError = new SemanticServicesError(
-        	               "Exception encountered ", ex.getMessage(), "fatal");
-        		 log.error("An error occurred retrieving search results", ex);
-        		 conceptInfo.setSemanticServicesError(semanticServicesError);
-        	}
-        	conceptInfo.setConceptList(results);
-        	
-        	String json = renderJson(conceptInfo);
-        	
-        	json = StringUtils.replaceChars(json, "\r\t\n", "");
-            PrintWriter writer = resp.getWriter();
-            resp.setContentType("application/json");
-            writer.write(json);
-            writer.close();
-        	
-        }catch(Exception ex){
-            log.warn(ex,ex);            
-        }        
-    }
-    
-    
-    protected String renderJson(ConceptInfo conceptInfo) {
-    	
-		ObjectMapper mapper = new ObjectMapper();
-		try {
-			return mapper.writeValueAsString(conceptInfo);
-		} catch (JsonProcessingException e) {
-			// TODO Auto-generated catch block
-			log.error("An error occurred in rendering conceptInfo as json ", e);
-			return null;
-		}
-	}
-
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import edu.cornell.mannlib.semservices.bo.Concept;
+import edu.cornell.mannlib.semservices.bo.ConceptInfo;
+import edu.cornell.mannlib.semservices.bo.SemanticServicesError;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService.ConceptSearchServiceUtils;
+
+@WebServlet(name = "ConceptSearchService", urlPatterns = {"/conceptSearchService"} )
+public class ConceptSearchServlet extends VitroHttpServlet {
+
+    private static final long serialVersionUID = 1L;
+    private static final Log log = LogFactory.getLog(ConceptSearchServlet.class);
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.doGet(req, resp);
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.doGet(req, resp);
+        VitroRequest vreq = new VitroRequest(req);
+
+        try{
+        	ServletContext ctx = vreq.getSession().getServletContext();
+        	//Captures both concept list and any errors if they exist
+        	ConceptInfo conceptInfo = new ConceptInfo();
+    		conceptInfo.setSemanticServicesError(null);
+
+        	//Json output should be written out
+        	List<Concept> results =  null;
+        	try {
+        		results = ConceptSearchServiceUtils.getSearchResults(ctx, vreq);
+        	}
+        	catch (Exception ex) {
+        		 SemanticServicesError semanticServicesError = new SemanticServicesError(
+        	               "Exception encountered ", ex.getMessage(), "fatal");
+        		 log.error("An error occurred retrieving search results", ex);
+        		 conceptInfo.setSemanticServicesError(semanticServicesError);
+        	}
+        	conceptInfo.setConceptList(results);
+
+        	String json = renderJson(conceptInfo);
+
+        	json = StringUtils.replaceChars(json, "\r\t\n", "");
+            PrintWriter writer = resp.getWriter();
+            resp.setContentType("application/json");
+            writer.write(json);
+            writer.close();
+
+        }catch(Exception ex){
+            log.warn(ex,ex);
+        }
+    }
+
+
+    protected String renderJson(ConceptInfo conceptInfo) {
+
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			return mapper.writeValueAsString(conceptInfo);
+		} catch (JsonProcessingException e) {
+			// TODO Auto-generated catch block
+			log.error("An error occurred in rendering conceptInfo as json ", e);
+			return null;
+		}
+	}
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
index 23feb3f16b..70268cd9b1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
@@ -1,101 +1,101 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService;
-
-import java.util.HashMap;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.semservices.bo.Concept;
-import edu.cornell.mannlib.semservices.service.ExternalConceptService;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-/**
- * Utilities for search    
- */
-public class ConceptSearchServiceUtils {
-    private static final Log log = LogFactory.getLog(ConceptSearchServiceUtils.class);
-    //Get the appropriate search service class
-    //TODO: Change this so retrieved from the system instead using a query
-    private static final String UMLSVocabSource = "http://link.informatics.stonybrook.edu/umls";
-    private static final String AgrovocVocabSource = "http://aims.fao.org/aos/agrovoc/agrovocScheme";
-    private static final String GemetVocabSource = "http://www.eionet.europa.eu/gemet/gemetThesaurus";
-    private static final String LCSHVocabSource = "http://id.loc.gov/authorities/subjects";
-
-    //Get the class that corresponds to the appropriate search
-	public static String getConceptSearchServiceClassName(String searchServiceName) {
-		HashMap<String, String> map = getMapping();
-		if(map.containsKey(searchServiceName)) {
-			return map.get(searchServiceName);
-		}
-		return null;
-	}
-	
-	//Get the URLS for the different services
-	//URL to label
-	public static HashMap<String, VocabSourceDescription> getVocabSources() {
-		HashMap<String, VocabSourceDescription> map = new HashMap<String, VocabSourceDescription>();
-    	map.put(UMLSVocabSource, new VocabSourceDescription("UMLS", UMLSVocabSource, "http://www.nlm.nih.gov/research/umls/", "Unified Medical Language System"));
-    	//Commenting out agrovoc for now until implementation is updated
-    	map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "http://www.fao.org/agrovoc/", "Agricultural Vocabulary"));
-    	map.put(GemetVocabSource, new VocabSourceDescription("GEMET", GemetVocabSource, "http://www.eionet.europa.eu/gemet", "GEneral Multilingual Environmental Thesaurus"));
-    	map.put(LCSHVocabSource, new VocabSourceDescription("LCSH", LCSHVocabSource, "http://id.loc.gov/authorities/subjects/", "Library of Congress Subject Headings"));
-
-    	return map;
-	}
-	
-	//Get additional vocab source info
-	
-    
-    //Get the hashmap mapping service name to Service class
-    private static HashMap<String, String> getMapping() {
-    	HashMap<String, String> map = new HashMap<String, String>();
-    	map.put(UMLSVocabSource, "edu.cornell.mannlib.semservices.service.impl.UMLSService");
-    	map.put(AgrovocVocabSource, "edu.cornell.mannlib.semservices.service.impl.AgrovocService");
-    	map.put(GemetVocabSource, "edu.cornell.mannlib.semservices.service.impl.GemetService");
-    	map.put(LCSHVocabSource, "edu.cornell.mannlib.semservices.service.impl.LCSHService");
-
-    	return map;
-    }
-    
-    public static List<Concept> getSearchResults(ServletContext context, VitroRequest vreq) throws Exception {
-    	String searchServiceName = getSearchServiceUri(vreq);
-    	String searchServiceClassName = getConceptSearchServiceClassName(searchServiceName);
-    
-    	ExternalConceptService conceptServiceClass = null;
-	
-	    Object object = null;
-	    try {
-	        Class classDefinition = Class.forName(searchServiceClassName);
-	        object = classDefinition.newInstance();
-	        conceptServiceClass = (ExternalConceptService) object;
-	    } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) {
-	        System.out.println(e);
-	    }
-
-        if(conceptServiceClass == null){
-	    	log.error("could not find Concept Search Class for " + searchServiceName);
-	    	return null;
-	    } 
-	    
-	    //Get search
-	    String searchTerm = getSearchTerm(vreq);
-	    List<Concept> conceptResults =  conceptServiceClass.getConcepts(searchTerm);
-	    return conceptResults;
-    }
-
-
-	private static String getSearchServiceUri(VitroRequest vreq) {
-		return vreq.getParameter("source");
-	}
-
-	private static String getSearchTerm(VitroRequest vreq) {
-		return vreq.getParameter("searchTerm");
-	}
-	
-
-}
-
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService;
+
+import java.util.HashMap;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.semservices.bo.Concept;
+import edu.cornell.mannlib.semservices.service.ExternalConceptService;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+/**
+ * Utilities for search
+ */
+public class ConceptSearchServiceUtils {
+    private static final Log log = LogFactory.getLog(ConceptSearchServiceUtils.class);
+    //Get the appropriate search service class
+    //TODO: Change this so retrieved from the system instead using a query
+    private static final String UMLSVocabSource = "http://link.informatics.stonybrook.edu/umls";
+    private static final String AgrovocVocabSource = "http://aims.fao.org/aos/agrovoc/agrovocScheme";
+    private static final String GemetVocabSource = "http://www.eionet.europa.eu/gemet/gemetThesaurus";
+    private static final String LCSHVocabSource = "http://id.loc.gov/authorities/subjects";
+
+    //Get the class that corresponds to the appropriate search
+	public static String getConceptSearchServiceClassName(String searchServiceName) {
+		HashMap<String, String> map = getMapping();
+		if(map.containsKey(searchServiceName)) {
+			return map.get(searchServiceName);
+		}
+		return null;
+	}
+
+	//Get the URLS for the different services
+	//URL to label
+	public static HashMap<String, VocabSourceDescription> getVocabSources() {
+		HashMap<String, VocabSourceDescription> map = new HashMap<String, VocabSourceDescription>();
+    	map.put(UMLSVocabSource, new VocabSourceDescription("UMLS", UMLSVocabSource, "http://www.nlm.nih.gov/research/umls/", "Unified Medical Language System"));
+    	//Commenting out agrovoc for now until implementation is updated
+    	map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "http://www.fao.org/agrovoc/", "Agricultural Vocabulary"));
+    	map.put(GemetVocabSource, new VocabSourceDescription("GEMET", GemetVocabSource, "http://www.eionet.europa.eu/gemet", "GEneral Multilingual Environmental Thesaurus"));
+    	map.put(LCSHVocabSource, new VocabSourceDescription("LCSH", LCSHVocabSource, "http://id.loc.gov/authorities/subjects/", "Library of Congress Subject Headings"));
+
+    	return map;
+	}
+
+	//Get additional vocab source info
+
+
+    //Get the hashmap mapping service name to Service class
+    private static HashMap<String, String> getMapping() {
+    	HashMap<String, String> map = new HashMap<String, String>();
+    	map.put(UMLSVocabSource, "edu.cornell.mannlib.semservices.service.impl.UMLSService");
+    	map.put(AgrovocVocabSource, "edu.cornell.mannlib.semservices.service.impl.AgrovocService");
+    	map.put(GemetVocabSource, "edu.cornell.mannlib.semservices.service.impl.GemetService");
+    	map.put(LCSHVocabSource, "edu.cornell.mannlib.semservices.service.impl.LCSHService");
+
+    	return map;
+    }
+
+    public static List<Concept> getSearchResults(ServletContext context, VitroRequest vreq) throws Exception {
+    	String searchServiceName = getSearchServiceUri(vreq);
+    	String searchServiceClassName = getConceptSearchServiceClassName(searchServiceName);
+
+    	ExternalConceptService conceptServiceClass = null;
+
+	    Object object = null;
+	    try {
+	        Class classDefinition = Class.forName(searchServiceClassName);
+	        object = classDefinition.newInstance();
+	        conceptServiceClass = (ExternalConceptService) object;
+	    } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) {
+	        System.out.println(e);
+	    }
+
+        if(conceptServiceClass == null){
+	    	log.error("could not find Concept Search Class for " + searchServiceName);
+	    	return null;
+	    }
+
+	    //Get search
+	    String searchTerm = getSearchTerm(vreq);
+	    List<Concept> conceptResults =  conceptServiceClass.getConcepts(searchTerm);
+	    return conceptResults;
+    }
+
+
+	private static String getSearchServiceUri(VitroRequest vreq) {
+		return vreq.getParameter("source");
+	}
+
+	private static String getSearchTerm(VitroRequest vreq) {
+		return vreq.getParameter("searchTerm");
+	}
+
+
+}
+
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java
index 3119b4ea72..654e862d34 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java
@@ -1,33 +1,33 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService;
-
-public class VocabSourceDescription {
-	private String url;
-	private String label;
-	private String schema;
-	private String description;
-	
-	public VocabSourceDescription(String inputLabel, String inputSchema, String inputUrl, String inputDescription) {
-		url = inputUrl;
-		label = inputLabel;
-		schema = inputSchema;
-		description = inputDescription;
-	}
-	
-	public String getUrl() {
-		return url;
-	}
-	
-	public String getLabel() {
-		return label;
-	}
-	
-	public String getSchema() {
-		return schema;
-	}
-	
-	public String getDescription() {
-		return description;
-	}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService;
+
+public class VocabSourceDescription {
+	private String url;
+	private String label;
+	private String schema;
+	private String description;
+
+	public VocabSourceDescription(String inputLabel, String inputSchema, String inputUrl, String inputDescription) {
+		url = inputUrl;
+		label = inputLabel;
+		schema = inputSchema;
+		description = inputDescription;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public String getSchema() {
+		return schema;
+	}
+
+	public String getDescription() {
+		return description;
+	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java
index 38f7b953da..bc03e54f75 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java
@@ -1,135 +1,135 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.QuerySolutionMap;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.rdf.model.Statement;
-import org.apache.jena.rdf.model.StmtIterator;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
-
-/**
- * This will pass these variables to the template:
- * classGroupUri: uri of the classgroup associated with this page.
- * vClassGroup: a data structure that is the classgroup associated with this page.     
- */
-public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{
-    private static final Log log = LogFactory.getLog(InternalClassesDataGetter.class);
-    
-    /**
-     * Constructor with display model and data getter URI that will be called by reflection.
-     */
-    public InternalClassesDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){
-        super(vreq, displayModel, dataGetterURI);
-    }   
-    
-    
-    //Use different template name for internal class template
-    @Override
-    protected void setTemplateName() {
-    	super.restrictClassesTemplateName = "internalClass";
-    }
-    
-    //Retrieve classes and check whether or not page to be filtered by internal class only 
-    @Override
-    protected Map<String, Object> getClassIntersectionsMap(Model displayModel) {
-
-    	Map<String, Object> classesAndRestrictions = new HashMap<String, Object>();
-    	QuerySolutionMap initialBindings = new QuerySolutionMap();
-        initialBindings.add("dataGetterUri", ResourceFactory.createResource(this.dataGetterURI));
-        List<String> classes = new ArrayList<String>();
-       
-        displayModel.enterCriticalSection(false);
-        try{
-        	Query individualsForClassesInternalQuery = QueryFactory.create(individualsForClassesInternalQueryString);
-            QueryExecution qexec = QueryExecutionFactory.create( individualsForClassesInternalQuery, displayModel , initialBindings);
-            try{
-                ResultSet resultSet = qexec.execSelect();        
-                while(resultSet.hasNext()){
-                    QuerySolution soln = resultSet.next();
-                    String dg = DataGetterUtils.nodeToString(soln.get("dg"));
-                    classes.add(DataGetterUtils.nodeToString(soln.get("class")));
-                    //node to string will convert null to empty string
-                    String isInternal = DataGetterUtils.nodeToString(soln.get("isInternal"));
-                    if(!isInternal.isEmpty()) {
-                    	log.debug("Internal value is "+ isInternal);
-                    	//Retrieve and add internal class
-                    	classesAndRestrictions.put("isInternal", isInternal);
-                    }
-                }
-                
-                if( classes.size() == 0 ){
-                    log.debug("No classes  defined in display model for "+ this.dataGetterURI);
-                    return null;
-                }
-                classesAndRestrictions.put("classes", classes);  
-                return classesAndRestrictions;
-            }finally{
-                qexec.close();
-            }
-        }finally{
-            displayModel.leaveCriticalSection();
-        }
-	}
-
-
-    //Retrieve current internal class uri to restrict by
-	@Override
-	protected List<String> retrieveRestrictClasses(
-			ServletContext context, Map<String, Object> classIntersectionsMap) {
-		List<String> restrictClasses = new ArrayList<String>();
-		String internalClass = (String) classIntersectionsMap.get("isInternal");
-		//if internal class restriction specified and is true
-		if(internalClass != null && internalClass.equals("true")) {
-			//Get internal class
-			Model mainModel = ModelAccess.on(context).getOntModel(ModelNames.TBOX_ASSERTIONS); 
-			StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null);
-			//Checks for just one statement 
-			if(internalIt.hasNext()){
-				Statement s = internalIt.nextStatement();
-				//The class IS an internal class so the subject is what we're looking for
-				String internalClassUri = s.getSubject().getURI();
-				log.debug("Found internal class uri " + internalClassUri);
-				restrictClasses.add(internalClassUri);
-			}
-		}
-			
-		return restrictClasses;
-	}        
-	
-	@Override
-    public String getType(){
-        return DataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName());
-    } 
-	
-    static final protected String individualsForClassesInternalQueryString = 
-    	DataGetterUtils.prefixes + "\n" + 
-    	 "SELECT?class ?isInternal WHERE {\n" +
-         " ?dataGetterUri <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?class . \n" +
-         " OPTIONAL {  ?dataGetterUri <"+ DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?isInternal } .\n" +    
-         "} \n" ;
-    
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.QuerySolutionMap;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
+
+/**
+ * This will pass these variables to the template:
+ * classGroupUri: uri of the classgroup associated with this page.
+ * vClassGroup: a data structure that is the classgroup associated with this page.
+ */
+public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{
+    private static final Log log = LogFactory.getLog(InternalClassesDataGetter.class);
+
+    /**
+     * Constructor with display model and data getter URI that will be called by reflection.
+     */
+    public InternalClassesDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){
+        super(vreq, displayModel, dataGetterURI);
+    }
+
+
+    //Use different template name for internal class template
+    @Override
+    protected void setTemplateName() {
+    	super.restrictClassesTemplateName = "internalClass";
+    }
+
+    //Retrieve classes and check whether or not page to be filtered by internal class only
+    @Override
+    protected Map<String, Object> getClassIntersectionsMap(Model displayModel) {
+
+    	Map<String, Object> classesAndRestrictions = new HashMap<String, Object>();
+    	QuerySolutionMap initialBindings = new QuerySolutionMap();
+        initialBindings.add("dataGetterUri", ResourceFactory.createResource(this.dataGetterURI));
+        List<String> classes = new ArrayList<String>();
+
+        displayModel.enterCriticalSection(false);
+        try{
+        	Query individualsForClassesInternalQuery = QueryFactory.create(individualsForClassesInternalQueryString);
+            QueryExecution qexec = QueryExecutionFactory.create( individualsForClassesInternalQuery, displayModel , initialBindings);
+            try{
+                ResultSet resultSet = qexec.execSelect();
+                while(resultSet.hasNext()){
+                    QuerySolution soln = resultSet.next();
+                    String dg = DataGetterUtils.nodeToString(soln.get("dg"));
+                    classes.add(DataGetterUtils.nodeToString(soln.get("class")));
+                    //node to string will convert null to empty string
+                    String isInternal = DataGetterUtils.nodeToString(soln.get("isInternal"));
+                    if(!isInternal.isEmpty()) {
+                    	log.debug("Internal value is "+ isInternal);
+                    	//Retrieve and add internal class
+                    	classesAndRestrictions.put("isInternal", isInternal);
+                    }
+                }
+
+                if( classes.size() == 0 ){
+                    log.debug("No classes  defined in display model for "+ this.dataGetterURI);
+                    return null;
+                }
+                classesAndRestrictions.put("classes", classes);
+                return classesAndRestrictions;
+            }finally{
+                qexec.close();
+            }
+        }finally{
+            displayModel.leaveCriticalSection();
+        }
+	}
+
+
+    //Retrieve current internal class uri to restrict by
+	@Override
+	protected List<String> retrieveRestrictClasses(
+			ServletContext context, Map<String, Object> classIntersectionsMap) {
+		List<String> restrictClasses = new ArrayList<String>();
+		String internalClass = (String) classIntersectionsMap.get("isInternal");
+		//if internal class restriction specified and is true
+		if(internalClass != null && internalClass.equals("true")) {
+			//Get internal class
+			Model mainModel = ModelAccess.on(context).getOntModel(ModelNames.TBOX_ASSERTIONS);
+			StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null);
+			//Checks for just one statement
+			if(internalIt.hasNext()){
+				Statement s = internalIt.nextStatement();
+				//The class IS an internal class so the subject is what we're looking for
+				String internalClassUri = s.getSubject().getURI();
+				log.debug("Found internal class uri " + internalClassUri);
+				restrictClasses.add(internalClassUri);
+			}
+		}
+
+		return restrictClasses;
+	}
+
+	@Override
+    public String getType(){
+        return DataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName());
+    }
+
+    static final protected String individualsForClassesInternalQueryString =
+    	DataGetterUtils.prefixes + "\n" +
+    	 "SELECT?class ?isInternal WHERE {\n" +
+         " ?dataGetterUri <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?class . \n" +
+         " OPTIONAL {  ?dataGetterUri <"+ DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?isInternal } .\n" +
+         "} \n" ;
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
index e596e03f4f..79eb6b84c2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
@@ -1,82 +1,82 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
-
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.vocabulary.RDF;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter;
-
-/*
- * Handle processing of data retrieved from IndividualsForClasses data getter to return to form template
- * and handle processing of form submission to create the appropriate individuals for classes data getter
- */
-public class ProcessInternalClasses extends ProcessIndividualsForClasses {
-    private static final Log log = LogFactory.getLog(ProcessInternalClasses.class);
-
-   /**Retrieve and populate**/
-    
-  //Based on institutional internal page and not general individualsForClasses
-    @Override
-    protected void populateRestrictedClasses(Map<String, Object> pageData, Map<String, Object> templateData) {
-    	//for internal page, restrict results by internal is true or false, otherwise get
-		//actual restriction classes?
-		//Get internal class
-		String internalClassUris = (String) pageData.get("internalClass");
-		if(internalClassUris != null && !internalClassUris.isEmpty()) {
-			templateData.put("isInternal", "true");
-		}
-    }
-    
-	/**Process submission**/
-	//Check and see if we should use this process
-	//Use this if either internal class is selected or all classes have been selected
-	public boolean useProcessor(VitroRequest vreq) {
-		return(internalClassSelected(vreq) || !allClassesSelected(vreq));
-	}
-	public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource) {
-		String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName());
-		String[] selectedClasses = vreq.getParameterValues("classInClassGroup");
-		Model dgModel = ModelFactory.createDefaultModel();
-		dgModel.add(dgModel.createStatement(dataGetterResource, 
-				RDF.type, 
-				ResourceFactory.createResource(dataGetterTypeUri)));
-		for(String classUri: selectedClasses) {
-			dgModel.add(dgModel.createStatement(
-					dataGetterResource, 
-					ResourceFactory.createProperty(DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS),
-					ResourceFactory.createResource(classUri)));
-		}
-		
-		//Also check if internal class checked
-		if(internalClassSelected(vreq)) {
-			dgModel.add(dgModel.createStatement(
-					dataGetterResource, 
-					ResourceFactory.createProperty(DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL),
-					dgModel.createLiteral("true")));
-		}
-		return dgModel;
-	}
-	
-	private  boolean allClassesSelected(VitroRequest vreq) {
-			String allClasses = vreq.getParameter("allSelected");
-			return (allClasses != null && !allClasses.isEmpty());
-	}
-		
-	private  boolean internalClassSelected(VitroRequest vreq) {
-	    String internalClass = vreq.getParameter("display-internalClass");
-	    return (internalClass != null && !internalClass.isEmpty());
-	}		
-		
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
+
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter;
+
+/*
+ * Handle processing of data retrieved from IndividualsForClasses data getter to return to form template
+ * and handle processing of form submission to create the appropriate individuals for classes data getter
+ */
+public class ProcessInternalClasses extends ProcessIndividualsForClasses {
+    private static final Log log = LogFactory.getLog(ProcessInternalClasses.class);
+
+   /**Retrieve and populate**/
+
+  //Based on institutional internal page and not general individualsForClasses
+    @Override
+    protected void populateRestrictedClasses(Map<String, Object> pageData, Map<String, Object> templateData) {
+    	//for internal page, restrict results by internal is true or false, otherwise get
+		//actual restriction classes?
+		//Get internal class
+		String internalClassUris = (String) pageData.get("internalClass");
+		if(internalClassUris != null && !internalClassUris.isEmpty()) {
+			templateData.put("isInternal", "true");
+		}
+    }
+
+	/**Process submission**/
+	//Check and see if we should use this process
+	//Use this if either internal class is selected or all classes have been selected
+	public boolean useProcessor(VitroRequest vreq) {
+		return(internalClassSelected(vreq) || !allClassesSelected(vreq));
+	}
+	public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource) {
+		String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName());
+		String[] selectedClasses = vreq.getParameterValues("classInClassGroup");
+		Model dgModel = ModelFactory.createDefaultModel();
+		dgModel.add(dgModel.createStatement(dataGetterResource,
+				RDF.type,
+				ResourceFactory.createResource(dataGetterTypeUri)));
+		for(String classUri: selectedClasses) {
+			dgModel.add(dgModel.createStatement(
+					dataGetterResource,
+					ResourceFactory.createProperty(DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS),
+					ResourceFactory.createResource(classUri)));
+		}
+
+		//Also check if internal class checked
+		if(internalClassSelected(vreq)) {
+			dgModel.add(dgModel.createStatement(
+					dataGetterResource,
+					ResourceFactory.createProperty(DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL),
+					dgModel.createLiteral("true")));
+		}
+		return dgModel;
+	}
+
+	private  boolean allClassesSelected(VitroRequest vreq) {
+			String allClasses = vreq.getParameter("allSelected");
+			return (allClasses != null && !allClasses.isEmpty());
+	}
+
+	private  boolean internalClassSelected(VitroRequest vreq) {
+	    String internalClass = vreq.getParameter("display-internalClass");
+	    return (internalClass != null && !internalClass.isEmpty());
+	}
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java
index 67d60a2069..5e9a543cfb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java
@@ -1,60 +1,60 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
-
-import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS;
-
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.ontology.OntModel;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.rdf.model.StmtIterator;
-
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
-
-/*
- * This class includes methods that help in selecting a data getter based on 
- * parameters, and VIVO will have its own version or extend this
- */
-public class VIVOMenuManagementDataUtils implements MenuManagementDataUtils.IMenuManagementDataUtils {
-    private static final Log log = LogFactory.getLog(VIVOMenuManagementDataUtils.class);
-
-    //Data that is to be returned to template that does not involve data getters
-    //e.g. what are the current class groups, etc.
-    public void includeRequiredSystemData(ServletContext context, Map<String, Object> templateData) {
-    	checkInstitutionalInternalClass(context, templateData);
-    }
-    
-	//Check whether any classes exist with internal class restrictions
-	private void checkInstitutionalInternalClass(ServletContext context, Map<String, Object> templateData) {
-		//TODO: replace with more generic ModelContext retrieval method
-		String internalClass = retrieveInternalClass(context);
-		if(internalClass != null) {			
-			templateData.put("internalClass", internalClass);
-			templateData.put("internalClassUri", internalClass);
-		} else {
-			//need to initialize to empty string anyway
-			templateData.put("internalClassUri", "");
-		}
-		
-	}
-	
-	private String retrieveInternalClass(ServletContext context) {
-		OntModel mainModel = ModelAccess.on(context).getOntModel(TBOX_ASSERTIONS);
- 		StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null);
-		if(internalIt.hasNext()) {			
-			String internalClass = internalIt.nextStatement().getSubject().getURI();
-			return internalClass;
-		}
-		return null;
-	}
-
-    
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
+
+import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS;
+
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.rdf.model.StmtIterator;
+
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+
+/*
+ * This class includes methods that help in selecting a data getter based on
+ * parameters, and VIVO will have its own version or extend this
+ */
+public class VIVOMenuManagementDataUtils implements MenuManagementDataUtils.IMenuManagementDataUtils {
+    private static final Log log = LogFactory.getLog(VIVOMenuManagementDataUtils.class);
+
+    //Data that is to be returned to template that does not involve data getters
+    //e.g. what are the current class groups, etc.
+    public void includeRequiredSystemData(ServletContext context, Map<String, Object> templateData) {
+    	checkInstitutionalInternalClass(context, templateData);
+    }
+
+	//Check whether any classes exist with internal class restrictions
+	private void checkInstitutionalInternalClass(ServletContext context, Map<String, Object> templateData) {
+		//TODO: replace with more generic ModelContext retrieval method
+		String internalClass = retrieveInternalClass(context);
+		if(internalClass != null) {
+			templateData.put("internalClass", internalClass);
+			templateData.put("internalClassUri", internalClass);
+		} else {
+			//need to initialize to empty string anyway
+			templateData.put("internalClassUri", "");
+		}
+
+	}
+
+	private String retrieveInternalClass(ServletContext context) {
+		OntModel mainModel = ModelAccess.on(context).getOntModel(TBOX_ASSERTIONS);
+ 		StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null);
+		if(internalIt.hasNext()) {
+			String internalClass = internalIt.nextStatement().getSubject().getURI();
+			return internalClass;
+		}
+		return null;
+	}
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java
index 556a22ed72..85bc06c4d2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java
@@ -1,332 +1,332 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship;
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator;
-import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData;
-import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-public class CoAuthorshipGraphMLWriter {
-	
-	private StringBuilder coAuthorshipGraphMLContent;
-
-	private final String GRAPHML_NS = "http://graphml.graphdrawing.org/xmlns";
-	
-	public CoAuthorshipGraphMLWriter(CollaborationData visVOContainer) {
-		coAuthorshipGraphMLContent = createCoAuthorshipGraphMLContent(visVOContainer);
-	}
-
-	private StringBuilder createCoAuthorshipGraphMLContent(CollaborationData coAuthorshipData) {
-
-		StringBuilder graphMLContent = new StringBuilder();
-
-		try {
-			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-			docFactory.setNamespaceAware(true);
-			DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-
-			// root elements
-			Document doc = docBuilder.newDocument();
-			doc.setXmlVersion("1.0");
-			Element rootElement = doc.createElementNS(GRAPHML_NS, "graphml");
-			doc.appendChild(rootElement);
-
-			/*
-			 * We are side-effecting "graphMLContent" object in this method since creating
-			 * another String object to hold key definition data will be redundant & will
-			 * not serve the purpose.
-			 * */
-			generateKeyDefinitionContent(coAuthorshipData, rootElement);
-
-			/*
-			 * Used to generate graph content. It will contain both the nodes & edge information.
-			 * We are side-effecting "graphMLContent".
-			 * */
-			generateGraphContent(coAuthorshipData, rootElement);
-
-			DOMSource source = new DOMSource(doc);
-			TransformerFactory transFactory = TransformerFactory.newInstance();
-			Transformer transformer = transFactory.newTransformer();
-			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-
-			StringWriter writer = new StringWriter();
-			StreamResult result = new StreamResult(writer);
-			transformer.transform(source, result);
-
-			graphMLContent.append(writer.toString());
-		} catch (ParserConfigurationException | TransformerException e) {
-			throw new IllegalStateException("XML error generating GraphML", e);
-		}
-
-        return graphMLContent;
-	}
-	
-	public StringBuilder getCoAuthorshipGraphMLContent() {
-		return coAuthorshipGraphMLContent;
-	}
-
-	private void generateGraphContent(CollaborationData coAuthorshipData, Element rootElement) {
-		Document doc = rootElement.getOwnerDocument();
-
-		Element graph = doc.createElementNS(GRAPHML_NS, "graph");
-		graph.setAttribute("edgedefault", "undirected");
-		rootElement.appendChild(graph);
-
-		if (coAuthorshipData.getCollaborators() != null && coAuthorshipData.getCollaborators().size() > 0) {
-			generateNodeSectionContent(coAuthorshipData, graph);
-		}
-		
-		if (coAuthorshipData.getCollaborations() != null && coAuthorshipData.getCollaborations().size() > 0) {
-			generateEdgeSectionContent(coAuthorshipData, graph);
-		}
-	}
-
-	private void generateEdgeSectionContent(CollaborationData coAuthorshipData, Element graphElement) {
-		Document doc = graphElement.getOwnerDocument();
-
-		graphElement.appendChild(doc.createComment("edges"));
-
-		Set<Collaboration>  edges = coAuthorshipData.getCollaborations();
-		List<Collaboration> orderedEdges = new ArrayList<Collaboration>(edges);
-		orderedEdges.sort(new CollaborationComparator());
-
-		for (Collaboration currentEdge : orderedEdges) {
-			/*
-			 * This method actually creates the XML code for a single Collaboration. 
-			 * "graphMLContent" is being side-effected. 
-			 * */
-			getEdgeContent(graphElement, currentEdge);
-		}
-	}
-
-	private void getEdgeContent(Element graphElement, Collaboration currentEdge) {
-		Document doc = graphElement.getOwnerDocument();
-
-		Element edge = doc.createElementNS(GRAPHML_NS, "edge");
-		edge.setAttribute("id", String.valueOf(currentEdge.getCollaborationID()));
-		edge.setAttribute("source", String.valueOf(currentEdge.getSourceCollaborator().getCollaboratorID()));
-		edge.setAttribute("target", String.valueOf(currentEdge.getTargetCollaborator().getCollaboratorID()));
-		graphElement.appendChild(edge);
-
-		Element collaborator1 = doc.createElementNS(GRAPHML_NS, "data");
-		collaborator1.setAttribute("key", "collaborator1");
-		collaborator1.setTextContent(currentEdge.getSourceCollaborator().getCollaboratorName());
-		edge.appendChild(collaborator1);
-
-		Element collaborator2 = doc.createElementNS(GRAPHML_NS, "data");
-		collaborator2.setAttribute("key", "collaborator2");
-		collaborator2.setTextContent(currentEdge.getTargetCollaborator().getCollaboratorName());
-		edge.appendChild(collaborator2);
-
-		Element works = doc.createElementNS(GRAPHML_NS, "data");
-		works.setAttribute("key", "number_of_coauthored_works");
-		works.setTextContent(String.valueOf(currentEdge.getNumOfCollaborations()));
-		edge.appendChild(works);
-
-		if (currentEdge.getEarliestCollaborationYearCount() != null) {
-			/*
-			 * There is no clean way of getting the map contents in java even though
-			 * we are sure to have only one entry on the map. So using the for loop.
-			 * */
-			for (Map.Entry<String, Integer> publicationInfo : currentEdge.getEarliestCollaborationYearCount().entrySet()) {
-
-				Element earliest = doc.createElementNS(GRAPHML_NS, "data");
-				earliest.setAttribute("key", "earliest_collaboration");
-				earliest.setTextContent(publicationInfo.getKey());
-				edge.appendChild(earliest);
-
-				Element earliestCount = doc.createElementNS(GRAPHML_NS, "data");
-				earliestCount.setAttribute("key", "num_earliest_collaboration");
-				earliestCount.setTextContent(publicationInfo.getValue().toString());
-				edge.appendChild(earliestCount);
-			}
-		}
-		
-		if (currentEdge.getLatestCollaborationYearCount() != null) {
-			for (Map.Entry<String, Integer> publicationInfo : currentEdge.getLatestCollaborationYearCount().entrySet()) {
-				Element latest = doc.createElementNS(GRAPHML_NS, "data");
-				latest.setAttribute("key", "latest_collaboration");
-				latest.setTextContent(publicationInfo.getKey());
-				edge.appendChild(latest);
-
-				Element latestCount = doc.createElementNS(GRAPHML_NS, "data");
-				latestCount.setAttribute("key", "num_latest_collaboration");
-				latestCount.setTextContent(publicationInfo.getValue().toString());
-				edge.appendChild(latestCount);
-			}
-		}
-		
-		if (currentEdge.getUnknownCollaborationYearCount() != null) {
-			Element unknown = doc.createElementNS(GRAPHML_NS, "data");
-			unknown.setAttribute("key", "num_unknown_collaboration");
-			unknown.setTextContent(String.valueOf(currentEdge.getUnknownCollaborationYearCount()));
-			edge.appendChild(unknown);
-		}
-	}
-
-	private void generateNodeSectionContent(CollaborationData coAuthorshipData, Element graphElement) {
-		Document doc = graphElement.getOwnerDocument();
-
-		graphElement.appendChild(doc.createComment("nodes"));
-
-		Collaborator egoNode = coAuthorshipData.getEgoCollaborator();
-		Set<Collaborator> authorNodes = coAuthorshipData.getCollaborators();
-		
-		/*
-		 * This method actually creates the XML code for a single Collaborator. "graphMLContent"
-		 * is being side-effected. The egoNode is added first because this is the "requirement"
-		 * of the co-author vis. Ego should always come first.
-		 * 
-		 * */
-		getNodeContent(graphElement, egoNode);
-		
-		List<Collaborator> orderedAuthorNodes = new ArrayList<Collaborator>(authorNodes);
-		orderedAuthorNodes.remove(egoNode);
-		
-		orderedAuthorNodes.sort(new CollaboratorComparator());
-		
-		for (Collaborator currNode : orderedAuthorNodes) {
-			/*
-			 * We have already printed the Ego Collaborator info.
-			 * */
-			if (currNode != egoNode) {
-				getNodeContent(graphElement, currNode);
-			}
-		}
-		
-	}
-
-	private void getNodeContent(Element graphElement, Collaborator collaborator) {
-		Document doc = graphElement.getOwnerDocument();
-
-		ParamMap individualProfileURLParams = 
-					new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, collaborator.getCollaboratorURI());
-
-		String profileURL = UrlBuilder.getUrl(VisualizationFrameworkConstants.INDIVIDUAL_URL_PREFIX, individualProfileURLParams);
-
-		Element node = doc.createElementNS(GRAPHML_NS, "node");
-		node.setAttribute("id", String.valueOf(collaborator.getCollaboratorID()));
-		graphElement.appendChild(node);
-
-		Element url = doc.createElementNS(GRAPHML_NS, "data");
-		url.setAttribute("key", "url");
-		url.setTextContent(collaborator.getCollaboratorURI());
-		node.appendChild(url);
-
-		Element label = doc.createElementNS(GRAPHML_NS, "data");
-		label.setAttribute("key", "label");
-		label.setTextContent(collaborator.getCollaboratorName());
-		node.appendChild(label);
-
-		if (profileURL != null) {
-			Element profile = doc.createElementNS(GRAPHML_NS, "data");
-			profile.setAttribute("key", "profile_url");
-			profile.setTextContent(profileURL);
-			node.appendChild(profile);
-		}
-		
-		Element works = doc.createElementNS(GRAPHML_NS, "data");
-		works.setAttribute("key", "number_of_authored_works");
-		works.setTextContent(String.valueOf(collaborator.getNumOfActivities()));
-		node.appendChild(works);
-
-		if (collaborator.getEarliestActivityYearCount() != null) {
-			/*
-			 * There is no clean way of getting the map contents in java even though
-			 * we are sure to have only one entry on the map. So using the for loop.
-			 * I am feeling dirty just about now. 
-			 * */
-			for (Map.Entry<String, Integer> publicationInfo : collaborator.getEarliestActivityYearCount().entrySet()) {
-				Element earliest = doc.createElementNS(GRAPHML_NS, "data");
-				earliest.setAttribute("key", "earliest_publication");
-				earliest.setTextContent(publicationInfo.getKey());
-				node.appendChild(earliest);
-
-				Element earliestCount = doc.createElementNS(GRAPHML_NS, "data");
-				earliestCount.setAttribute("key", "num_earliest_publication");
-				earliestCount.setTextContent(publicationInfo.getValue().toString());
-				node.appendChild(earliestCount);
-			}
-		}
-		
-		if (collaborator.getLatestActivityYearCount() != null) {
-			for (Map.Entry<String, Integer> publicationInfo : collaborator.getLatestActivityYearCount().entrySet()) {
-				Element latest = doc.createElementNS(GRAPHML_NS, "data");
-				latest.setAttribute("key", "latest_publication");
-				latest.setTextContent(publicationInfo.getKey());
-				node.appendChild(latest);
-
-				Element latestCount = doc.createElementNS(GRAPHML_NS, "data");
-				latestCount.setAttribute("key", "num_latest_publication");
-				latestCount.setTextContent(publicationInfo.getValue().toString());
-				node.appendChild(latestCount);
-			}
-		}
-		
-		if (collaborator.getUnknownActivityYearCount() != null) {
-			Element unknown = doc.createElementNS(GRAPHML_NS, "data");
-			unknown.setAttribute("key", "num_unknown_publication");
-			unknown.setTextContent(String.valueOf(collaborator.getUnknownActivityYearCount()));
-			node.appendChild(unknown);
-		}
-	}
-
-	private void generateKeyDefinitionContent(CollaborationData visVOContainer, Element rootElement) {
-		/*
-		 * Generate the key definition content for node. 
-		 * */
-		getKeyDefinitionFromSchema(visVOContainer.getNodeSchema(), rootElement);
-		
-		/*
-		 * Generate the key definition content for edge. 
-		 * */
-		getKeyDefinitionFromSchema(visVOContainer.getEdgeSchema(), rootElement);
-		
-		
-	}
-
-	private void getKeyDefinitionFromSchema(Set<Map<String, String>> schema, Element rootElement) {
-		Document doc = rootElement.getOwnerDocument();
-
-		for (Map<String, String> currentNodeSchemaAttribute : schema) {
-			Element key = doc.createElementNS(GRAPHML_NS, "key");
-
-			for (Map.Entry<String, String> currentAttributeKey : currentNodeSchemaAttribute.entrySet()) {
-				key.setAttribute(currentAttributeKey.getKey(), currentAttributeKey.getValue());
-			}
-			
-			if (currentNodeSchemaAttribute.containsKey("default")) {
-				Element def = doc.createElementNS(GRAPHML_NS, "default");
-				def.setTextContent(currentNodeSchemaAttribute.get("default"));
-				key.appendChild(def);
-			}
-
-			rootElement.appendChild(key);
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator;
+import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData;
+import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+public class CoAuthorshipGraphMLWriter {
+
+	private StringBuilder coAuthorshipGraphMLContent;
+
+	private final String GRAPHML_NS = "http://graphml.graphdrawing.org/xmlns";
+
+	public CoAuthorshipGraphMLWriter(CollaborationData visVOContainer) {
+		coAuthorshipGraphMLContent = createCoAuthorshipGraphMLContent(visVOContainer);
+	}
+
+	private StringBuilder createCoAuthorshipGraphMLContent(CollaborationData coAuthorshipData) {
+
+		StringBuilder graphMLContent = new StringBuilder();
+
+		try {
+			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+			docFactory.setNamespaceAware(true);
+			DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+
+			// root elements
+			Document doc = docBuilder.newDocument();
+			doc.setXmlVersion("1.0");
+			Element rootElement = doc.createElementNS(GRAPHML_NS, "graphml");
+			doc.appendChild(rootElement);
+
+			/*
+			 * We are side-effecting "graphMLContent" object in this method since creating
+			 * another String object to hold key definition data will be redundant & will
+			 * not serve the purpose.
+			 * */
+			generateKeyDefinitionContent(coAuthorshipData, rootElement);
+
+			/*
+			 * Used to generate graph content. It will contain both the nodes & edge information.
+			 * We are side-effecting "graphMLContent".
+			 * */
+			generateGraphContent(coAuthorshipData, rootElement);
+
+			DOMSource source = new DOMSource(doc);
+			TransformerFactory transFactory = TransformerFactory.newInstance();
+			Transformer transformer = transFactory.newTransformer();
+			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+
+			StringWriter writer = new StringWriter();
+			StreamResult result = new StreamResult(writer);
+			transformer.transform(source, result);
+
+			graphMLContent.append(writer.toString());
+		} catch (ParserConfigurationException | TransformerException e) {
+			throw new IllegalStateException("XML error generating GraphML", e);
+		}
+
+        return graphMLContent;
+	}
+
+	public StringBuilder getCoAuthorshipGraphMLContent() {
+		return coAuthorshipGraphMLContent;
+	}
+
+	private void generateGraphContent(CollaborationData coAuthorshipData, Element rootElement) {
+		Document doc = rootElement.getOwnerDocument();
+
+		Element graph = doc.createElementNS(GRAPHML_NS, "graph");
+		graph.setAttribute("edgedefault", "undirected");
+		rootElement.appendChild(graph);
+
+		if (coAuthorshipData.getCollaborators() != null && coAuthorshipData.getCollaborators().size() > 0) {
+			generateNodeSectionContent(coAuthorshipData, graph);
+		}
+
+		if (coAuthorshipData.getCollaborations() != null && coAuthorshipData.getCollaborations().size() > 0) {
+			generateEdgeSectionContent(coAuthorshipData, graph);
+		}
+	}
+
+	private void generateEdgeSectionContent(CollaborationData coAuthorshipData, Element graphElement) {
+		Document doc = graphElement.getOwnerDocument();
+
+		graphElement.appendChild(doc.createComment("edges"));
+
+		Set<Collaboration>  edges = coAuthorshipData.getCollaborations();
+		List<Collaboration> orderedEdges = new ArrayList<Collaboration>(edges);
+		orderedEdges.sort(new CollaborationComparator());
+
+		for (Collaboration currentEdge : orderedEdges) {
+			/*
+			 * This method actually creates the XML code for a single Collaboration.
+			 * "graphMLContent" is being side-effected.
+			 * */
+			getEdgeContent(graphElement, currentEdge);
+		}
+	}
+
+	private void getEdgeContent(Element graphElement, Collaboration currentEdge) {
+		Document doc = graphElement.getOwnerDocument();
+
+		Element edge = doc.createElementNS(GRAPHML_NS, "edge");
+		edge.setAttribute("id", String.valueOf(currentEdge.getCollaborationID()));
+		edge.setAttribute("source", String.valueOf(currentEdge.getSourceCollaborator().getCollaboratorID()));
+		edge.setAttribute("target", String.valueOf(currentEdge.getTargetCollaborator().getCollaboratorID()));
+		graphElement.appendChild(edge);
+
+		Element collaborator1 = doc.createElementNS(GRAPHML_NS, "data");
+		collaborator1.setAttribute("key", "collaborator1");
+		collaborator1.setTextContent(currentEdge.getSourceCollaborator().getCollaboratorName());
+		edge.appendChild(collaborator1);
+
+		Element collaborator2 = doc.createElementNS(GRAPHML_NS, "data");
+		collaborator2.setAttribute("key", "collaborator2");
+		collaborator2.setTextContent(currentEdge.getTargetCollaborator().getCollaboratorName());
+		edge.appendChild(collaborator2);
+
+		Element works = doc.createElementNS(GRAPHML_NS, "data");
+		works.setAttribute("key", "number_of_coauthored_works");
+		works.setTextContent(String.valueOf(currentEdge.getNumOfCollaborations()));
+		edge.appendChild(works);
+
+		if (currentEdge.getEarliestCollaborationYearCount() != null) {
+			/*
+			 * There is no clean way of getting the map contents in java even though
+			 * we are sure to have only one entry on the map. So using the for loop.
+			 * */
+			for (Map.Entry<String, Integer> publicationInfo : currentEdge.getEarliestCollaborationYearCount().entrySet()) {
+
+				Element earliest = doc.createElementNS(GRAPHML_NS, "data");
+				earliest.setAttribute("key", "earliest_collaboration");
+				earliest.setTextContent(publicationInfo.getKey());
+				edge.appendChild(earliest);
+
+				Element earliestCount = doc.createElementNS(GRAPHML_NS, "data");
+				earliestCount.setAttribute("key", "num_earliest_collaboration");
+				earliestCount.setTextContent(publicationInfo.getValue().toString());
+				edge.appendChild(earliestCount);
+			}
+		}
+
+		if (currentEdge.getLatestCollaborationYearCount() != null) {
+			for (Map.Entry<String, Integer> publicationInfo : currentEdge.getLatestCollaborationYearCount().entrySet()) {
+				Element latest = doc.createElementNS(GRAPHML_NS, "data");
+				latest.setAttribute("key", "latest_collaboration");
+				latest.setTextContent(publicationInfo.getKey());
+				edge.appendChild(latest);
+
+				Element latestCount = doc.createElementNS(GRAPHML_NS, "data");
+				latestCount.setAttribute("key", "num_latest_collaboration");
+				latestCount.setTextContent(publicationInfo.getValue().toString());
+				edge.appendChild(latestCount);
+			}
+		}
+
+		if (currentEdge.getUnknownCollaborationYearCount() != null) {
+			Element unknown = doc.createElementNS(GRAPHML_NS, "data");
+			unknown.setAttribute("key", "num_unknown_collaboration");
+			unknown.setTextContent(String.valueOf(currentEdge.getUnknownCollaborationYearCount()));
+			edge.appendChild(unknown);
+		}
+	}
+
+	private void generateNodeSectionContent(CollaborationData coAuthorshipData, Element graphElement) {
+		Document doc = graphElement.getOwnerDocument();
+
+		graphElement.appendChild(doc.createComment("nodes"));
+
+		Collaborator egoNode = coAuthorshipData.getEgoCollaborator();
+		Set<Collaborator> authorNodes = coAuthorshipData.getCollaborators();
+
+		/*
+		 * This method actually creates the XML code for a single Collaborator. "graphMLContent"
+		 * is being side-effected. The egoNode is added first because this is the "requirement"
+		 * of the co-author vis. Ego should always come first.
+		 *
+		 * */
+		getNodeContent(graphElement, egoNode);
+
+		List<Collaborator> orderedAuthorNodes = new ArrayList<Collaborator>(authorNodes);
+		orderedAuthorNodes.remove(egoNode);
+
+		orderedAuthorNodes.sort(new CollaboratorComparator());
+
+		for (Collaborator currNode : orderedAuthorNodes) {
+			/*
+			 * We have already printed the Ego Collaborator info.
+			 * */
+			if (currNode != egoNode) {
+				getNodeContent(graphElement, currNode);
+			}
+		}
+
+	}
+
+	private void getNodeContent(Element graphElement, Collaborator collaborator) {
+		Document doc = graphElement.getOwnerDocument();
+
+		ParamMap individualProfileURLParams =
+					new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, collaborator.getCollaboratorURI());
+
+		String profileURL = UrlBuilder.getUrl(VisualizationFrameworkConstants.INDIVIDUAL_URL_PREFIX, individualProfileURLParams);
+
+		Element node = doc.createElementNS(GRAPHML_NS, "node");
+		node.setAttribute("id", String.valueOf(collaborator.getCollaboratorID()));
+		graphElement.appendChild(node);
+
+		Element url = doc.createElementNS(GRAPHML_NS, "data");
+		url.setAttribute("key", "url");
+		url.setTextContent(collaborator.getCollaboratorURI());
+		node.appendChild(url);
+
+		Element label = doc.createElementNS(GRAPHML_NS, "data");
+		label.setAttribute("key", "label");
+		label.setTextContent(collaborator.getCollaboratorName());
+		node.appendChild(label);
+
+		if (profileURL != null) {
+			Element profile = doc.createElementNS(GRAPHML_NS, "data");
+			profile.setAttribute("key", "profile_url");
+			profile.setTextContent(profileURL);
+			node.appendChild(profile);
+		}
+
+		Element works = doc.createElementNS(GRAPHML_NS, "data");
+		works.setAttribute("key", "number_of_authored_works");
+		works.setTextContent(String.valueOf(collaborator.getNumOfActivities()));
+		node.appendChild(works);
+
+		if (collaborator.getEarliestActivityYearCount() != null) {
+			/*
+			 * There is no clean way of getting the map contents in java even though
+			 * we are sure to have only one entry on the map. So using the for loop.
+			 * I am feeling dirty just about now.
+			 * */
+			for (Map.Entry<String, Integer> publicationInfo : collaborator.getEarliestActivityYearCount().entrySet()) {
+				Element earliest = doc.createElementNS(GRAPHML_NS, "data");
+				earliest.setAttribute("key", "earliest_publication");
+				earliest.setTextContent(publicationInfo.getKey());
+				node.appendChild(earliest);
+
+				Element earliestCount = doc.createElementNS(GRAPHML_NS, "data");
+				earliestCount.setAttribute("key", "num_earliest_publication");
+				earliestCount.setTextContent(publicationInfo.getValue().toString());
+				node.appendChild(earliestCount);
+			}
+		}
+
+		if (collaborator.getLatestActivityYearCount() != null) {
+			for (Map.Entry<String, Integer> publicationInfo : collaborator.getLatestActivityYearCount().entrySet()) {
+				Element latest = doc.createElementNS(GRAPHML_NS, "data");
+				latest.setAttribute("key", "latest_publication");
+				latest.setTextContent(publicationInfo.getKey());
+				node.appendChild(latest);
+
+				Element latestCount = doc.createElementNS(GRAPHML_NS, "data");
+				latestCount.setAttribute("key", "num_latest_publication");
+				latestCount.setTextContent(publicationInfo.getValue().toString());
+				node.appendChild(latestCount);
+			}
+		}
+
+		if (collaborator.getUnknownActivityYearCount() != null) {
+			Element unknown = doc.createElementNS(GRAPHML_NS, "data");
+			unknown.setAttribute("key", "num_unknown_publication");
+			unknown.setTextContent(String.valueOf(collaborator.getUnknownActivityYearCount()));
+			node.appendChild(unknown);
+		}
+	}
+
+	private void generateKeyDefinitionContent(CollaborationData visVOContainer, Element rootElement) {
+		/*
+		 * Generate the key definition content for node.
+		 * */
+		getKeyDefinitionFromSchema(visVOContainer.getNodeSchema(), rootElement);
+
+		/*
+		 * Generate the key definition content for edge.
+		 * */
+		getKeyDefinitionFromSchema(visVOContainer.getEdgeSchema(), rootElement);
+
+
+	}
+
+	private void getKeyDefinitionFromSchema(Set<Map<String, String>> schema, Element rootElement) {
+		Document doc = rootElement.getOwnerDocument();
+
+		for (Map<String, String> currentNodeSchemaAttribute : schema) {
+			Element key = doc.createElementNS(GRAPHML_NS, "key");
+
+			for (Map.Entry<String, String> currentAttributeKey : currentNodeSchemaAttribute.entrySet()) {
+				key.setAttribute(currentAttributeKey.getKey(), currentAttributeKey.getValue());
+			}
+
+			if (currentNodeSchemaAttribute.containsKey("default")) {
+				Element def = doc.createElementNS(GRAPHML_NS, "default");
+				def.setTextContent(currentNodeSchemaAttribute.get("default"));
+				key.appendChild(def);
+			}
+
+			rootElement.appendChild(key);
+		}
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java
index 649e086238..bfb64a9808 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java
@@ -46,8 +46,8 @@
 /**
  * This query runner is used to execute a sparql query to get all the publications
  * for a particular individual. It will also fetch all the authors that worked
- * on that particular publication. 
- * 
+ * on that particular publication.
+ *
  * @author cdtank
  */
 public class CoAuthorshipQueryRunner implements QueryRunner<CoAuthorshipData> {
@@ -63,7 +63,7 @@ public class CoAuthorshipQueryRunner implements QueryRunner<CoAuthorshipData> {
 	private RDFService rdfService;
 
 	private VitroRequest vitroRequest;
-	
+
 	private Log log;
 
 	public CoAuthorshipQueryRunner(String egoURI, VitroRequest vreq, Log log) {
@@ -77,12 +77,12 @@ public CoAuthorshipQueryRunner(String egoURI, VitroRequest vreq, Log log) {
 
 	private static class QueryResultConsumer extends ResultSetConsumer {
 		Set<Collaborator> nodes = new HashSet<Collaborator>();
-		
+
 		Map<String, Activity> biboDocumentURLToVO = new HashMap<String, Activity>();
 		Map<String, Set<Collaborator>> biboDocumentURLToCoAuthors = new HashMap<String, Set<Collaborator>>();
 		Map<String, Collaborator> nodeURLToVO = new HashMap<String, Collaborator>();
 		Map<String, Collaboration> edgeUniqueIdentifierToVO = new HashMap<String, Collaboration>();
-		
+
 		Collaborator egoNode = null;
 
 		Set<Collaboration> edges = new HashSet<Collaboration>();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
index 0acfcfc145..b4e8a4d450 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
@@ -28,10 +28,10 @@
 /**
  * This request handler is used when information related to co-authorship network
  * for an individual is requested. It currently provides 2 outputs,
- * 		1. Graphml content representing the individual's co-authorship network 
- * 		1. CSV file containing the list(& count) of unique co-authors with which 
+ * 		1. Graphml content representing the individual's co-authorship network
+ * 		1. CSV file containing the list(& count) of unique co-authors with which
  * the individual has worked over the years. This data powers the related sparkline.
- *  
+ *
  * @author cdtank
  */
 public class CoAuthorshipRequestHandler implements VisualizationRequestHandler {
@@ -54,7 +54,7 @@ public Map<String, String> generateDataVisualization(
 			VitroRequest vitroRequest, Log log, Dataset dataset)
 			throws MalformedQueryParametersException {
 
-	
+
 		String egoURI = vitroRequest.getParameter(
 				VisualizationFrameworkConstants
 						.INDIVIDUAL_URI_KEY);
@@ -65,88 +65,88 @@ public Map<String, String> generateDataVisualization(
 
 		CoAuthorshipQueryRunner queryManager =
 		new CoAuthorshipQueryRunner(egoURI, vitroRequest, log);
-		
-		CollaborationData authorNodesAndEdges = 
+
+		CollaborationData authorNodesAndEdges =
 		queryManager.getQueryResult();
-	
-    	/* 
+
+    	/*
     	 * We will be using the same visualization package for both sparkline & coauthorship
-    	 * flash vis. We will use "VIS_MODE_KEY" as a modifier to differentiate 
+    	 * flash vis. We will use "VIS_MODE_KEY" as a modifier to differentiate
     	 * between these two. The default will be to render the coauthorship network vis.
-    	 * */ 
+    	 * */
 		if (VisualizationFrameworkConstants.COAUTHORS_COUNT_PER_YEAR_VIS_MODE
-				.equalsIgnoreCase(visMode)) { 
+				.equalsIgnoreCase(visMode)) {
 			/*
-			 * When the csv file is required - based on which sparkline visualization will 
+			 * When the csv file is required - based on which sparkline visualization will
 			 * be rendered.
 			 * */
 				return prepareCoauthorsCountPerYearDataResponse(authorNodesAndEdges);
-				
+
 		} else if (VisualizationFrameworkConstants.COAUTHORS_LIST_VIS_MODE
-				.equalsIgnoreCase(visMode)) { 
+				.equalsIgnoreCase(visMode)) {
 			/*
-			 * When the csv file is required - based on which sparkline visualization will 
+			 * When the csv file is required - based on which sparkline visualization will
 			 * be rendered.
 			 * */
 				return prepareCoauthorsListDataResponse(authorNodesAndEdges);
-				
+
 		} else if (VisualizationFrameworkConstants.COAUTHOR_NETWORK_DOWNLOAD_VIS_MODE
-				.equalsIgnoreCase(visMode)) { 
+				.equalsIgnoreCase(visMode)) {
 			/*
-			 * When the csv file is required - based on which sparkline visualization will 
+			 * When the csv file is required - based on which sparkline visualization will
 			 * be rendered.
 			 * */
 				return prepareNetworkDownloadDataResponse(authorNodesAndEdges);
-				
+
 		} else {
     			/*
-    			 * When the graphML file is required - based on which coauthorship network 
+    			 * When the graphML file is required - based on which coauthorship network
     			 * visualization will be rendered.
     			 * */
     			return prepareNetworkStreamDataResponse(authorNodesAndEdges);
 		}
-	
+
 	}
 
 	public ResponseValues generateStandardVisualization(VitroRequest vitroRequest,
-											  	Log log, 
-											    Dataset dataset) 
+											  	Log log,
+											    Dataset dataset)
 		throws MalformedQueryParametersException {
 
-		throw new UnsupportedOperationException("CoAuthorship Visualization " 
+		throw new UnsupportedOperationException("CoAuthorship Visualization "
 						+ "does not provide Standalone response.");
 	}
-	
+
 	private String getCoauthorsListCSVContent(CollaborationData coAuthorshipData) {
-		
+
 		StringBuilder csvFileContent = new StringBuilder();
-		
+
 		csvFileContent.append("Co-author, Count\n");
-		
-		for (Collaborator currNode : coAuthorshipData.getCollaborators()) {			
+
+		for (Collaborator currNode : coAuthorshipData.getCollaborators()) {
 			/*
 			 * We have already printed the Ego Node info.
 			 * */
 			if (currNode != coAuthorshipData.getEgoCollaborator()) {
-				
-			
+
+
 			csvFileContent.append(StringEscapeUtils.escapeCsv(currNode.getCollaboratorName()));
 			csvFileContent.append(",");
 			csvFileContent.append(currNode.getNumOfActivities());
 			csvFileContent.append("\n");
-			
+
 			}
 		}
-		
+
 		return csvFileContent.toString();
 	}
 
 	private String getCoauthorsPerYearCSVContent(Map<String, Set<Collaborator>> yearToCoauthors) {
-		
+
 		StringBuilder csvFileContent = new StringBuilder();
-		
+
 		csvFileContent.append("Year, Count, Co-author(s)\n");
-		
+
 		for (Entry<String, Set<Collaborator>> currentEntry : yearToCoauthors.entrySet()) {
 			csvFileContent.append(StringEscapeUtils.escapeCsv(currentEntry.getKey()));
 			csvFileContent.append(",");
@@ -156,136 +156,136 @@ private String getCoauthorsPerYearCSVContent(Map<String, Set<Collaborator>> year
 										getCoauthorNamesAsString(currentEntry.getValue())));
 			csvFileContent.append("\n");
 		}
-		
+
 		return csvFileContent.toString();
-			
+
 	}
-	
+
 	private String getCoauthorNamesAsString(Set<Collaborator> coAuthors) {
-		
+
 		StringBuilder coAuthorsMerged = new StringBuilder();
-		
+
 		String coAuthorSeparator = "; ";
 		for (Collaborator currCoAuthor : coAuthors) {
 			coAuthorsMerged.append(currCoAuthor.getCollaboratorName()).append(coAuthorSeparator);
 		}
-		
+
 		return StringUtils.removeEnd(coAuthorsMerged.toString(), coAuthorSeparator);
 	}
 
 	/**
-	 * Provides response when a csv file containing number & names of unique co-authors per 
-	 * year is requested. 
+	 * Provides response when a csv file containing number & names of unique co-authors per
+	 * year is requested.
 	 * @param authorNodesAndEdges Author nodes and edges
 	 */
 	private Map<String, String> prepareCoauthorsCountPerYearDataResponse(
 					CollaborationData authorNodesAndEdges) {
-		
+
 		String outputFileName;
 		Map<String, Set<Collaborator>> yearToCoauthors = new TreeMap<String, Set<Collaborator>>();
-		
-		if (authorNodesAndEdges.getCollaborators() != null 
+
+		if (authorNodesAndEdges.getCollaborators() != null
 					&& authorNodesAndEdges.getCollaborators().size() > 0) {
-			
+
 			outputFileName = UtilityFunctions.slugify(authorNodesAndEdges
 									.getEgoCollaborator().getCollaboratorName())
 			+ "_co-authors-per-year" + ".csv";
-			
+
 			yearToCoauthors = UtilityFunctions.getActivityYearToCollaborators(authorNodesAndEdges);
-			
+
 		} else {
-			
-			outputFileName = "no_co-authors-per-year" + ".csv";			
+
+			outputFileName = "no_co-authors-per-year" + ".csv";
 		}
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, 
+		fileData.put(DataVisualizationController.FILE_NAME_KEY,
 					 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 getCoauthorsPerYearCSVContent(yearToCoauthors));
 
 		return fileData;
 	}
 
 	/**
-	 * Provides response when a csv file containing number & names of unique co-authors per 
-	 * year is requested. 
+	 * Provides response when a csv file containing number & names of unique co-authors per
+	 * year is requested.
 	 * @param coAuthorshipData   Co authorship data
 	 */
 	private Map<String, String> prepareCoauthorsListDataResponse(
 					CollaborationData coAuthorshipData) {
-		
+
 		String outputFileName = "";
 
-		if (coAuthorshipData.getCollaborators() != null 
+		if (coAuthorshipData.getCollaborators() != null
 					&& coAuthorshipData.getCollaborators().size() > 0) {
-			
+
 			outputFileName = UtilityFunctions.slugify(coAuthorshipData.getEgoCollaborator()
-															.getCollaboratorName()) 
+															.getCollaboratorName())
 									+ "_co-authors" + ".csv";
 		} else {
 			outputFileName = "no_co-authors" + ".csv";
 		}
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, 
+		fileData.put(DataVisualizationController.FILE_NAME_KEY,
 					 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 getCoauthorsListCSVContent(coAuthorshipData));
 
 		return fileData;
 	}
-	
+
 	/**
-	 * Provides a response when graphml formatted co-authorship network is requested, typically by 
+	 * Provides a response when graphml formatted co-authorship network is requested, typically by
 	 * the flash vis.
 	 * @param authorNodesAndEdges Author nodes and edges
 	 */
 	private Map<String, String> prepareNetworkStreamDataResponse(
 									CollaborationData authorNodesAndEdges) {
-	
-		CoAuthorshipGraphMLWriter coAuthorshipGraphMLWriter = 
+
+		CoAuthorshipGraphMLWriter coAuthorshipGraphMLWriter =
 				new CoAuthorshipGraphMLWriter(authorNodesAndEdges);
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "text/xml");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 coAuthorshipGraphMLWriter.getCoAuthorshipGraphMLContent().toString());
 
 		return fileData;
-	
+
 	}
-	
+
 	private Map<String, String> prepareNetworkDownloadDataResponse(
 									CollaborationData authorNodesAndEdges) {
-		
+
 		String outputFileName = "";
-		
-		if (authorNodesAndEdges.getCollaborators() != null 
+
+		if (authorNodesAndEdges.getCollaborators() != null
 					&& authorNodesAndEdges.getCollaborators().size() > 0) {
-			
+
 			outputFileName = UtilityFunctions.slugify(authorNodesAndEdges
-									.getEgoCollaborator().getCollaboratorName()) 
+									.getEgoCollaborator().getCollaboratorName())
 									+ "_co-author-network.graphml" + ".xml";
-			
+
 		} else {
-			outputFileName = "no_co-author-network.graphml" + ".xml";			
+			outputFileName = "no_co-author-network.graphml" + ".xml";
 		}
-		
-		CoAuthorshipGraphMLWriter coAuthorshipGraphMLWriter = 
+
+		CoAuthorshipGraphMLWriter coAuthorshipGraphMLWriter =
 				new CoAuthorshipGraphMLWriter(authorNodesAndEdges);
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-        fileData.put(DataVisualizationController.FILE_NAME_KEY, 
+        fileData.put(DataVisualizationController.FILE_NAME_KEY,
 				 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "text/xml");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 coAuthorshipGraphMLWriter.getCoAuthorshipGraphMLContent().toString());
 
 		return fileData;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
index bcbfdf1f4c..e0766860eb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
@@ -1,254 +1,254 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-
-
-public class CoAuthorshipVisCodeGenerator {
-
-	/*
-	 * There are 2 modes of sparkline that are available via this visualization.
-	 * 		1. Short Sparkline - This sparkline will render all the data points (or sparks),
-	 * 			which in this case are the coauthors over the years, from the last 10 years.
-	 * 
-	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks) 
-	 * 			spanning the career of the person & last 10 years at the minimum, in case if
-	 * 			the person started his career in the last 10 yeras.
-	 * */
-	private static final String DEFAULT_VISCONTAINER_DIV_ID = "unique_coauthors_vis_container";
-	
-	private Map<String, Set<Collaborator>> yearToUniqueCoauthors;
-
-	private Log log;
-
-	private SparklineData sparklineParameterVO;
-
-	private String individualURI;
-
-	public CoAuthorshipVisCodeGenerator(String individualURI, 
-									  String visMode, 
-									  String visContainer, 
-									  Map<String, Set<Collaborator>> yearToUniqueCoauthors, 
-									  Log log) {
-		
-		this.individualURI = individualURI;
-		
-		this.yearToUniqueCoauthors = yearToUniqueCoauthors;
-		
-		this.log = log;
-		
-		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
-	}
-	
-	/**
-	 * This method is used to setup parameters for the sparkline value object. These parameters
-	 * will be used in the template to construct the actual html/javascript code.
-	 * @param visMode Visualization mode
-	 * @param providedVisContainerID Container ID
-	 */
-	private SparklineData setupSparklineParameters(String visMode,
-										    String providedVisContainerID) {
-		
-		SparklineData sparklineData = new SparklineData();
-
-		int numOfYearsToBeRendered = 0;
-		
-		/*
-		 * It was decided that to prevent downward curve that happens if there are no publications 
-		 * in the current year seems a bit harsh, so we consider only publications from the last 10
-		 * complete years. 
-		 * */
-		int currentYear = Calendar.getInstance().get(Calendar.YEAR) - 1;
-		int shortSparkMinYear = currentYear 
-									- VisConstants.MINIMUM_YEARS_CONSIDERED_FOR_SPARKLINE 
-									+ 1;
-		
-    	/*
-    	 * This is required because when deciding the range of years over which the vis
-    	 * was rendered we dont want to be influenced by the "DEFAULT_PUBLICATION_YEAR".
-    	 * */
-		Set<String> publishedYears = new HashSet<String>(yearToUniqueCoauthors.keySet());
-    	publishedYears.remove(VOConstants.DEFAULT_PUBLICATION_YEAR);
-		
-		/*
-		 * We are setting the default value of minPublishedYear to be 10 years before 
-		 * the current year (which is suitably represented by the shortSparkMinYear),
-		 * this in case we run into invalid set of published years.
-		 * */
-		int minPublishedYear = shortSparkMinYear;
-		
-		String visContainerID = null;
-		
-		if (yearToUniqueCoauthors.size() > 0) {
-			try {
-				minPublishedYear = Integer.parseInt(Collections.min(publishedYears));
-			} catch (NoSuchElementException | NumberFormatException e1) {
-				log.debug("vis: " + e1.getMessage() + " error occurred for " 
-							+ yearToUniqueCoauthors.toString());
-			}
-        }
-		
-		int minPubYearConsidered = 0;
-		
-		/*
-		 * There might be a case that the author has made his first publication within the 
-		 * last 10 years but we want to make sure that the sparkline is representative of 
-		 * at least the last 10 years, so we will set the minPubYearConsidered to 
-		 * "currentYear - 10" which is also given by "shortSparkMinYear".
-		 * */
-		if (minPublishedYear > shortSparkMinYear) {
-			minPubYearConsidered = shortSparkMinYear;
-		} else {
-			minPubYearConsidered = minPublishedYear;
-		}
-		
-		numOfYearsToBeRendered = currentYear - minPubYearConsidered + 1;
-		
-		sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered);
-		
-		int uniqueCoAuthorCounter = 0;
-		Set<Collaborator> allCoAuthorsWithKnownAuthorshipYears = new HashSet<Collaborator>();
-		List<YearToEntityCountDataElement> yearToUniqueCoauthorsCountDataTable = 
-					new ArrayList<YearToEntityCountDataElement>();
-		
-		for (int publicationYear = minPubYearConsidered; 
-					publicationYear <= currentYear; 
-					publicationYear++) {
-
-				String publicationYearAsString = String.valueOf(publicationYear);
-				Set<Collaborator> currentCoAuthors = yearToUniqueCoauthors
-															.get(publicationYearAsString);
-				
-				Integer currentUniqueCoAuthors = null;
-				
-				if (currentCoAuthors != null) {
-					currentUniqueCoAuthors = currentCoAuthors.size();
-					allCoAuthorsWithKnownAuthorshipYears.addAll(currentCoAuthors); 
-				} else {
-					currentUniqueCoAuthors = 0;
-				}
-				
-				yearToUniqueCoauthorsCountDataTable.add(
-						new YearToEntityCountDataElement(uniqueCoAuthorCounter, 
-														 publicationYearAsString, 
-														 currentUniqueCoAuthors));
-				uniqueCoAuthorCounter++;
-		}
-
-		/*
-		 * For the purpose of this visualization I have come up with a term "Sparks" which 
-		 * essentially means data points. 
-		 * Sparks that will be rendered in full mode will always be the one's which have any year
-		 * associated with it. Hence.
-		 * */
-		sparklineData.setRenderedSparks(allCoAuthorsWithKnownAuthorshipYears.size());
-		
-		sparklineData.setYearToEntityCountDataTable(yearToUniqueCoauthorsCountDataTable);
-		
-		/*
-		 * This is required only for the sparklines which convey collaborationships like 
-		 * coinvestigatorships and coauthorship. There are edge cases where a collaborator can be 
-		 * present for in a collaboration with known & unknown year. We do not want to repeat the 
-		 * count for this collaborator when we present it in the front-end. 
-		 * */
-		Set<Collaborator> totalUniqueCoInvestigators = 
-							new HashSet<Collaborator>(allCoAuthorsWithKnownAuthorshipYears);
-
-		/*
-		 * Total publications will also consider publications that have no year associated with
-		 * them. Hence.
-		 * */
-		Integer unknownYearCoauthors = 0;
-		if (yearToUniqueCoauthors.get(VOConstants.DEFAULT_PUBLICATION_YEAR) != null) {
-			unknownYearCoauthors = yearToUniqueCoauthors
-											.get(VOConstants.DEFAULT_PUBLICATION_YEAR).size();
-			
-			totalUniqueCoInvestigators.addAll(
-					yearToUniqueCoauthors.get(VOConstants.DEFAULT_GRANT_YEAR));
-		}
-		
-		sparklineData.setUnknownYearPublications(unknownYearCoauthors);
-		
-		sparklineData.setTotalCollaborationshipCount(totalUniqueCoInvestigators.size());
-		
-		if (providedVisContainerID != null) {
-			visContainerID = providedVisContainerID;
-		} else {
-			visContainerID = DEFAULT_VISCONTAINER_DIV_ID;
-		}
-
-		sparklineData.setVisContainerDivID(visContainerID);
-		
-		/*
-		 * By default these represents the range of the rendered sparks. Only in case of
-		 * "short" sparkline mode we will set the Earliest RenderedPublication year to
-		 * "currentYear - 10". 
-		 * */
-		sparklineData.setEarliestYearConsidered(minPubYearConsidered);
-		sparklineData.setEarliestRenderedPublicationYear(minPublishedYear);
-		sparklineData.setLatestRenderedPublicationYear(currentYear);
-		
-		/*
-		 * The Full Sparkline will be rendered by default. Only if the url has specific mention of
-		 * SHORT_SPARKLINE_MODE_KEY then we render the short sparkline and not otherwise.
-		 * */
-		if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) {
-			
-			sparklineData.setEarliestRenderedPublicationYear(shortSparkMinYear);
-			sparklineData.setShortVisMode(true);
-
-		} else {
-			sparklineData.setShortVisMode(false);
-		}
-		
-		if (yearToUniqueCoauthors.size() > 0) {
-			
-			sparklineData.setFullTimelineNetworkLink(
-					UtilityFunctions.getCollaboratorshipNetworkLink(
-							individualURI,
-							VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
-							VisualizationFrameworkConstants.COAUTHOR_VIS_MODE));
-			
-			sparklineData.setDownloadDataLink(
-					UtilityFunctions.getCSVDownloadURL(
-							individualURI,
-							VisualizationFrameworkConstants.COAUTHORSHIP_VIS,
-							VisualizationFrameworkConstants.COAUTHORS_COUNT_PER_YEAR_VIS_MODE));
-			
-			Map<String, Integer> yearToUniqueCoauthorsCount = new HashMap<String, Integer>();
-			
-			for (Map.Entry<String, Set<Collaborator>> currentYearToCoAuthors 
-							: yearToUniqueCoauthors.entrySet()) {
-				yearToUniqueCoauthorsCount.put(currentYearToCoAuthors.getKey(), 
-											   currentYearToCoAuthors.getValue().size());
-			}
-			
-			sparklineData.setYearToActivityCount(yearToUniqueCoauthorsCount);
-		}
-		
-		return sparklineData;
-	}
-	
-	public SparklineData getValueObjectContainer() {
-		return this.sparklineParameterVO;
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+
+
+public class CoAuthorshipVisCodeGenerator {
+
+	/*
+	 * There are 2 modes of sparkline that are available via this visualization.
+	 * 		1. Short Sparkline - This sparkline will render all the data points (or sparks),
+	 * 			which in this case are the coauthors over the years, from the last 10 years.
+	 *
+	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks)
+	 * 			spanning the career of the person & last 10 years at the minimum, in case if
+	 * 			the person started his career in the last 10 yeras.
+	 * */
+	private static final String DEFAULT_VISCONTAINER_DIV_ID = "unique_coauthors_vis_container";
+
+	private Map<String, Set<Collaborator>> yearToUniqueCoauthors;
+
+	private Log log;
+
+	private SparklineData sparklineParameterVO;
+
+	private String individualURI;
+
+	public CoAuthorshipVisCodeGenerator(String individualURI,
+									  String visMode,
+									  String visContainer,
+									  Map<String, Set<Collaborator>> yearToUniqueCoauthors,
+									  Log log) {
+
+		this.individualURI = individualURI;
+
+		this.yearToUniqueCoauthors = yearToUniqueCoauthors;
+
+		this.log = log;
+
+		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
+	}
+
+	/**
+	 * This method is used to setup parameters for the sparkline value object. These parameters
+	 * will be used in the template to construct the actual html/javascript code.
+	 * @param visMode Visualization mode
+	 * @param providedVisContainerID Container ID
+	 */
+	private SparklineData setupSparklineParameters(String visMode,
+										    String providedVisContainerID) {
+
+		SparklineData sparklineData = new SparklineData();
+
+		int numOfYearsToBeRendered = 0;
+
+		/*
+		 * It was decided that to prevent downward curve that happens if there are no publications
+		 * in the current year seems a bit harsh, so we consider only publications from the last 10
+		 * complete years.
+		 * */
+		int currentYear = Calendar.getInstance().get(Calendar.YEAR) - 1;
+		int shortSparkMinYear = currentYear
+									- VisConstants.MINIMUM_YEARS_CONSIDERED_FOR_SPARKLINE
+									+ 1;
+
+    	/*
+    	 * This is required because when deciding the range of years over which the vis
+    	 * was rendered we dont want to be influenced by the "DEFAULT_PUBLICATION_YEAR".
+    	 * */
+		Set<String> publishedYears = new HashSet<String>(yearToUniqueCoauthors.keySet());
+    	publishedYears.remove(VOConstants.DEFAULT_PUBLICATION_YEAR);
+
+		/*
+		 * We are setting the default value of minPublishedYear to be 10 years before
+		 * the current year (which is suitably represented by the shortSparkMinYear),
+		 * this in case we run into invalid set of published years.
+		 * */
+		int minPublishedYear = shortSparkMinYear;
+
+		String visContainerID = null;
+
+		if (yearToUniqueCoauthors.size() > 0) {
+			try {
+				minPublishedYear = Integer.parseInt(Collections.min(publishedYears));
+			} catch (NoSuchElementException | NumberFormatException e1) {
+				log.debug("vis: " + e1.getMessage() + " error occurred for "
+							+ yearToUniqueCoauthors.toString());
+			}
+        }
+
+		int minPubYearConsidered = 0;
+
+		/*
+		 * There might be a case that the author has made his first publication within the
+		 * last 10 years but we want to make sure that the sparkline is representative of
+		 * at least the last 10 years, so we will set the minPubYearConsidered to
+		 * "currentYear - 10" which is also given by "shortSparkMinYear".
+		 * */
+		if (minPublishedYear > shortSparkMinYear) {
+			minPubYearConsidered = shortSparkMinYear;
+		} else {
+			minPubYearConsidered = minPublishedYear;
+		}
+
+		numOfYearsToBeRendered = currentYear - minPubYearConsidered + 1;
+
+		sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered);
+
+		int uniqueCoAuthorCounter = 0;
+		Set<Collaborator> allCoAuthorsWithKnownAuthorshipYears = new HashSet<Collaborator>();
+		List<YearToEntityCountDataElement> yearToUniqueCoauthorsCountDataTable =
+					new ArrayList<YearToEntityCountDataElement>();
+
+		for (int publicationYear = minPubYearConsidered;
+					publicationYear <= currentYear;
+					publicationYear++) {
+
+				String publicationYearAsString = String.valueOf(publicationYear);
+				Set<Collaborator> currentCoAuthors = yearToUniqueCoauthors
+															.get(publicationYearAsString);
+
+				Integer currentUniqueCoAuthors = null;
+
+				if (currentCoAuthors != null) {
+					currentUniqueCoAuthors = currentCoAuthors.size();
+					allCoAuthorsWithKnownAuthorshipYears.addAll(currentCoAuthors);
+				} else {
+					currentUniqueCoAuthors = 0;
+				}
+
+				yearToUniqueCoauthorsCountDataTable.add(
+						new YearToEntityCountDataElement(uniqueCoAuthorCounter,
+														 publicationYearAsString,
+														 currentUniqueCoAuthors));
+				uniqueCoAuthorCounter++;
+		}
+
+		/*
+		 * For the purpose of this visualization I have come up with a term "Sparks" which
+		 * essentially means data points.
+		 * Sparks that will be rendered in full mode will always be the one's which have any year
+		 * associated with it. Hence.
+		 * */
+		sparklineData.setRenderedSparks(allCoAuthorsWithKnownAuthorshipYears.size());
+
+		sparklineData.setYearToEntityCountDataTable(yearToUniqueCoauthorsCountDataTable);
+
+		/*
+		 * This is required only for the sparklines which convey collaborationships like
+		 * coinvestigatorships and coauthorship. There are edge cases where a collaborator can be
+		 * present for in a collaboration with known & unknown year. We do not want to repeat the
+		 * count for this collaborator when we present it in the front-end.
+		 * */
+		Set<Collaborator> totalUniqueCoInvestigators =
+							new HashSet<Collaborator>(allCoAuthorsWithKnownAuthorshipYears);
+
+		/*
+		 * Total publications will also consider publications that have no year associated with
+		 * them. Hence.
+		 * */
+		Integer unknownYearCoauthors = 0;
+		if (yearToUniqueCoauthors.get(VOConstants.DEFAULT_PUBLICATION_YEAR) != null) {
+			unknownYearCoauthors = yearToUniqueCoauthors
+											.get(VOConstants.DEFAULT_PUBLICATION_YEAR).size();
+
+			totalUniqueCoInvestigators.addAll(
+					yearToUniqueCoauthors.get(VOConstants.DEFAULT_GRANT_YEAR));
+		}
+
+		sparklineData.setUnknownYearPublications(unknownYearCoauthors);
+
+		sparklineData.setTotalCollaborationshipCount(totalUniqueCoInvestigators.size());
+
+		if (providedVisContainerID != null) {
+			visContainerID = providedVisContainerID;
+		} else {
+			visContainerID = DEFAULT_VISCONTAINER_DIV_ID;
+		}
+
+		sparklineData.setVisContainerDivID(visContainerID);
+
+		/*
+		 * By default these represents the range of the rendered sparks. Only in case of
+		 * "short" sparkline mode we will set the Earliest RenderedPublication year to
+		 * "currentYear - 10".
+		 * */
+		sparklineData.setEarliestYearConsidered(minPubYearConsidered);
+		sparklineData.setEarliestRenderedPublicationYear(minPublishedYear);
+		sparklineData.setLatestRenderedPublicationYear(currentYear);
+
+		/*
+		 * The Full Sparkline will be rendered by default. Only if the url has specific mention of
+		 * SHORT_SPARKLINE_MODE_KEY then we render the short sparkline and not otherwise.
+		 * */
+		if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) {
+
+			sparklineData.setEarliestRenderedPublicationYear(shortSparkMinYear);
+			sparklineData.setShortVisMode(true);
+
+		} else {
+			sparklineData.setShortVisMode(false);
+		}
+
+		if (yearToUniqueCoauthors.size() > 0) {
+
+			sparklineData.setFullTimelineNetworkLink(
+					UtilityFunctions.getCollaboratorshipNetworkLink(
+							individualURI,
+							VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
+							VisualizationFrameworkConstants.COAUTHOR_VIS_MODE));
+
+			sparklineData.setDownloadDataLink(
+					UtilityFunctions.getCSVDownloadURL(
+							individualURI,
+							VisualizationFrameworkConstants.COAUTHORSHIP_VIS,
+							VisualizationFrameworkConstants.COAUTHORS_COUNT_PER_YEAR_VIS_MODE));
+
+			Map<String, Integer> yearToUniqueCoauthorsCount = new HashMap<String, Integer>();
+
+			for (Map.Entry<String, Set<Collaborator>> currentYearToCoAuthors
+							: yearToUniqueCoauthors.entrySet()) {
+				yearToUniqueCoauthorsCount.put(currentYearToCoAuthors.getKey(),
+											   currentYearToCoAuthors.getValue().size());
+			}
+
+			sparklineData.setYearToActivityCount(yearToUniqueCoauthorsCount);
+		}
+
+		return sparklineData;
+	}
+
+	public SparklineData getValueObjectContainer() {
+		return this.sparklineParameterVO;
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java
index 4ad11a8dab..08415e3785 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java
@@ -27,169 +27,169 @@ public Map<String, Activity> getDocuments() {
 	public Set<Map<String, String>> initializeEdgeSchema() {
 
 		Set<Map<String, String>> edgeSchema = new HashSet<Map<String, String>>();
-		
+
 			Map<String, String> schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "collaborator1");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "collaborator1");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "collaborator2");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "collaborator2");
 			schemaAttributes.put("attr.type", "string");
-		
-		edgeSchema.add(schemaAttributes);		
-		
+
+		edgeSchema.add(schemaAttributes);
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "number_of_coauthored_works");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "number_of_coauthored_works");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "earliest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "earliest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_earliest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "num_earliest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "latest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "latest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_latest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "num_latest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_unknown_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "num_unknown_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 		return edgeSchema;
 	}
-	
+
 
 	public Set<Map<String, String>> initializeNodeSchema() {
-		
+
 		Set<Map<String, String>> nodeSchema = new HashSet<Map<String, String>>();
 
-			Map<String, String> schemaAttributes = new LinkedHashMap<String, String>();   
-			
+			Map<String, String> schemaAttributes = new LinkedHashMap<String, String>();
+
 			schemaAttributes.put("id", "url");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "url");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		nodeSchema.add(schemaAttributes);
-	
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-		
+
 			schemaAttributes.put("id", "label");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "label");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-		
+
 			schemaAttributes.put("id", "profile_url");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "profile_url");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		nodeSchema.add(schemaAttributes);
-	
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "number_of_authored_works");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "number_of_authored_works");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "earliest_publication");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "earliest_publication");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_earliest_publication");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "num_earliest_publication");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "latest_publication");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "latest_publication");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_latest_publication");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "num_latest_publication");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_unknown_publication");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "num_unknown_publication");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
-		
+
+
 		return nodeSchema;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
index da5db8a865..49ba383080 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
@@ -27,169 +27,169 @@ public Map<String, Activity> getGrants() {
 	public Set<Map<String, String>> initializeEdgeSchema() {
 
 		Set<Map<String, String>> edgeSchema = new HashSet<Map<String, String>>();
-		
+
 		Map<String, String> schemaAttributes = new LinkedHashMap<String, String>();
-		
+
 			schemaAttributes.put("id", "collaborator1");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "collaborator1");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "collaborator2");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "collaborator2");
 			schemaAttributes.put("attr.type", "string");
-		
-		edgeSchema.add(schemaAttributes);		
-		
+
+		edgeSchema.add(schemaAttributes);
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "number_of_coinvestigated_grants");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "number_of_coinvestigated_grants");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "earliest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "earliest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_earliest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "num_earliest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "latest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "latest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_latest_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "num_latest_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_unknown_collaboration");
 			schemaAttributes.put("for", "edge");
 			schemaAttributes.put("attr.name", "num_unknown_collaboration");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		edgeSchema.add(schemaAttributes);
-		
+
 		return edgeSchema;
 	}
-	
+
 
 	public Set<Map<String, String>> initializeNodeSchema() {
-		
+
 		Set<Map<String, String>> nodeSchema = new HashSet<Map<String, String>>();
 
-		Map<String, String> schemaAttributes = new LinkedHashMap<String, String>();   
-		
+		Map<String, String> schemaAttributes = new LinkedHashMap<String, String>();
+
 			schemaAttributes.put("id", "url");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "url");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		nodeSchema.add(schemaAttributes);
-	
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-		
+
 			schemaAttributes.put("id", "label");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "label");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-		
+
 			schemaAttributes.put("id", "profile_url");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "profile_url");
 			schemaAttributes.put("attr.type", "string");
-		
+
 		nodeSchema.add(schemaAttributes);
-	
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "number_of_investigated_grants");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "number_of_investigated_grants");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "earliest_grant");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "earliest_grant");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_earliest_grant");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "num_earliest_grant");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "latest_grant");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "latest_grant");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_latest_grant");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "num_latest_grant");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
+
 			schemaAttributes = new LinkedHashMap<String, String>();
-			
+
 			schemaAttributes.put("id", "num_unknown_grant");
 			schemaAttributes.put("for", "node");
 			schemaAttributes.put("attr.name", "num_unknown_grant");
 			schemaAttributes.put("attr.type", "int");
-		
+
 		nodeSchema.add(schemaAttributes);
-		
-		
+
+
 		return nodeSchema;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java
index e0da2dac31..8b97fb3fe4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java
@@ -1,22 +1,22 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
-
-import java.util.Comparator;
-
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
-
-
-/**
- * This Comparator is used to sort the edges based on their IDs in ascending order.
- * @author cdtank
- *
- */
-public class CollaborationComparator implements Comparator<Collaboration> {
-
-	@Override
-	public int compare(Collaboration arg0, Collaboration arg1) {
-		return arg0.getCollaborationID() - arg1.getCollaborationID();
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
+
+import java.util.Comparator;
+
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
+
+
+/**
+ * This Comparator is used to sort the edges based on their IDs in ascending order.
+ * @author cdtank
+ *
+ */
+public class CollaborationComparator implements Comparator<Collaboration> {
+
+	@Override
+	public int compare(Collaboration arg0, Collaboration arg1) {
+		return arg0.getCollaborationID() - arg1.getCollaborationID();
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java
index 4e94c24b6d..d577c4d08a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java
@@ -1,73 +1,73 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
-
-public abstract class CollaborationData {
-	
-	private Set<Collaborator> collaborators;
-	private Set<Collaboration> collaborations;
-	private Collaborator egoCollaborator;
-	private Set<Map<String, String>> NODE_SCHEMA;
-	private Set<Map<String, String>> EDGE_SCHEMA;
-
-	private Date builtFromCacheTime = null;
-		
-	public CollaborationData(Collaborator egoCollaborator, 
-							Set<Collaborator> collaborators, 
-							Set<Collaboration> collaborations) {
-		this.egoCollaborator = egoCollaborator;
-		this.collaborators = collaborators;
-		this.collaborations = collaborations;
-	}
-
-	public Date getBuiltFromCacheTime() { return builtFromCacheTime; }
-
-	public Set<Collaborator> getCollaborators() {
-		return collaborators;
-	}
-
-	public Set<Collaboration> getCollaborations() {
-		return collaborations;
-	}	
-	
-	public Collaborator getEgoCollaborator() {
-		return egoCollaborator;
-	}
-	
-	/*
-	 * Node Schema for graphML
-	 * */
-	public Set<Map<String, String>> getNodeSchema() {
-		
-		if (NODE_SCHEMA == null) {
-			NODE_SCHEMA = initializeNodeSchema();			
-		}
-		
-		return NODE_SCHEMA;
-	}
-	
-	/*
-	 * Edge Schema for graphML
-	 * */
-	public Set<Map<String, String>> getEdgeSchema() {
-		
-		if (EDGE_SCHEMA == null) {
-			EDGE_SCHEMA = initializeEdgeSchema();			
-		}
-		
-		return EDGE_SCHEMA;
-	}
-
-	public void setBuiltFromCacheTime(Date time) { this.builtFromCacheTime = time; }
-
-	abstract Set<Map<String, String>> initializeEdgeSchema();
-	
-	abstract Set<Map<String, String>> initializeNodeSchema();	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
+
+public abstract class CollaborationData {
+
+	private Set<Collaborator> collaborators;
+	private Set<Collaboration> collaborations;
+	private Collaborator egoCollaborator;
+	private Set<Map<String, String>> NODE_SCHEMA;
+	private Set<Map<String, String>> EDGE_SCHEMA;
+
+	private Date builtFromCacheTime = null;
+
+	public CollaborationData(Collaborator egoCollaborator,
+							Set<Collaborator> collaborators,
+							Set<Collaboration> collaborations) {
+		this.egoCollaborator = egoCollaborator;
+		this.collaborators = collaborators;
+		this.collaborations = collaborations;
+	}
+
+	public Date getBuiltFromCacheTime() { return builtFromCacheTime; }
+
+	public Set<Collaborator> getCollaborators() {
+		return collaborators;
+	}
+
+	public Set<Collaboration> getCollaborations() {
+		return collaborations;
+	}
+
+	public Collaborator getEgoCollaborator() {
+		return egoCollaborator;
+	}
+
+	/*
+	 * Node Schema for graphML
+	 * */
+	public Set<Map<String, String>> getNodeSchema() {
+
+		if (NODE_SCHEMA == null) {
+			NODE_SCHEMA = initializeNodeSchema();
+		}
+
+		return NODE_SCHEMA;
+	}
+
+	/*
+	 * Edge Schema for graphML
+	 * */
+	public Set<Map<String, String>> getEdgeSchema() {
+
+		if (EDGE_SCHEMA == null) {
+			EDGE_SCHEMA = initializeEdgeSchema();
+		}
+
+		return EDGE_SCHEMA;
+	}
+
+	public void setBuiltFromCacheTime(Date time) { this.builtFromCacheTime = time; }
+
+	abstract Set<Map<String, String>> initializeEdgeSchema();
+
+	abstract Set<Map<String, String>> initializeNodeSchema();
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java
index 24bfc739dd..c1218ef3d9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java
@@ -1,21 +1,21 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
-
-import java.util.Comparator;
-
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
-
-
-/**
- * This Comparator is used to sort the nodes based on their IDs in ascending order.
- * @author cdtank
- */
-public class CollaboratorComparator implements Comparator<Collaborator> {
-
-	@Override
-	public int compare(Collaborator arg0, Collaborator arg1) {
-		return arg0.getCollaboratorID() - arg1.getCollaboratorID();
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
+
+import java.util.Comparator;
+
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
+
+
+/**
+ * This Comparator is used to sort the nodes based on their IDs in ascending order.
+ * @author cdtank
+ */
+public class CollaboratorComparator implements Comparator<Collaborator> {
+
+	@Override
+	public int compare(Collaborator arg0, Collaborator arg1) {
+		return arg0.getCollaboratorID() - arg1.getCollaboratorID();
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java
index 40ebe6db47..f9c83a7d80 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java
@@ -1,1145 +1,1145 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.constants;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This contains the constants related to map of science visualization.
- * @author cdtank
- */
-@SuppressWarnings("serial")
-public class MapOfScienceConstants {
-	
-	public static final Map<Integer, String> DISCIPLINE_ID_TO_LABEL = new HashMap<Integer, String>() {{
-		put(1, "Health Professionals");
-		put(2, "Chemistry");
-		put(3, "Social Sciences");
-		put(4, "Humanities");
-		put(5, "Brain Research");
-		put(6, "Medical Specialties");
-		put(7, "Infectious Diseases");
-		put(8, "Biotechnology");
-		put(9, "Biology");
-		put(10, "Earth Sciences");
-		put(11, "Chemical, Mechanical, & Civil Engineering");
-		put(12, "Math & Physics");
-		put(13, "Electrical Engineering & Computer Science");
-	}};	
-
-	
-	public static final Map<Integer, String> SUB_DISCIPLINE_ID_TO_LABEL = new HashMap<Integer, String>() {{
-		put(1, "Clinical Cancer Research");
-		put(2, "Circulation");
-		put(3, "Data Mining");
-		put(4, "Protein Science");
-		put(5, "Signal Processing");
-		put(6, "Neuroscience; Molecular & Cellular");
-		put(7, "Anesthetics & Analgesics");
-		put(8, "Urology");
-		put(9, "Immunology");
-		put(10, "Macromolecules & Polymers");
-		put(11, "Affective Disorders");
-		put(12, "Oncology");
-		put(13, "Surface Science");
-		put(14, "Nonlinear Analysis");
-		put(15, "Hospital Financial Management");
-		put(16, "Rheumatology");
-		put(17, "Occupational Health");
-		put(18, "Organic Chemistry");
-		put(19, "Leukemia");
-		put(20, "Virology");
-		put(21, "Plant Physiology");
-		put(22, "Allergy & Clinical Immunology");
-		put(23, "Material Science");
-		put(24, "Dermatology");
-		put(25, "Kidney");
-		put(26, "Pharmacology Science");
-		put(27, "Law");
-		put(28, "Medical Imaging");
-		put(29, "Bacteriology");
-		put(30, "Marine Biology");
-		put(31, "Developmental Biology");
-		put(32, "Digestion");
-		put(33, "Toxicology Applied Pharmacology");
-		put(34, "Transportation Research");
-		put(35, "Inorganic Chemistry");
-		put(36, "Chemical Engineering");
-		put(37, "Pharmaceutical Research");
-		put(38, "Semiconducting Materials");
-		put(39, "Diabetes Care");
-		put(40, "Clinical Neurophysiology");
-		put(41, "Opthomology");
-		put(42, "Nutrition");
-		put(43, "Finance");
-		put(44, "Neurosurgery");
-		put(45, "Fertility");
-		put(46, "Applied Optics");
-		put(47, "Nuclear Engineering");
-		put(48, "Molecular Cell Biology");
-		put(49, "Food Chemistry");
-		put(50, "Obstectrics");
-		put(51, "Chest & Respiratory");
-		put(52, "Earthquake Engineering");
-		put(53, "Zoology");
-		put(54, "Pharmaceutical Design");
-		put(55, "AntiMicrobial Agents");
-		put(56, "Systems Software");
-		put(57, "Decision Support Systems");
-		put(58, "Business Ethics");
-		put(59, "Vascular Surgery");
-		put(60, "Pulp & Paper");
-		put(61, "Seismology");
-		put(62, "Bone Joint Surgery");
-		put(63, "Neurology");
-		put(64, "Algebra");
-		put(65, "Antenna");
-		put(66, "Circuit Systems");
-		put(67, "Nursing Specialists");
-		put(68, "Retinal Surgery");
-		put(69, "Psychopharmacology");
-		put(70, "Aeronautics & Astronautics");
-		put(71, "Psychoanalysis");
-		put(72, "Oceanography");
-		put(73, "Sports Medicine");
-		put(74, "Operations Research");
-		put(75, "Chromatography; Electrophoresis");
-		put(76, "Pediatrics");
-		put(77, "Cardiovascular");
-		put(78, "Paleobiology");
-		put(79, "Economics");
-		put(80, "Hypertension");
-		put(81, "Human Molecular Genetics");
-		put(82, "Clinical Endocrinology");
-		put(83, "Dietetics");
-		put(84, "Clinical Microbiology");
-		put(85, "Hospital Pharmacy");
-		put(86, "Gas Turbines");
-		put(87, "Remote Sensing");
-		put(88, "Computational Chemistry");
-		put(89, "Surgery");
-		put(90, "Ceramics");
-		put(91, "AIDS");
-		put(92, "Military Aviation");
-		put(93, "Medical Records");
-		put(94, "Statistics");
-		put(95, "Applied Economics");
-		put(96, "Automatic Control");
-		put(97, "Atmospheric Science");
-		put(98, "Automotive Engineering");
-		put(99, "BioStatistics");
-		put(100, "Employee Health Benefit Plans");
-		put(101, "Transplantation");
-		put(102, "Alloys");
-		put(103, "Astronomy & Astrophysics");
-		put(104, "Substance-abuse Treatment");
-		put(105, "Research Policy; Technology Management");
-		put(106, "Drug Discovery");
-		put(107, "Animal Science");
-		put(108, "Chaos Fractals & Complexity");
-		put(109, "Environmental Contamination");
-		put(110, "Otolaryngology; Laryngoscope");
-		put(111, "Mechanical Design Engineering");
-		put(112, "Classics");
-		put(113, "Biological Conservation");
-		put(114, "Thoracic Surgery");
-		put(115, "Phytochemistry");
-		put(116, "Tropical Medicine");
-		put(117, "Food Protection");
-		put(118, "Broadband Communication");
-		put(119, "Energy Fuel");
-		put(120, "Soil Quality");
-		put(121, "Integrated Circuit Design");
-		put(122, "Philosophy Psychology");
-		put(123, "Construction & Project Management");
-		put(124, "Social Psychology");
-		put(125, "High Energy Physics");
-		put(126, "Strategic Management");
-		put(127, "Genomics & Nucleic Acids");
-		put(128, "Heat Transfer");
-		put(129, "Cement & Concrete");
-		put(130, "Pathology");
-		put(131, "Pest Management Science");
-		put(132, "Corrosion");
-		put(133, "Veterinary Science");
-		put(134, "Teacher Education; Evaluation");
-		put(135, "Stem Cells");
-		put(136, "Image Processing");
-		put(137, "Neural Networks");
-		put(138, "Nursing Education");
-		put(139, "Intensive Care");
-		put(140, "Alternative Complementary Medicine");
-		put(141, "Petroleum Engineering");
-		put(142, "Music & Theatre");
-		put(143, "Memory & Cognition");
-		put(144, "Vision");
-		put(145, "Communication Research");
-		put(146, "BioInformatics");
-		put(147, "Mechanics of Solids & Structures");
-		put(148, "Pharmacy");
-		put(149, "Geomorphology");
-		put(150, "Psychosis; Schizophrenia");
-		put(151, "BioEthics");
-		put(152, "Parellel Computing");
-		put(153, "Power Distribution");
-		put(154, "Gerontology");
-		put(155, "Wood");
-		put(156, "Discrete Applied Mathematics");
-		put(157, "Geology & Tectonics");
-		put(158, "GeoChemistry");
-		put(159, "Mobil Networks");
-		put(160, "Artificial Intelligence");
-		put(161, "Electro Analytical Chemistry");
-		put(162, "Dental Education");
-		put(163, "Enzyme Microbiological Techniques");
-		put(164, "Library Science; Infomation Retrieval");
-		put(165, "Biomaterials");
-		put(166, "Quaternary Research");
-		put(167, "Endoscopy");
-		put(168, "Composites");
-		put(169, "Language Learning");
-		put(170, "History; Gender Studies");
-		put(171, "Leadership & Organizational Behavior");
-		put(172, "Agricultural Engineering");
-		put(173, "Computer-Aided Process Planning");
-		put(174, "Geriatrics");
-		put(175, "Solid State Electronics");
-		put(176, "Optics & Lasers");
-		put(177, "Wool");
-		put(178, "Biomechanics");
-		put(179, "Molecular Physics");
-		put(180, "Comparative Animal Physiology");
-		put(181, "Political Science");
-		put(182, "History Philosophy");
-		put(183, "Poetry");
-		put(184, "Nuclear Medicine");
-		put(185, "Nanotechnology");
-		put(186, "Speech Recognitation");
-		put(187, "Fluid Mechanics");
-		put(188, "Computer Graphics");
-		put(189, "Filtration Membrane");
-		put(190, "Clinical Infectious Disease");
-		put(191, "Prosthetic Dentistry");
-		put(192, "Orthodontics");
-		put(193, "Robotic Systems");
-		put(194, "Dental Research");
-		put(195, "Atomic Spectrometry");
-		put(196, "Botany");
-		put(197, "Public Health Service");
-		put(198, "Political Geography");
-		put(199, "Catalysis");
-		put(200, "Radiation Protection");
-		put(201, "Machine Tools");
-		put(202, "Veterinary Medicine");
-		put(203, "Periodontology");
-		put(204, "Birth Defects");
-		put(205, "Thrombosis");
-		put(206, "Freshwater Biology");
-		put(207, "Mental Health Nursing");
-		put(208, "Artificial Evolution");
-		put(209, "English Literature");
-		put(210, "Plastic Surgery");
-		put(211, "Nursing Administration");
-		put(212, "Higher Education");
-		put(213, "Ecology");
-		put(214, "Modern Language");
-		put(215, "Neurophsyiology & Neuroscience");
-		put(216, "Mining");
-		put(217, "Aquaculture");
-		put(218, "Molecular Biological Evolution");
-		put(219, "Photonics");
-		put(220, "Urban Studies");
-		put(221, "Functional Analysis");
-		put(222, "Linguistics");
-		put(223, "Photo-Optics");
-		put(224, "Spine");
-		put(225, "Robotics");
-		put(226, "Audiology");
-		put(227, "Soil Science");
-		put(228, "Simulation");
-		put(229, "Nuclear Instrumentation");
-		put(230, "Hispanic Studies");
-		put(231, "Forest Science");
-		put(232, "Plasma Physics");
-		put(233, "Proteomics");
-		put(234, "Symbolic Interaction");
-		put(235, "Child & Adolescent Psychiatry");
-		put(236, "General Practice");
-		put(237, "Environmental Management");
-		put(238, "Diabetes Metabolism");
-		put(239, "Geotechnical Engineering");
-		put(240, "Instrumentation");
-		put(241, "Clinical Chemistry");
-		put(242, "Fluid Engineering");
-		put(243, "Arthroscopy");
-		put(244, "Eating Disorders; Sex Roles");
-		put(245, "Water Quality & Resource Management");
-		put(246, "Ethnic Migration");
-		put(247, "Geriatric Psychiatry");
-		put(248, "Sound & Vibration");
-		put(249, "Ore Processing");
-		put(250, "Ethnology");
-		put(251, "Prenatal Diagnostics");
-		put(252, "Cancer (translated)");
-		put(253, "Dialectics");
-		put(254, "Atmospheric GeoPhysics");
-		put(255, "Flavors & Fragrance");
-		put(256, "Numerical Methods in Engineering");
-		put(257, "EthnoPharmcology");
-		put(258, "Electrocardiography");
-		put(259, "International Development");
-		put(260, "Electrochemistry");
-		put(261, "Political Studies");
-		put(262, "Molecular Endocrinology");
-		put(263, "Surface Coating Technology");
-		put(264, "Molecular Biochemical Parasitology");
-		put(265, "Vocational Counseling");
-		put(266, "Oil & Natural Gas");
-		put(267, "International Conflict");
-		put(268, "Art History");
-		put(269, "Applied Catalysis");
-		put(270, "Agricultural Economics");
-		put(271, "Social Work");
-		put(272, "Medical Insurance");
-		put(273, "Fluid Phase Equilibrium");
-		put(274, "Biotechnology Trends");
-		put(275, "Air Quality");
-		put(276, "Search Engines; Web Crawling");
-		put(277, "Colloid");
-		put(278, "Applied Physiology; Muscle");
-		put(279, "Biblical Literature");
-		put(280, "Fault Tolerant Computing");
-		put(281, "Third World Political Economics");
-		put(282, "Public Hospitals");
-		put(283, "Sociology");
-		put(284, "Horticulture");
-		put(285, "Bone & Osteoporosis");
-		put(286, "Radiation Therapy");
-		put(287, "Water Treatment");
-		put(288, "Spyware; Malware");
-		put(289, "Behavioral Research Therapy");
-		put(290, "Science Education");
-		put(291, "Design & Analysis of Algorithms");
-		put(292, "Hospice Care");
-		put(293, "Climatology");
-		put(294, "Crop Science");
-		put(295, "Fuzzy Sets");
-		put(296, "Vehicle System Design");
-		put(297, "Transfusion");
-		put(298, "AIDS Treatment");
-		put(299, "Wireless Communication");
-		put(300, "Atherosclerosis");
-		put(301, "Region & Medical Ethics");
-		put(302, "Speech Language & Hearing");
-		put(303, "Thoracic & Respiratory");
-		put(304, "Veterinary Microbiology");
-		put(305, "Environmental Protection");
-		put(306, "Computer Systems Design");
-		put(307, "Environmental Polution");
-		put(308, "Electrical Networks");
-		put(309, "Endoscopy");
-		put(310, "Chemistry & Material Science");
-		put(311, "Medical Screening & Epidemiology");
-		put(312, "Child Development");
-		put(313, "Pain");
-		put(314, "Public Administration");
-		put(315, "Soil Analysis");
-		put(316, "Safety Management");
-		put(317, "Pattern Recognition");
-		put(318, "Mental Health Assessment");
-		put(319, "Clinical Medicine (translated)");
-		put(320, "Mutation; DNA Repair");
-		put(321, "Human Evolution");
-		put(322, "Space Research");
-		put(323, "Entomology");
-		put(324, "Epilepsy");
-		put(325, "Plant Ecology");
-		put(326, "Computer Aided Molecular Design");
-		put(327, "Criminology");
-		put(328, "Forensic Psychiatry");
-		put(329, "Personality");
-		put(330, "Test Equipment");
-		put(331, "Logic");
-		put(332, "Pulp Paper Science");
-		put(333, "Textiles");
-		put(334, "Contemporary Philosophy");
-		put(335, "Hydrology Soil Contamination");
-		put(336, "Child Abuse");
-		put(337, "Mathematics Research");
-		put(338, "Geology (International)");
-		put(339, "Environmental Chemistry");
-		put(340, "Parasitology");
-		put(341, "Dairy Science");
-		put(342, "Water Policy");
-		put(343, "Fish Research");
-		put(344, "Printing");
-		put(345, "Genetics");
-		put(346, "Industrial Chemistry");
-		put(347, "Obesity");
-		put(348, "Literary Criticism");
-		put(349, "Hepatology");
-		put(350, "Physical Therapy; Brain Injury");
-		put(351, "Computational & Applied Math");
-		put(352, "World Health Organization");
-		put(353, "Geophysical Science");
-		put(354, "Forensic Medicine");
-		put(355, "Psychiatric Services");
-		put(356, "Software Design and Development");
-		put(357, "Wildlife Management");
-		put(358, "Ocean Coastal Management");
-		put(359, "Database Design & Management");
-		put(360, "Financial Accounting");
-		put(361, "Microbiology Biotechnology");
-		put(362, "Water Utilities");
-		put(363, "Sedimentary Geology");
-		put(364, "Geodesy");
-		put(365, "Surfactants");
-		put(366, "Eye");
-		put(367, "Addictive Behavior");
-		put(368, "Naval Architecture");
-		put(369, "Environmental Microbiology");
-		put(370, "Electronic Imaging");
-		put(371, "Functional Programing");
-		put(372, "Applied Genetics");
-		put(373, "Plant Disease");
-		put(374, "Water Resource");
-		put(375, "Developmental Economics");
-		put(376, "Nuclear Physics");
-		put(377, "International Economics");
-		put(378, "Radiology");
-		put(379, "German Studies");
-		put(380, "Medieval History");
-		put(381, "Philosophy of Education");
-		put(382, "Oceanographic Instrumentation");
-		put(383, "Foreign Policy");
-		put(384, "Gut");
-		put(385, "Microwaves; Radio Frequencies");
-		put(386, "School Psychology");
-		put(387, "Vaccines");
-		put(388, "Environmental Law");
-		put(389, "Mass Spectrometry");
-		put(390, "Psychiatric Nursing");
-		put(391, "Asian Studies");
-		put(392, "Optimization Theory");
-		put(393, "Mathematical Science (Russia)");
-		put(394, "Gene Therapy");
-		put(395, "Security; Cryptography");
-		put(396, "Materials Processing");
-		put(397, "Rural Health Care");
-		put(398, "Power Systems");
-		put(399, "Surgical Oncology");
-		put(400, "Chip Design & Manufacturing");
-		put(401, "Sociobiology");
-		put(402, "Molecular Medicine");
-		put(403, "Human Resource Management");
-		put(404, "Ecological Modeling");
-		put(405, "Clinical Rehabilitation");
-		put(406, "Metallurgy");
-		put(407, "Ethics");
-		put(408, "Marital & Family Therapy");
-		put(409, "Aerospace");
-		put(410, "Critical Studies");
-		put(411, "Econometrics");
-		put(412, "Neuroscience Methods");
-		put(413, "Mineralogy");
-		put(414, "Trauma");
-		put(415, "Thermal Analysis");
-		put(416, "Solar & Wind Power");
-		put(417, "Ocean Engineering");
-		put(418, "Educational Psychology");
-		put(419, "Mycology");
-		put(420, "Semiotics");
-		put(421, "Dyes & Pigments");
-		put(422, "Drug Safety");
-		put(423, "Molecular Ecology");
-		put(424, "Cytogentics & Genome Mapping");
-		put(425, "Clinical Psychiatry");
-		put(426, "Paleogeography");
-		put(427, "Water Waste");
-		put(428, "Computer Networks");
-		put(429, "Weed Management");
-		put(430, "User Interface Design");
-		put(431, "Public Policy");
-		put(432, "Liquid Crystals");
-		put(433, "Control Systems");
-		put(434, "Environmental Policy");
-		put(435, "Topology");
-		put(436, "Construction");
-		put(437, "Dams & Tunnels");
-		put(438, "Regional Studies");
-		put(439, "Electrochemical Development");
-		put(440, "Digital Printing");
-		put(441, "Peptides");
-		put(442, "Applied Geophysics");
-		put(443, "Sexually Transmitted Diseases");
-		put(444, "Engineering Education");
-		put(445, "NeuroImmunology");
-		put(446, "Machine Learning");
-		put(447, "Geriatric Nursing");
-		put(448, "Sensors & Actuators");
-		put(449, "Systematics & Evolutionary Microbiology");
-		put(450, "Image Processing");
-		put(451, "Medical Education");
-		put(452, "Magnetic Resonance Imagery");
-		put(453, "Hospital Management");
-		put(454, "Insect Physiology");
-		put(455, "Power Transmission");
-		put(456, "Food Engineering");
-		put(457, "Oral Surgery");
-		put(458, "Computer Systems Theory");
-		put(459, "Combustion");
-		put(460, "Dermatological Surgery");
-		put(461, "Wildlife Research");
-		put(462, "Midwifery");
-		put(463, "Physics; Current Developments");
-		put(464, "Psychiatric & Behavioral Genetics");
-		put(465, "Fractures & Fatigue");
-		put(466, "Emergency Medicine");
-		put(467, "Cross Disciplinary Studies");
-		put(468, "Archeological Science");
-		put(469, "Preventive Medicine");
-		put(470, "Carbon");
-		put(471, "Gynecology Oncology");
-		put(472, "Psychosomatic Medicine");
-		put(473, "Pharmaco Economics");
-		put(474, "Computer Modeling and Animation");
-		put(475, "Medical Practice");
-		put(476, "Cancer Statistics");
-		put(477, "Consciousness");
-		put(478, "Otolaryngology; Head Neck");
-		put(479, "Heart Failure; Catheters");
-		put(480, "Wood & Wood Components");
-		put(481, "Circuits");
-		put(482, "Friction Lubrication & Wear");
-		put(483, "Superconductor Science");
-		put(484, "Antennae; Mobile Radio");
-		put(485, "Headache");
-		put(486, "Operations Management");
-		put(487, "Fish Biology");
-		put(488, "Economic & Human Biology");
-		put(489, "Consumer Electronics");
-		put(490, "Menopause");
-		put(491, "Chemistry (Russia)");
-		put(492, "GeoPolitics");
-		put(493, "Glaciology");
-		put(494, "Medical Libraries");
-		put(495, "Opera");
-		put(496, "Education");
-		put(497, "Acoustics");
-		put(498, "Pragmatics & Discourse");
-		put(499, "Reproduction Veterinary");
-		put(500, "Crystallography");
-		put(501, "Applied Math & Computation");
-		put(502, "Socio-Cultural Anthropology");
-		put(503, "Poultry Science");
-		put(504, "Artifical Organs");
-		put(505, "Physical Therapy; Orthopedic");
-		put(506, "Pulmonary");
-		put(507, "Waste Management");
-		put(508, "Marine Pollution");
-		put(509, "Toxins");
-		put(510, "Hearing Research");
-		put(511, "Human Rights");
-		put(512, "Lung Cancer");
-		put(513, "Social Economics");
-		put(514, "Carbohydrate Research");
-		put(515, "Biotechnology Bioengineering");
-		put(516, "Rural Studies");
-		put(517, "Electronics");
-		put(518, "Defects & Diffusion in Materials");
-		put(519, "Forensic Science");
-		put(520, "Rangeland Ecology");
-		put(521, "Welding");
-		put(522, "Reliability Engineering");
-		put(523, "Molecular Biology Methods");
-		put(524, "Mammals");
-		put(525, "Impotence");
-		put(526, "Fuzzy Logic");
-		put(527, "Tourism");
-		put(528, "Aquatic Disease");
-		put(529, "Geographic Information Science");
-		put(530, "Hormone Research");
-		put(531, "Public Health");
-		put(532, "Sleep");
-		put(533, "Neurotoxicology");
-		put(534, "Pediatric Research");
-		put(535, "Education Psychological Measures");
-		put(536, "Marketing");
-		put(537, "Clinical Medicine (Romania)");
-		put(538, "Green Chemistry");
-		put(539, "Optometry");
-		put(540, "Textile Art");
-		put(541, "Italian Studies");
-		put(542, "Perception Motor Skills");
-		put(543, "World Trade; Law");
-		put(544, "Insects");
-		put(545, "Australian Ecology");
-		put(546, "Paints & Coatings");
-		put(547, "Nursing Theory");
-		put(548, "Crustaceans");
-		put(549, "Laser Surgery");
-		put(550, "Bulk Solid Handling");
-		put(551, "Wetlands");
-		put(552, "GIS (non English)");
-		put(553, "Power Transmission & Control");
-		put(554, "Agricultural Environmental Medicine");
-	}};		
-	
-	public static final Map<Integer, Integer> SUB_DISCIPLINE_ID_TO_DISCIPLINE_ID = new HashMap<Integer, Integer>() {{ 
-		put(1, 7);
-		put(2, 6);
-		put(3, 13);
-		put(4, 7);
-		put(5, 13);
-		put(6, 5);
-		put(7, 6);
-		put(8, 6);
-		put(9, 7);
-		put(10, 2);
-		put(11, 1);
-		put(12, 6);
-		put(13, 12);
-		put(14, 12);
-		put(15, 1);
-		put(16, 7);
-		put(17, 1);
-		put(18, 2);
-		put(19, 7);
-		put(20, 7);
-		put(21, 9);
-		put(22, 6);
-		put(23, 11);
-		put(24, 1);
-		put(25, 6);
-		put(26, 5);
-		put(27, 3);
-		put(28, 1);
-		put(29, 7);
-		put(30, 11);
-		put(31, 7);
-		put(32, 6);
-		put(33, 1);
-		put(34, 11);
-		put(35, 2);
-		put(36, 11);
-		put(37, 1);
-		put(38, 12);
-		put(39, 6);
-		put(40, 5);
-		put(41, 1);
-		put(42, 6);
-		put(43, 3);
-		put(44, 1);
-		put(45, 6);
-		put(46, 13);
-		put(47, 11);
-		put(48, 7);
-		put(49, 8);
-		put(50, 6);
-		put(51, 6);
-		put(52, 11);
-		put(53, 9);
-		put(54, 2);
-		put(55, 6);
-		put(56, 13);
-		put(57, 3);
-		put(58, 3);
-		put(59, 6);
-		put(60, 11);
-		put(61, 10);
-		put(62, 1);
-		put(63, 5);
-		put(64, 12);
-		put(65, 13);
-		put(66, 13);
-		put(67, 1);
-		put(68, 1);
-		put(69, 5);
-		put(70, 11);
-		put(71, 1);
-		put(72, 11);
-		put(73, 1);
-		put(74, 3);
-		put(75, 2);
-		put(76, 6);
-		put(77, 6);
-		put(78, 10);
-		put(79, 3);
-		put(80, 6);
-		put(81, 7);
-		put(82, 6);
-		put(83, 6);
-		put(84, 6);
-		put(85, 6);
-		put(86, 11);
-		put(87, 11);
-		put(88, 2);
-		put(89, 6);
-		put(90, 11);
-		put(91, 6);
-		put(92, 12);
-		put(93, 1);
-		put(94, 3);
-		put(95, 3);
-		put(96, 13);
-		put(97, 11);
-		put(98, 11);
-		put(99, 3);
-		put(100, 1);
-		put(101, 6);
-		put(102, 11);
-		put(103, 12);
-		put(104, 1);
-		put(105, 3);
-		put(106, 6);
-		put(107, 6);
-		put(108, 12);
-		put(109, 11);
-		put(110, 1);
-		put(111, 11);
-		put(112, 4);
-		put(113, 9);
-		put(114, 6);
-		put(115, 2);
-		put(116, 9);
-		put(117, 8);
-		put(118, 13);
-		put(119, 11);
-		put(120, 11);
-		put(121, 13);
-		put(122, 4);
-		put(123, 3);
-		put(124, 3);
-		put(125, 12);
-		put(126, 3);
-		put(127, 8);
-		put(128, 11);
-		put(129, 11);
-		put(130, 7);
-		put(131, 9);
-		put(132, 11);
-		put(133, 6);
-		put(134, 3);
-		put(135, 6);
-		put(136, 13);
-		put(137, 13);
-		put(138, 1);
-		put(139, 6);
-		put(140, 6);
-		put(141, 11);
-		put(142, 4);
-		put(143, 5);
-		put(144, 5);
-		put(145, 3);
-		put(146, 8);
-		put(147, 11);
-		put(148, 6);
-		put(149, 10);
-		put(150, 1);
-		put(151, 1);
-		put(152, 13);
-		put(153, 13);
-		put(154, 1);
-		put(155, 11);
-		put(156, 12);
-		put(157, 10);
-		put(158, 10);
-		put(159, 13);
-		put(160, 13);
-		put(161, 2);
-		put(162, 1);
-		put(163, 8);
-		put(164, 13);
-		put(165, 1);
-		put(166, 10);
-		put(167, 6);
-		put(168, 11);
-		put(169, 3);
-		put(170, 4);
-		put(171, 3);
-		put(172, 11);
-		put(173, 3);
-		put(174, 1);
-		put(175, 12);
-		put(176, 12);
-		put(177, 11);
-		put(178, 1);
-		put(179, 2);
-		put(180, 9);
-		put(181, 3);
-		put(182, 4);
-		put(183, 4);
-		put(184, 1);
-		put(185, 12);
-		put(186, 13);
-		put(187, 11);
-		put(188, 13);
-		put(189, 11);
-		put(190, 6);
-		put(191, 1);
-		put(192, 1);
-		put(193, 13);
-		put(194, 1);
-		put(195, 2);
-		put(196, 9);
-		put(197, 1);
-		put(198, 3);
-		put(199, 2);
-		put(200, 6);
-		put(201, 11);
-		put(202, 6);
-		put(203, 1);
-		put(204, 7);
-		put(205, 6);
-		put(206, 9);
-		put(207, 1);
-		put(208, 13);
-		put(209, 4);
-		put(210, 1);
-		put(211, 1);
-		put(212, 3);
-		put(213, 9);
-		put(214, 4);
-		put(215, 5);
-		put(216, 11);
-		put(217, 9);
-		put(218, 9);
-		put(219, 13);
-		put(220, 3);
-		put(221, 12);
-		put(222, 4);
-		put(223, 11);
-		put(224, 1);
-		put(225, 13);
-		put(226, 1);
-		put(227, 11);
-		put(228, 12);
-		put(229, 12);
-		put(230, 4);
-		put(231, 9);
-		put(232, 12);
-		put(233, 8);
-		put(234, 3);
-		put(235, 3);
-		put(236, 1);
-		put(237, 3);
-		put(238, 6);
-		put(239, 11);
-		put(240, 13);
-		put(241, 6);
-		put(242, 11);
-		put(243, 1);
-		put(244, 3);
-		put(245, 11);
-		put(246, 3);
-		put(247, 1);
-		put(248, 11);
-		put(249, 11);
-		put(250, 3);
-		put(251, 6);
-		put(252, 6);
-		put(253, 13);
-		put(254, 11);
-		put(255, 2);
-		put(256, 11);
-		put(257, 2);
-		put(258, 6);
-		put(259, 3);
-		put(260, 11);
-		put(261, 3);
-		put(262, 6);
-		put(263, 12);
-		put(264, 9);
-		put(265, 3);
-		put(266, 11);
-		put(267, 3);
-		put(268, 4);
-		put(269, 2);
-		put(270, 3);
-		put(271, 3);
-		put(272, 1);
-		put(273, 11);
-		put(274, 8);
-		put(275, 11);
-		put(276, 13);
-		put(277, 2);
-		put(278, 1);
-		put(279, 4);
-		put(280, 13);
-		put(281, 3);
-		put(282, 1);
-		put(283, 3);
-		put(284, 9);
-		put(285, 6);
-		put(286, 6);
-		put(287, 11);
-		put(288, 13);
-		put(289, 1);
-		put(290, 3);
-		put(291, 12);
-		put(292, 6);
-		put(293, 11);
-		put(294, 9);
-		put(295, 13);
-		put(296, 11);
-		put(297, 7);
-		put(298, 1);
-		put(299, 13);
-		put(300, 6);
-		put(301, 1);
-		put(302, 5);
-		put(303, 6);
-		put(304, 6);
-		put(305, 11);
-		put(306, 13);
-		put(307, 11);
-		put(308, 13);
-		put(309, 6);
-		put(310, 2);
-		put(311, 6);
-		put(312, 3);
-		put(313, 6);
-		put(314, 3);
-		put(315, 11);
-		put(316, 11);
-		put(317, 13);
-		put(318, 1);
-		put(319, 6);
-		put(320, 7);
-		put(321, 9);
-		put(322, 12);
-		put(323, 9);
-		put(324, 5);
-		put(325, 9);
-		put(326, 2);
-		put(327, 3);
-		put(328, 3);
-		put(329, 3);
-		put(330, 13);
-		put(331, 13);
-		put(332, 11);
-		put(333, 11);
-		put(334, 4);
-		put(335, 11);
-		put(336, 3);
-		put(337, 12);
-		put(338, 10);
-		put(339, 2);
-		put(340, 9);
-		put(341, 6);
-		put(342, 11);
-		put(343, 11);
-		put(344, 11);
-		put(345, 9);
-		put(346, 11);
-		put(347, 6);
-		put(348, 4);
-		put(349, 6);
-		put(350, 5);
-		put(351, 12);
-		put(352, 9);
-		put(353, 12);
-		put(354, 1);
-		put(355, 1);
-		put(356, 13);
-		put(357, 9);
-		put(358, 11);
-		put(359, 13);
-		put(360, 3);
-		put(361, 8);
-		put(362, 11);
-		put(363, 10);
-		put(364, 11);
-		put(365, 2);
-		put(366, 1);
-		put(367, 1);
-		put(368, 12);
-		put(369, 11);
-		put(370, 13);
-		put(371, 13);
-		put(372, 9);
-		put(373, 9);
-		put(374, 11);
-		put(375, 3);
-		put(376, 12);
-		put(377, 3);
-		put(378, 6);
-		put(379, 4);
-		put(380, 4);
-		put(381, 4);
-		put(382, 11);
-		put(383, 3);
-		put(384, 6);
-		put(385, 13);
-		put(386, 3);
-		put(387, 7);
-		put(388, 3);
-		put(389, 8);
-		put(390, 1);
-		put(391, 4);
-		put(392, 12);
-		put(393, 12);
-		put(394, 7);
-		put(395, 13);
-		put(396, 11);
-		put(397, 1);
-		put(398, 13);
-		put(399, 6);
-		put(400, 13);
-		put(401, 9);
-		put(402, 1);
-		put(403, 3);
-		put(404, 9);
-		put(405, 6);
-		put(406, 11);
-		put(407, 4);
-		put(408, 3);
-		put(409, 12);
-		put(410, 4);
-		put(411, 3);
-		put(412, 5);
-		put(413, 10);
-		put(414, 1);
-		put(415, 2);
-		put(416, 11);
-		put(417, 11);
-		put(418, 3);
-		put(419, 9);
-		put(420, 4);
-		put(421, 11);
-		put(422, 6);
-		put(423, 9);
-		put(424, 7);
-		put(425, 1);
-		put(426, 10);
-		put(427, 11);
-		put(428, 13);
-		put(429, 11);
-		put(430, 13);
-		put(431, 3);
-		put(432, 2);
-		put(433, 13);
-		put(434, 3);
-		put(435, 12);
-		put(436, 11);
-		put(437, 11);
-		put(438, 3);
-		put(439, 11);
-		put(440, 11);
-		put(441, 7);
-		put(442, 11);
-		put(443, 6);
-		put(444, 3);
-		put(445, 5);
-		put(446, 13);
-		put(447, 1);
-		put(448, 11);
-		put(449, 8);
-		put(450, 13);
-		put(451, 1);
-		put(452, 1);
-		put(453, 1);
-		put(454, 9);
-		put(455, 13);
-		put(456, 8);
-		put(457, 1);
-		put(458, 13);
-		put(459, 11);
-		put(460, 1);
-		put(461, 9);
-		put(462, 1);
-		put(463, 12);
-		put(464, 3);
-		put(465, 11);
-		put(466, 6);
-		put(467, 4);
-		put(468, 10);
-		put(469, 1);
-		put(470, 2);
-		put(471, 6);
-		put(472, 3);
-		put(473, 1);
-		put(474, 13);
-		put(475, 1);
-		put(476, 12);
-		put(477, 5);
-		put(478, 1);
-		put(479, 6);
-		put(480, 11);
-		put(481, 13);
-		put(482, 11);
-		put(483, 12);
-		put(484, 13);
-		put(485, 5);
-		put(486, 3);
-		put(487, 9);
-		put(488, 4);
-		put(489, 13);
-		put(490, 6);
-		put(491, 2);
-		put(492, 3);
-		put(493, 11);
-		put(494, 1);
-		put(495, 4);
-		put(496, 3);
-		put(497, 11);
-		put(498, 3);
-		put(499, 6);
-		put(500, 2);
-		put(501, 12);
-		put(502, 4);
-		put(503, 6);
-		put(504, 6);
-		put(505, 1);
-		put(506, 6);
-		put(507, 11);
-		put(508, 11);
-		put(509, 2);
-		put(510, 1);
-		put(511, 3);
-		put(512, 6);
-		put(513, 3);
-		put(514, 8);
-		put(515, 8);
-		put(516, 3);
-		put(517, 13);
-		put(518, 11);
-		put(519, 1);
-		put(520, 9);
-		put(521, 11);
-		put(522, 3);
-		put(523, 7);
-		put(524, 9);
-		put(525, 6);
-		put(526, 13);
-		put(527, 3);
-		put(528, 9);
-		put(529, 11);
-		put(530, 6);
-		put(531, 6);
-		put(532, 5);
-		put(533, 5);
-		put(534, 6);
-		put(535, 3);
-		put(536, 3);
-		put(537, 6);
-		put(538, 2);
-		put(539, 1);
-		put(540, 11);
-		put(541, 4);
-		put(542, 1);
-		put(543, 3);
-		put(544, 9);
-		put(545, 9);
-		put(546, 11);
-		put(547, 1);
-		put(548, 9);
-		put(549, 1);
-		put(550, 11);
-		put(551, 9);
-		put(552, 11);
-		put(553, 13);
-		put(554, 6);
-	}};
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.constants;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This contains the constants related to map of science visualization.
+ * @author cdtank
+ */
+@SuppressWarnings("serial")
+public class MapOfScienceConstants {
+
+	public static final Map<Integer, String> DISCIPLINE_ID_TO_LABEL = new HashMap<Integer, String>() {{
+		put(1, "Health Professionals");
+		put(2, "Chemistry");
+		put(3, "Social Sciences");
+		put(4, "Humanities");
+		put(5, "Brain Research");
+		put(6, "Medical Specialties");
+		put(7, "Infectious Diseases");
+		put(8, "Biotechnology");
+		put(9, "Biology");
+		put(10, "Earth Sciences");
+		put(11, "Chemical, Mechanical, & Civil Engineering");
+		put(12, "Math & Physics");
+		put(13, "Electrical Engineering & Computer Science");
+	}};
+
+
+	public static final Map<Integer, String> SUB_DISCIPLINE_ID_TO_LABEL = new HashMap<Integer, String>() {{
+		put(1, "Clinical Cancer Research");
+		put(2, "Circulation");
+		put(3, "Data Mining");
+		put(4, "Protein Science");
+		put(5, "Signal Processing");
+		put(6, "Neuroscience; Molecular & Cellular");
+		put(7, "Anesthetics & Analgesics");
+		put(8, "Urology");
+		put(9, "Immunology");
+		put(10, "Macromolecules & Polymers");
+		put(11, "Affective Disorders");
+		put(12, "Oncology");
+		put(13, "Surface Science");
+		put(14, "Nonlinear Analysis");
+		put(15, "Hospital Financial Management");
+		put(16, "Rheumatology");
+		put(17, "Occupational Health");
+		put(18, "Organic Chemistry");
+		put(19, "Leukemia");
+		put(20, "Virology");
+		put(21, "Plant Physiology");
+		put(22, "Allergy & Clinical Immunology");
+		put(23, "Material Science");
+		put(24, "Dermatology");
+		put(25, "Kidney");
+		put(26, "Pharmacology Science");
+		put(27, "Law");
+		put(28, "Medical Imaging");
+		put(29, "Bacteriology");
+		put(30, "Marine Biology");
+		put(31, "Developmental Biology");
+		put(32, "Digestion");
+		put(33, "Toxicology Applied Pharmacology");
+		put(34, "Transportation Research");
+		put(35, "Inorganic Chemistry");
+		put(36, "Chemical Engineering");
+		put(37, "Pharmaceutical Research");
+		put(38, "Semiconducting Materials");
+		put(39, "Diabetes Care");
+		put(40, "Clinical Neurophysiology");
+		put(41, "Opthomology");
+		put(42, "Nutrition");
+		put(43, "Finance");
+		put(44, "Neurosurgery");
+		put(45, "Fertility");
+		put(46, "Applied Optics");
+		put(47, "Nuclear Engineering");
+		put(48, "Molecular Cell Biology");
+		put(49, "Food Chemistry");
+		put(50, "Obstectrics");
+		put(51, "Chest & Respiratory");
+		put(52, "Earthquake Engineering");
+		put(53, "Zoology");
+		put(54, "Pharmaceutical Design");
+		put(55, "AntiMicrobial Agents");
+		put(56, "Systems Software");
+		put(57, "Decision Support Systems");
+		put(58, "Business Ethics");
+		put(59, "Vascular Surgery");
+		put(60, "Pulp & Paper");
+		put(61, "Seismology");
+		put(62, "Bone Joint Surgery");
+		put(63, "Neurology");
+		put(64, "Algebra");
+		put(65, "Antenna");
+		put(66, "Circuit Systems");
+		put(67, "Nursing Specialists");
+		put(68, "Retinal Surgery");
+		put(69, "Psychopharmacology");
+		put(70, "Aeronautics & Astronautics");
+		put(71, "Psychoanalysis");
+		put(72, "Oceanography");
+		put(73, "Sports Medicine");
+		put(74, "Operations Research");
+		put(75, "Chromatography; Electrophoresis");
+		put(76, "Pediatrics");
+		put(77, "Cardiovascular");
+		put(78, "Paleobiology");
+		put(79, "Economics");
+		put(80, "Hypertension");
+		put(81, "Human Molecular Genetics");
+		put(82, "Clinical Endocrinology");
+		put(83, "Dietetics");
+		put(84, "Clinical Microbiology");
+		put(85, "Hospital Pharmacy");
+		put(86, "Gas Turbines");
+		put(87, "Remote Sensing");
+		put(88, "Computational Chemistry");
+		put(89, "Surgery");
+		put(90, "Ceramics");
+		put(91, "AIDS");
+		put(92, "Military Aviation");
+		put(93, "Medical Records");
+		put(94, "Statistics");
+		put(95, "Applied Economics");
+		put(96, "Automatic Control");
+		put(97, "Atmospheric Science");
+		put(98, "Automotive Engineering");
+		put(99, "BioStatistics");
+		put(100, "Employee Health Benefit Plans");
+		put(101, "Transplantation");
+		put(102, "Alloys");
+		put(103, "Astronomy & Astrophysics");
+		put(104, "Substance-abuse Treatment");
+		put(105, "Research Policy; Technology Management");
+		put(106, "Drug Discovery");
+		put(107, "Animal Science");
+		put(108, "Chaos Fractals & Complexity");
+		put(109, "Environmental Contamination");
+		put(110, "Otolaryngology; Laryngoscope");
+		put(111, "Mechanical Design Engineering");
+		put(112, "Classics");
+		put(113, "Biological Conservation");
+		put(114, "Thoracic Surgery");
+		put(115, "Phytochemistry");
+		put(116, "Tropical Medicine");
+		put(117, "Food Protection");
+		put(118, "Broadband Communication");
+		put(119, "Energy Fuel");
+		put(120, "Soil Quality");
+		put(121, "Integrated Circuit Design");
+		put(122, "Philosophy Psychology");
+		put(123, "Construction & Project Management");
+		put(124, "Social Psychology");
+		put(125, "High Energy Physics");
+		put(126, "Strategic Management");
+		put(127, "Genomics & Nucleic Acids");
+		put(128, "Heat Transfer");
+		put(129, "Cement & Concrete");
+		put(130, "Pathology");
+		put(131, "Pest Management Science");
+		put(132, "Corrosion");
+		put(133, "Veterinary Science");
+		put(134, "Teacher Education; Evaluation");
+		put(135, "Stem Cells");
+		put(136, "Image Processing");
+		put(137, "Neural Networks");
+		put(138, "Nursing Education");
+		put(139, "Intensive Care");
+		put(140, "Alternative Complementary Medicine");
+		put(141, "Petroleum Engineering");
+		put(142, "Music & Theatre");
+		put(143, "Memory & Cognition");
+		put(144, "Vision");
+		put(145, "Communication Research");
+		put(146, "BioInformatics");
+		put(147, "Mechanics of Solids & Structures");
+		put(148, "Pharmacy");
+		put(149, "Geomorphology");
+		put(150, "Psychosis; Schizophrenia");
+		put(151, "BioEthics");
+		put(152, "Parellel Computing");
+		put(153, "Power Distribution");
+		put(154, "Gerontology");
+		put(155, "Wood");
+		put(156, "Discrete Applied Mathematics");
+		put(157, "Geology & Tectonics");
+		put(158, "GeoChemistry");
+		put(159, "Mobil Networks");
+		put(160, "Artificial Intelligence");
+		put(161, "Electro Analytical Chemistry");
+		put(162, "Dental Education");
+		put(163, "Enzyme Microbiological Techniques");
+		put(164, "Library Science; Infomation Retrieval");
+		put(165, "Biomaterials");
+		put(166, "Quaternary Research");
+		put(167, "Endoscopy");
+		put(168, "Composites");
+		put(169, "Language Learning");
+		put(170, "History; Gender Studies");
+		put(171, "Leadership & Organizational Behavior");
+		put(172, "Agricultural Engineering");
+		put(173, "Computer-Aided Process Planning");
+		put(174, "Geriatrics");
+		put(175, "Solid State Electronics");
+		put(176, "Optics & Lasers");
+		put(177, "Wool");
+		put(178, "Biomechanics");
+		put(179, "Molecular Physics");
+		put(180, "Comparative Animal Physiology");
+		put(181, "Political Science");
+		put(182, "History Philosophy");
+		put(183, "Poetry");
+		put(184, "Nuclear Medicine");
+		put(185, "Nanotechnology");
+		put(186, "Speech Recognitation");
+		put(187, "Fluid Mechanics");
+		put(188, "Computer Graphics");
+		put(189, "Filtration Membrane");
+		put(190, "Clinical Infectious Disease");
+		put(191, "Prosthetic Dentistry");
+		put(192, "Orthodontics");
+		put(193, "Robotic Systems");
+		put(194, "Dental Research");
+		put(195, "Atomic Spectrometry");
+		put(196, "Botany");
+		put(197, "Public Health Service");
+		put(198, "Political Geography");
+		put(199, "Catalysis");
+		put(200, "Radiation Protection");
+		put(201, "Machine Tools");
+		put(202, "Veterinary Medicine");
+		put(203, "Periodontology");
+		put(204, "Birth Defects");
+		put(205, "Thrombosis");
+		put(206, "Freshwater Biology");
+		put(207, "Mental Health Nursing");
+		put(208, "Artificial Evolution");
+		put(209, "English Literature");
+		put(210, "Plastic Surgery");
+		put(211, "Nursing Administration");
+		put(212, "Higher Education");
+		put(213, "Ecology");
+		put(214, "Modern Language");
+		put(215, "Neurophsyiology & Neuroscience");
+		put(216, "Mining");
+		put(217, "Aquaculture");
+		put(218, "Molecular Biological Evolution");
+		put(219, "Photonics");
+		put(220, "Urban Studies");
+		put(221, "Functional Analysis");
+		put(222, "Linguistics");
+		put(223, "Photo-Optics");
+		put(224, "Spine");
+		put(225, "Robotics");
+		put(226, "Audiology");
+		put(227, "Soil Science");
+		put(228, "Simulation");
+		put(229, "Nuclear Instrumentation");
+		put(230, "Hispanic Studies");
+		put(231, "Forest Science");
+		put(232, "Plasma Physics");
+		put(233, "Proteomics");
+		put(234, "Symbolic Interaction");
+		put(235, "Child & Adolescent Psychiatry");
+		put(236, "General Practice");
+		put(237, "Environmental Management");
+		put(238, "Diabetes Metabolism");
+		put(239, "Geotechnical Engineering");
+		put(240, "Instrumentation");
+		put(241, "Clinical Chemistry");
+		put(242, "Fluid Engineering");
+		put(243, "Arthroscopy");
+		put(244, "Eating Disorders; Sex Roles");
+		put(245, "Water Quality & Resource Management");
+		put(246, "Ethnic Migration");
+		put(247, "Geriatric Psychiatry");
+		put(248, "Sound & Vibration");
+		put(249, "Ore Processing");
+		put(250, "Ethnology");
+		put(251, "Prenatal Diagnostics");
+		put(252, "Cancer (translated)");
+		put(253, "Dialectics");
+		put(254, "Atmospheric GeoPhysics");
+		put(255, "Flavors & Fragrance");
+		put(256, "Numerical Methods in Engineering");
+		put(257, "EthnoPharmcology");
+		put(258, "Electrocardiography");
+		put(259, "International Development");
+		put(260, "Electrochemistry");
+		put(261, "Political Studies");
+		put(262, "Molecular Endocrinology");
+		put(263, "Surface Coating Technology");
+		put(264, "Molecular Biochemical Parasitology");
+		put(265, "Vocational Counseling");
+		put(266, "Oil & Natural Gas");
+		put(267, "International Conflict");
+		put(268, "Art History");
+		put(269, "Applied Catalysis");
+		put(270, "Agricultural Economics");
+		put(271, "Social Work");
+		put(272, "Medical Insurance");
+		put(273, "Fluid Phase Equilibrium");
+		put(274, "Biotechnology Trends");
+		put(275, "Air Quality");
+		put(276, "Search Engines; Web Crawling");
+		put(277, "Colloid");
+		put(278, "Applied Physiology; Muscle");
+		put(279, "Biblical Literature");
+		put(280, "Fault Tolerant Computing");
+		put(281, "Third World Political Economics");
+		put(282, "Public Hospitals");
+		put(283, "Sociology");
+		put(284, "Horticulture");
+		put(285, "Bone & Osteoporosis");
+		put(286, "Radiation Therapy");
+		put(287, "Water Treatment");
+		put(288, "Spyware; Malware");
+		put(289, "Behavioral Research Therapy");
+		put(290, "Science Education");
+		put(291, "Design & Analysis of Algorithms");
+		put(292, "Hospice Care");
+		put(293, "Climatology");
+		put(294, "Crop Science");
+		put(295, "Fuzzy Sets");
+		put(296, "Vehicle System Design");
+		put(297, "Transfusion");
+		put(298, "AIDS Treatment");
+		put(299, "Wireless Communication");
+		put(300, "Atherosclerosis");
+		put(301, "Region & Medical Ethics");
+		put(302, "Speech Language & Hearing");
+		put(303, "Thoracic & Respiratory");
+		put(304, "Veterinary Microbiology");
+		put(305, "Environmental Protection");
+		put(306, "Computer Systems Design");
+		put(307, "Environmental Polution");
+		put(308, "Electrical Networks");
+		put(309, "Endoscopy");
+		put(310, "Chemistry & Material Science");
+		put(311, "Medical Screening & Epidemiology");
+		put(312, "Child Development");
+		put(313, "Pain");
+		put(314, "Public Administration");
+		put(315, "Soil Analysis");
+		put(316, "Safety Management");
+		put(317, "Pattern Recognition");
+		put(318, "Mental Health Assessment");
+		put(319, "Clinical Medicine (translated)");
+		put(320, "Mutation; DNA Repair");
+		put(321, "Human Evolution");
+		put(322, "Space Research");
+		put(323, "Entomology");
+		put(324, "Epilepsy");
+		put(325, "Plant Ecology");
+		put(326, "Computer Aided Molecular Design");
+		put(327, "Criminology");
+		put(328, "Forensic Psychiatry");
+		put(329, "Personality");
+		put(330, "Test Equipment");
+		put(331, "Logic");
+		put(332, "Pulp Paper Science");
+		put(333, "Textiles");
+		put(334, "Contemporary Philosophy");
+		put(335, "Hydrology Soil Contamination");
+		put(336, "Child Abuse");
+		put(337, "Mathematics Research");
+		put(338, "Geology (International)");
+		put(339, "Environmental Chemistry");
+		put(340, "Parasitology");
+		put(341, "Dairy Science");
+		put(342, "Water Policy");
+		put(343, "Fish Research");
+		put(344, "Printing");
+		put(345, "Genetics");
+		put(346, "Industrial Chemistry");
+		put(347, "Obesity");
+		put(348, "Literary Criticism");
+		put(349, "Hepatology");
+		put(350, "Physical Therapy; Brain Injury");
+		put(351, "Computational & Applied Math");
+		put(352, "World Health Organization");
+		put(353, "Geophysical Science");
+		put(354, "Forensic Medicine");
+		put(355, "Psychiatric Services");
+		put(356, "Software Design and Development");
+		put(357, "Wildlife Management");
+		put(358, "Ocean Coastal Management");
+		put(359, "Database Design & Management");
+		put(360, "Financial Accounting");
+		put(361, "Microbiology Biotechnology");
+		put(362, "Water Utilities");
+		put(363, "Sedimentary Geology");
+		put(364, "Geodesy");
+		put(365, "Surfactants");
+		put(366, "Eye");
+		put(367, "Addictive Behavior");
+		put(368, "Naval Architecture");
+		put(369, "Environmental Microbiology");
+		put(370, "Electronic Imaging");
+		put(371, "Functional Programing");
+		put(372, "Applied Genetics");
+		put(373, "Plant Disease");
+		put(374, "Water Resource");
+		put(375, "Developmental Economics");
+		put(376, "Nuclear Physics");
+		put(377, "International Economics");
+		put(378, "Radiology");
+		put(379, "German Studies");
+		put(380, "Medieval History");
+		put(381, "Philosophy of Education");
+		put(382, "Oceanographic Instrumentation");
+		put(383, "Foreign Policy");
+		put(384, "Gut");
+		put(385, "Microwaves; Radio Frequencies");
+		put(386, "School Psychology");
+		put(387, "Vaccines");
+		put(388, "Environmental Law");
+		put(389, "Mass Spectrometry");
+		put(390, "Psychiatric Nursing");
+		put(391, "Asian Studies");
+		put(392, "Optimization Theory");
+		put(393, "Mathematical Science (Russia)");
+		put(394, "Gene Therapy");
+		put(395, "Security; Cryptography");
+		put(396, "Materials Processing");
+		put(397, "Rural Health Care");
+		put(398, "Power Systems");
+		put(399, "Surgical Oncology");
+		put(400, "Chip Design & Manufacturing");
+		put(401, "Sociobiology");
+		put(402, "Molecular Medicine");
+		put(403, "Human Resource Management");
+		put(404, "Ecological Modeling");
+		put(405, "Clinical Rehabilitation");
+		put(406, "Metallurgy");
+		put(407, "Ethics");
+		put(408, "Marital & Family Therapy");
+		put(409, "Aerospace");
+		put(410, "Critical Studies");
+		put(411, "Econometrics");
+		put(412, "Neuroscience Methods");
+		put(413, "Mineralogy");
+		put(414, "Trauma");
+		put(415, "Thermal Analysis");
+		put(416, "Solar & Wind Power");
+		put(417, "Ocean Engineering");
+		put(418, "Educational Psychology");
+		put(419, "Mycology");
+		put(420, "Semiotics");
+		put(421, "Dyes & Pigments");
+		put(422, "Drug Safety");
+		put(423, "Molecular Ecology");
+		put(424, "Cytogentics & Genome Mapping");
+		put(425, "Clinical Psychiatry");
+		put(426, "Paleogeography");
+		put(427, "Water Waste");
+		put(428, "Computer Networks");
+		put(429, "Weed Management");
+		put(430, "User Interface Design");
+		put(431, "Public Policy");
+		put(432, "Liquid Crystals");
+		put(433, "Control Systems");
+		put(434, "Environmental Policy");
+		put(435, "Topology");
+		put(436, "Construction");
+		put(437, "Dams & Tunnels");
+		put(438, "Regional Studies");
+		put(439, "Electrochemical Development");
+		put(440, "Digital Printing");
+		put(441, "Peptides");
+		put(442, "Applied Geophysics");
+		put(443, "Sexually Transmitted Diseases");
+		put(444, "Engineering Education");
+		put(445, "NeuroImmunology");
+		put(446, "Machine Learning");
+		put(447, "Geriatric Nursing");
+		put(448, "Sensors & Actuators");
+		put(449, "Systematics & Evolutionary Microbiology");
+		put(450, "Image Processing");
+		put(451, "Medical Education");
+		put(452, "Magnetic Resonance Imagery");
+		put(453, "Hospital Management");
+		put(454, "Insect Physiology");
+		put(455, "Power Transmission");
+		put(456, "Food Engineering");
+		put(457, "Oral Surgery");
+		put(458, "Computer Systems Theory");
+		put(459, "Combustion");
+		put(460, "Dermatological Surgery");
+		put(461, "Wildlife Research");
+		put(462, "Midwifery");
+		put(463, "Physics; Current Developments");
+		put(464, "Psychiatric & Behavioral Genetics");
+		put(465, "Fractures & Fatigue");
+		put(466, "Emergency Medicine");
+		put(467, "Cross Disciplinary Studies");
+		put(468, "Archeological Science");
+		put(469, "Preventive Medicine");
+		put(470, "Carbon");
+		put(471, "Gynecology Oncology");
+		put(472, "Psychosomatic Medicine");
+		put(473, "Pharmaco Economics");
+		put(474, "Computer Modeling and Animation");
+		put(475, "Medical Practice");
+		put(476, "Cancer Statistics");
+		put(477, "Consciousness");
+		put(478, "Otolaryngology; Head Neck");
+		put(479, "Heart Failure; Catheters");
+		put(480, "Wood & Wood Components");
+		put(481, "Circuits");
+		put(482, "Friction Lubrication & Wear");
+		put(483, "Superconductor Science");
+		put(484, "Antennae; Mobile Radio");
+		put(485, "Headache");
+		put(486, "Operations Management");
+		put(487, "Fish Biology");
+		put(488, "Economic & Human Biology");
+		put(489, "Consumer Electronics");
+		put(490, "Menopause");
+		put(491, "Chemistry (Russia)");
+		put(492, "GeoPolitics");
+		put(493, "Glaciology");
+		put(494, "Medical Libraries");
+		put(495, "Opera");
+		put(496, "Education");
+		put(497, "Acoustics");
+		put(498, "Pragmatics & Discourse");
+		put(499, "Reproduction Veterinary");
+		put(500, "Crystallography");
+		put(501, "Applied Math & Computation");
+		put(502, "Socio-Cultural Anthropology");
+		put(503, "Poultry Science");
+		put(504, "Artifical Organs");
+		put(505, "Physical Therapy; Orthopedic");
+		put(506, "Pulmonary");
+		put(507, "Waste Management");
+		put(508, "Marine Pollution");
+		put(509, "Toxins");
+		put(510, "Hearing Research");
+		put(511, "Human Rights");
+		put(512, "Lung Cancer");
+		put(513, "Social Economics");
+		put(514, "Carbohydrate Research");
+		put(515, "Biotechnology Bioengineering");
+		put(516, "Rural Studies");
+		put(517, "Electronics");
+		put(518, "Defects & Diffusion in Materials");
+		put(519, "Forensic Science");
+		put(520, "Rangeland Ecology");
+		put(521, "Welding");
+		put(522, "Reliability Engineering");
+		put(523, "Molecular Biology Methods");
+		put(524, "Mammals");
+		put(525, "Impotence");
+		put(526, "Fuzzy Logic");
+		put(527, "Tourism");
+		put(528, "Aquatic Disease");
+		put(529, "Geographic Information Science");
+		put(530, "Hormone Research");
+		put(531, "Public Health");
+		put(532, "Sleep");
+		put(533, "Neurotoxicology");
+		put(534, "Pediatric Research");
+		put(535, "Education Psychological Measures");
+		put(536, "Marketing");
+		put(537, "Clinical Medicine (Romania)");
+		put(538, "Green Chemistry");
+		put(539, "Optometry");
+		put(540, "Textile Art");
+		put(541, "Italian Studies");
+		put(542, "Perception Motor Skills");
+		put(543, "World Trade; Law");
+		put(544, "Insects");
+		put(545, "Australian Ecology");
+		put(546, "Paints & Coatings");
+		put(547, "Nursing Theory");
+		put(548, "Crustaceans");
+		put(549, "Laser Surgery");
+		put(550, "Bulk Solid Handling");
+		put(551, "Wetlands");
+		put(552, "GIS (non English)");
+		put(553, "Power Transmission & Control");
+		put(554, "Agricultural Environmental Medicine");
+	}};
+
+	public static final Map<Integer, Integer> SUB_DISCIPLINE_ID_TO_DISCIPLINE_ID = new HashMap<Integer, Integer>() {{
+		put(1, 7);
+		put(2, 6);
+		put(3, 13);
+		put(4, 7);
+		put(5, 13);
+		put(6, 5);
+		put(7, 6);
+		put(8, 6);
+		put(9, 7);
+		put(10, 2);
+		put(11, 1);
+		put(12, 6);
+		put(13, 12);
+		put(14, 12);
+		put(15, 1);
+		put(16, 7);
+		put(17, 1);
+		put(18, 2);
+		put(19, 7);
+		put(20, 7);
+		put(21, 9);
+		put(22, 6);
+		put(23, 11);
+		put(24, 1);
+		put(25, 6);
+		put(26, 5);
+		put(27, 3);
+		put(28, 1);
+		put(29, 7);
+		put(30, 11);
+		put(31, 7);
+		put(32, 6);
+		put(33, 1);
+		put(34, 11);
+		put(35, 2);
+		put(36, 11);
+		put(37, 1);
+		put(38, 12);
+		put(39, 6);
+		put(40, 5);
+		put(41, 1);
+		put(42, 6);
+		put(43, 3);
+		put(44, 1);
+		put(45, 6);
+		put(46, 13);
+		put(47, 11);
+		put(48, 7);
+		put(49, 8);
+		put(50, 6);
+		put(51, 6);
+		put(52, 11);
+		put(53, 9);
+		put(54, 2);
+		put(55, 6);
+		put(56, 13);
+		put(57, 3);
+		put(58, 3);
+		put(59, 6);
+		put(60, 11);
+		put(61, 10);
+		put(62, 1);
+		put(63, 5);
+		put(64, 12);
+		put(65, 13);
+		put(66, 13);
+		put(67, 1);
+		put(68, 1);
+		put(69, 5);
+		put(70, 11);
+		put(71, 1);
+		put(72, 11);
+		put(73, 1);
+		put(74, 3);
+		put(75, 2);
+		put(76, 6);
+		put(77, 6);
+		put(78, 10);
+		put(79, 3);
+		put(80, 6);
+		put(81, 7);
+		put(82, 6);
+		put(83, 6);
+		put(84, 6);
+		put(85, 6);
+		put(86, 11);
+		put(87, 11);
+		put(88, 2);
+		put(89, 6);
+		put(90, 11);
+		put(91, 6);
+		put(92, 12);
+		put(93, 1);
+		put(94, 3);
+		put(95, 3);
+		put(96, 13);
+		put(97, 11);
+		put(98, 11);
+		put(99, 3);
+		put(100, 1);
+		put(101, 6);
+		put(102, 11);
+		put(103, 12);
+		put(104, 1);
+		put(105, 3);
+		put(106, 6);
+		put(107, 6);
+		put(108, 12);
+		put(109, 11);
+		put(110, 1);
+		put(111, 11);
+		put(112, 4);
+		put(113, 9);
+		put(114, 6);
+		put(115, 2);
+		put(116, 9);
+		put(117, 8);
+		put(118, 13);
+		put(119, 11);
+		put(120, 11);
+		put(121, 13);
+		put(122, 4);
+		put(123, 3);
+		put(124, 3);
+		put(125, 12);
+		put(126, 3);
+		put(127, 8);
+		put(128, 11);
+		put(129, 11);
+		put(130, 7);
+		put(131, 9);
+		put(132, 11);
+		put(133, 6);
+		put(134, 3);
+		put(135, 6);
+		put(136, 13);
+		put(137, 13);
+		put(138, 1);
+		put(139, 6);
+		put(140, 6);
+		put(141, 11);
+		put(142, 4);
+		put(143, 5);
+		put(144, 5);
+		put(145, 3);
+		put(146, 8);
+		put(147, 11);
+		put(148, 6);
+		put(149, 10);
+		put(150, 1);
+		put(151, 1);
+		put(152, 13);
+		put(153, 13);
+		put(154, 1);
+		put(155, 11);
+		put(156, 12);
+		put(157, 10);
+		put(158, 10);
+		put(159, 13);
+		put(160, 13);
+		put(161, 2);
+		put(162, 1);
+		put(163, 8);
+		put(164, 13);
+		put(165, 1);
+		put(166, 10);
+		put(167, 6);
+		put(168, 11);
+		put(169, 3);
+		put(170, 4);
+		put(171, 3);
+		put(172, 11);
+		put(173, 3);
+		put(174, 1);
+		put(175, 12);
+		put(176, 12);
+		put(177, 11);
+		put(178, 1);
+		put(179, 2);
+		put(180, 9);
+		put(181, 3);
+		put(182, 4);
+		put(183, 4);
+		put(184, 1);
+		put(185, 12);
+		put(186, 13);
+		put(187, 11);
+		put(188, 13);
+		put(189, 11);
+		put(190, 6);
+		put(191, 1);
+		put(192, 1);
+		put(193, 13);
+		put(194, 1);
+		put(195, 2);
+		put(196, 9);
+		put(197, 1);
+		put(198, 3);
+		put(199, 2);
+		put(200, 6);
+		put(201, 11);
+		put(202, 6);
+		put(203, 1);
+		put(204, 7);
+		put(205, 6);
+		put(206, 9);
+		put(207, 1);
+		put(208, 13);
+		put(209, 4);
+		put(210, 1);
+		put(211, 1);
+		put(212, 3);
+		put(213, 9);
+		put(214, 4);
+		put(215, 5);
+		put(216, 11);
+		put(217, 9);
+		put(218, 9);
+		put(219, 13);
+		put(220, 3);
+		put(221, 12);
+		put(222, 4);
+		put(223, 11);
+		put(224, 1);
+		put(225, 13);
+		put(226, 1);
+		put(227, 11);
+		put(228, 12);
+		put(229, 12);
+		put(230, 4);
+		put(231, 9);
+		put(232, 12);
+		put(233, 8);
+		put(234, 3);
+		put(235, 3);
+		put(236, 1);
+		put(237, 3);
+		put(238, 6);
+		put(239, 11);
+		put(240, 13);
+		put(241, 6);
+		put(242, 11);
+		put(243, 1);
+		put(244, 3);
+		put(245, 11);
+		put(246, 3);
+		put(247, 1);
+		put(248, 11);
+		put(249, 11);
+		put(250, 3);
+		put(251, 6);
+		put(252, 6);
+		put(253, 13);
+		put(254, 11);
+		put(255, 2);
+		put(256, 11);
+		put(257, 2);
+		put(258, 6);
+		put(259, 3);
+		put(260, 11);
+		put(261, 3);
+		put(262, 6);
+		put(263, 12);
+		put(264, 9);
+		put(265, 3);
+		put(266, 11);
+		put(267, 3);
+		put(268, 4);
+		put(269, 2);
+		put(270, 3);
+		put(271, 3);
+		put(272, 1);
+		put(273, 11);
+		put(274, 8);
+		put(275, 11);
+		put(276, 13);
+		put(277, 2);
+		put(278, 1);
+		put(279, 4);
+		put(280, 13);
+		put(281, 3);
+		put(282, 1);
+		put(283, 3);
+		put(284, 9);
+		put(285, 6);
+		put(286, 6);
+		put(287, 11);
+		put(288, 13);
+		put(289, 1);
+		put(290, 3);
+		put(291, 12);
+		put(292, 6);
+		put(293, 11);
+		put(294, 9);
+		put(295, 13);
+		put(296, 11);
+		put(297, 7);
+		put(298, 1);
+		put(299, 13);
+		put(300, 6);
+		put(301, 1);
+		put(302, 5);
+		put(303, 6);
+		put(304, 6);
+		put(305, 11);
+		put(306, 13);
+		put(307, 11);
+		put(308, 13);
+		put(309, 6);
+		put(310, 2);
+		put(311, 6);
+		put(312, 3);
+		put(313, 6);
+		put(314, 3);
+		put(315, 11);
+		put(316, 11);
+		put(317, 13);
+		put(318, 1);
+		put(319, 6);
+		put(320, 7);
+		put(321, 9);
+		put(322, 12);
+		put(323, 9);
+		put(324, 5);
+		put(325, 9);
+		put(326, 2);
+		put(327, 3);
+		put(328, 3);
+		put(329, 3);
+		put(330, 13);
+		put(331, 13);
+		put(332, 11);
+		put(333, 11);
+		put(334, 4);
+		put(335, 11);
+		put(336, 3);
+		put(337, 12);
+		put(338, 10);
+		put(339, 2);
+		put(340, 9);
+		put(341, 6);
+		put(342, 11);
+		put(343, 11);
+		put(344, 11);
+		put(345, 9);
+		put(346, 11);
+		put(347, 6);
+		put(348, 4);
+		put(349, 6);
+		put(350, 5);
+		put(351, 12);
+		put(352, 9);
+		put(353, 12);
+		put(354, 1);
+		put(355, 1);
+		put(356, 13);
+		put(357, 9);
+		put(358, 11);
+		put(359, 13);
+		put(360, 3);
+		put(361, 8);
+		put(362, 11);
+		put(363, 10);
+		put(364, 11);
+		put(365, 2);
+		put(366, 1);
+		put(367, 1);
+		put(368, 12);
+		put(369, 11);
+		put(370, 13);
+		put(371, 13);
+		put(372, 9);
+		put(373, 9);
+		put(374, 11);
+		put(375, 3);
+		put(376, 12);
+		put(377, 3);
+		put(378, 6);
+		put(379, 4);
+		put(380, 4);
+		put(381, 4);
+		put(382, 11);
+		put(383, 3);
+		put(384, 6);
+		put(385, 13);
+		put(386, 3);
+		put(387, 7);
+		put(388, 3);
+		put(389, 8);
+		put(390, 1);
+		put(391, 4);
+		put(392, 12);
+		put(393, 12);
+		put(394, 7);
+		put(395, 13);
+		put(396, 11);
+		put(397, 1);
+		put(398, 13);
+		put(399, 6);
+		put(400, 13);
+		put(401, 9);
+		put(402, 1);
+		put(403, 3);
+		put(404, 9);
+		put(405, 6);
+		put(406, 11);
+		put(407, 4);
+		put(408, 3);
+		put(409, 12);
+		put(410, 4);
+		put(411, 3);
+		put(412, 5);
+		put(413, 10);
+		put(414, 1);
+		put(415, 2);
+		put(416, 11);
+		put(417, 11);
+		put(418, 3);
+		put(419, 9);
+		put(420, 4);
+		put(421, 11);
+		put(422, 6);
+		put(423, 9);
+		put(424, 7);
+		put(425, 1);
+		put(426, 10);
+		put(427, 11);
+		put(428, 13);
+		put(429, 11);
+		put(430, 13);
+		put(431, 3);
+		put(432, 2);
+		put(433, 13);
+		put(434, 3);
+		put(435, 12);
+		put(436, 11);
+		put(437, 11);
+		put(438, 3);
+		put(439, 11);
+		put(440, 11);
+		put(441, 7);
+		put(442, 11);
+		put(443, 6);
+		put(444, 3);
+		put(445, 5);
+		put(446, 13);
+		put(447, 1);
+		put(448, 11);
+		put(449, 8);
+		put(450, 13);
+		put(451, 1);
+		put(452, 1);
+		put(453, 1);
+		put(454, 9);
+		put(455, 13);
+		put(456, 8);
+		put(457, 1);
+		put(458, 13);
+		put(459, 11);
+		put(460, 1);
+		put(461, 9);
+		put(462, 1);
+		put(463, 12);
+		put(464, 3);
+		put(465, 11);
+		put(466, 6);
+		put(467, 4);
+		put(468, 10);
+		put(469, 1);
+		put(470, 2);
+		put(471, 6);
+		put(472, 3);
+		put(473, 1);
+		put(474, 13);
+		put(475, 1);
+		put(476, 12);
+		put(477, 5);
+		put(478, 1);
+		put(479, 6);
+		put(480, 11);
+		put(481, 13);
+		put(482, 11);
+		put(483, 12);
+		put(484, 13);
+		put(485, 5);
+		put(486, 3);
+		put(487, 9);
+		put(488, 4);
+		put(489, 13);
+		put(490, 6);
+		put(491, 2);
+		put(492, 3);
+		put(493, 11);
+		put(494, 1);
+		put(495, 4);
+		put(496, 3);
+		put(497, 11);
+		put(498, 3);
+		put(499, 6);
+		put(500, 2);
+		put(501, 12);
+		put(502, 4);
+		put(503, 6);
+		put(504, 6);
+		put(505, 1);
+		put(506, 6);
+		put(507, 11);
+		put(508, 11);
+		put(509, 2);
+		put(510, 1);
+		put(511, 3);
+		put(512, 6);
+		put(513, 3);
+		put(514, 8);
+		put(515, 8);
+		put(516, 3);
+		put(517, 13);
+		put(518, 11);
+		put(519, 1);
+		put(520, 9);
+		put(521, 11);
+		put(522, 3);
+		put(523, 7);
+		put(524, 9);
+		put(525, 6);
+		put(526, 13);
+		put(527, 3);
+		put(528, 9);
+		put(529, 11);
+		put(530, 6);
+		put(531, 6);
+		put(532, 5);
+		put(533, 5);
+		put(534, 6);
+		put(535, 3);
+		put(536, 3);
+		put(537, 6);
+		put(538, 2);
+		put(539, 1);
+		put(540, 11);
+		put(541, 4);
+		put(542, 1);
+		put(543, 3);
+		put(544, 9);
+		put(545, 9);
+		put(546, 11);
+		put(547, 1);
+		put(548, 9);
+		put(549, 1);
+		put(550, 11);
+		put(551, 9);
+		put(552, 11);
+		put(553, 13);
+		put(554, 6);
+	}};
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
index 6ff338080f..c943693d3e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
@@ -1,60 +1,60 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.constants;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@SuppressWarnings("serial")
-public class QueryConstants {
-	
-	public static final Map<String, String> PREFIX_TO_NAMESPACE = new HashMap<String, String>() { {
-		
-			put("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
-			put("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
-			put("xsd", "http://www.w3.org/2001/XMLSchema#");
-			put("owl", "http://www.w3.org/2002/07/owl#");
-			put("swrl", "http://www.w3.org/2003/11/swrl#");
-			put("swrlb", "http://www.w3.org/2003/11/swrlb#");
-			put("vitro", "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#");
-			put("far", "http://vitro.mannlib.cornell.edu/ns/reporting#");
-			put("ai", "http://vitro.mannlib.cornell.edu/ns/hotel#");
-			put("aktp", "http://www.aktors.org/ontology/portal#");
-			put("akts", "http://www.aktors.org/ontology/support#");
-			put("bibo", "http://purl.org/ontology/bibo/");
-			put("hr", "http://vivo.cornell.edu/ns/hr/0.9/hr.owl#");
-			put("dcterms", "http://purl.org/dc/terms/");
-			put("dcelem", "http://purl.org/dc/elements/1.1/");
-			put("event", "http://purl.org/NET/c4dm/event.owl#");
-			put("foaf", "http://xmlns.com/foaf/0.1/");
-			put("geo", "http://aims.fao.org/aos/geopolitical.owl#");
-			put("mann", "http://vivo.cornell.edu/ns/mannadditions/0.1#");
-			put("pubmed", "http://vitro.mannlib.cornell.edu/ns/pubmed#");
-			put("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
-			put("rdfsyn", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
-			put("skos", "http://www.w3.org/2004/02/skos/core#");
-			put("socsci", "http://vivo.library.cornell.edu/ns/vivo/socsci/0.1#");
-			put("stars", "http://vitro.mannlib.cornell.edu/ns/cornell/stars/classes#");
-			put("temp", "http://vitro.mannlib.cornell.edu/ns/temp#");
-			put("wos", "http://vivo.mannlib.cornell.edu/ns/ThomsonWOS/0.1#");
-			put("core", "http://vivoweb.org/ontology/core#");
-			put("vivo", "http://vivo.library.cornell.edu/ns/0.1#");
-			put("geo", "http://aims.fao.org/aos/geopolitical.owl#");
-			put("public", "http://vitro.mannlib.cornell.edu/ns/vitro/public#");
-			put("vivosocnet", "http://vivo.cns.iu.edu/ns/#");
-			put("obo", "http://purl.obolibrary.org/obo/");
-			put("vcard", "http://www.w3.org/2006/vcard/ns#");
-	} };
-	
-	public static String getSparqlPrefixQuery() {
-		
-		StringBuilder prefixSection = new StringBuilder(); 
-		
-		for (Map.Entry<String, String> prefixEntry : PREFIX_TO_NAMESPACE.entrySet()) {
-			prefixSection.append("PREFIX ").append(prefixEntry.getKey()).append(": <").append(prefixEntry.getValue()).append(">\n");
-		}
-		return prefixSection.toString();
-	}
-}
-
-
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.constants;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class QueryConstants {
+
+	public static final Map<String, String> PREFIX_TO_NAMESPACE = new HashMap<String, String>() { {
+
+			put("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+			put("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
+			put("xsd", "http://www.w3.org/2001/XMLSchema#");
+			put("owl", "http://www.w3.org/2002/07/owl#");
+			put("swrl", "http://www.w3.org/2003/11/swrl#");
+			put("swrlb", "http://www.w3.org/2003/11/swrlb#");
+			put("vitro", "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#");
+			put("far", "http://vitro.mannlib.cornell.edu/ns/reporting#");
+			put("ai", "http://vitro.mannlib.cornell.edu/ns/hotel#");
+			put("aktp", "http://www.aktors.org/ontology/portal#");
+			put("akts", "http://www.aktors.org/ontology/support#");
+			put("bibo", "http://purl.org/ontology/bibo/");
+			put("hr", "http://vivo.cornell.edu/ns/hr/0.9/hr.owl#");
+			put("dcterms", "http://purl.org/dc/terms/");
+			put("dcelem", "http://purl.org/dc/elements/1.1/");
+			put("event", "http://purl.org/NET/c4dm/event.owl#");
+			put("foaf", "http://xmlns.com/foaf/0.1/");
+			put("geo", "http://aims.fao.org/aos/geopolitical.owl#");
+			put("mann", "http://vivo.cornell.edu/ns/mannadditions/0.1#");
+			put("pubmed", "http://vitro.mannlib.cornell.edu/ns/pubmed#");
+			put("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
+			put("rdfsyn", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+			put("skos", "http://www.w3.org/2004/02/skos/core#");
+			put("socsci", "http://vivo.library.cornell.edu/ns/vivo/socsci/0.1#");
+			put("stars", "http://vitro.mannlib.cornell.edu/ns/cornell/stars/classes#");
+			put("temp", "http://vitro.mannlib.cornell.edu/ns/temp#");
+			put("wos", "http://vivo.mannlib.cornell.edu/ns/ThomsonWOS/0.1#");
+			put("core", "http://vivoweb.org/ontology/core#");
+			put("vivo", "http://vivo.library.cornell.edu/ns/0.1#");
+			put("geo", "http://aims.fao.org/aos/geopolitical.owl#");
+			put("public", "http://vitro.mannlib.cornell.edu/ns/vitro/public#");
+			put("vivosocnet", "http://vivo.cns.iu.edu/ns/#");
+			put("obo", "http://purl.obolibrary.org/obo/");
+			put("vcard", "http://www.w3.org/2006/vcard/ns#");
+	} };
+
+	public static String getSparqlPrefixQuery() {
+
+		StringBuilder prefixSection = new StringBuilder();
+
+		for (Map.Entry<String, String> prefixEntry : PREFIX_TO_NAMESPACE.entrySet()) {
+			prefixSection.append("PREFIX ").append(prefixEntry.getKey()).append(": <").append(prefixEntry.getValue()).append(">\n");
+		}
+		return prefixSection.toString();
+	}
+}
+
+
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
index b5df83bee7..7ad97d162c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
@@ -3,20 +3,20 @@
 package edu.cornell.mannlib.vitro.webapp.visualization.constants;
 
 /**
- * Thsi contains the sparql fields which are used to capture data for the value objects.  
+ * Thsi contains the sparql fields which are used to capture data for the value objects.
  * @author cdtank
  */
 public class QueryFieldLabels {
-	
+
 	/*
-	 * Generic Query related field labels 
+	 * Generic Query related field labels
 	 * */
 	public static final String PREDICATE = "predicateLit";
 	public static final String OBJECT = "objectLit";
-	
-	
+
+
 	/*
-	 * Document related field labels 
+	 * Document related field labels
 	 * */
 	public static final String DOCUMENT_URL = "documentLit";
 	public static final String DOCUMENT_MONIKER = "documentMonikerLit";
@@ -28,40 +28,40 @@ public class QueryFieldLabels {
 	public static final String DOCUMENT_PUBLICATION_YEAR_MONTH = "publicationYearMonthLit";
 	public static final String DOCUMENT_PUBLICATION_DATE = "publicationDateLit";
 	public static final String DOCUMENT_JOURNAL_LABEL = "journalLabelLit";
-	
-	
+
+
 	/*
 	 * Image related field labels
 	 * */
 	public static final String THUMBNAIL_LOCATION_URL = "thumbnailDownloadLocationLit";
 	public static final String THUMBNAIL_FILENAME = "thumbnailFileNameLit";
-	
+
 	/*
 	 * Author related field labels
 	 * */
 	public static final String AUTHOR_URL = "authPersonLit";
 	public static final String AUTHOR_LABEL = "authorLabelLit";
-	
+
 	/*
 	 * Co-Author related field labels
 	 * */
 	public static final String CO_AUTHOR_URL = "coAuthPersonLit";
 	public static final String CO_AUTHOR_LABEL = "coAuthPersonLabelLit";
-	
+
 	/*
-	 * College related field labels 
+	 * College related field labels
 	 * */
 	public static final String COLLEGE_URL = "collegeLit";
 	public static final String COLLEGE_LABEL = "collegeLabelLit";
-	
 
-	
+
+
 	/*
-	 * Employee related field labels 
+	 * Employee related field labels
 	 * */
 	public static final String ACADEMIC_FACULTY_EMPLOYEE_URL = "academicFacultyEmployeeLit";
 	public static final String ACADEMIC_STAFF_EMPLOYEE_URL = "academicStaffEmployeeLit";
-	
+
 	/*
 	 * Person related field Labels
 	 */
@@ -69,51 +69,51 @@ public class QueryFieldLabels {
 	public static final String PERSON_LABEL = "personLabelLit";
 	public static final String PERSON_TYPE = "personTypeLit";
 	public static final String PERSON_TYPE_LABEL = "personTypeLabelLit";
-	
-	
+
+
 	/*
 	 * Position related field labels
 	 */
 	public static final String SECONDARY_POSITION_LABEL = "SecondaryPositionLabelLit";
-	
+
 	/*
 	 * start year related field labels
 	 */
 	public static final String START_YEAR_LABEL = "StartYearLit";
-	
-	
+
+
 	/*
 	 * Organization related field Labels
 	 */
 	public static final String ORGANIZATION_URL = "organizationLit";
 	public static final String ORGANIZATION_LABEL = "organizationLabelLit";
-	
-	
+
+
 	/*
 	 * Sub Organization related field labels
 	 */
 	public static final String SUBORGANIZATION_URL = "subOrganizationLit";
 	public static final String SUBORGANIZATION_LABEL = "subOrganizationLabelLit";
-	
+
 	/*
 	 * Parent Organization related field labels
 	 */
 	public static final String PARENT_ORGANIZATION_URL = "parentOrganizationLit";
 	public static final String PARENT_ORGANIZATION_LABEL = "parentOrganizationLabelLit";
-	
+
 	/*
 	 * Sub Organization related field labels
 	 */
 	public static final String SUBORGANIZATION_TYPE = "subOrganizationTypeLit";
 	public static final String SUBORGANIZATION_TYPE_LABEL = "subOrganizationTypeLabelLit";
-	
-	
+
+
 	/*
-	 * Department related field labels 
+	 * Department related field labels
 	 * */
 	public static final String DEPARTMENT_URL = "departmentLit";
-	public static final String DEPARTMENT_LABEL = "departmentLabelLit";	
-	
+	public static final String DEPARTMENT_LABEL = "departmentLabelLit";
+
 	/*
 	 * Co-PI related field labels
 	 */
@@ -123,18 +123,18 @@ public class QueryFieldLabels {
 	public static final String CO_PI_LABEL = "coPILabelLit";
 	public static final String GRANT_URL = "grantLit";
 	public static final String GRANT_LABEL = "grantLabelLit";
-	
+
 	/*
 	 * Role Start/End Date is chosen as the default Start Date for all the queries,
 	 * in whose absence Grant Start/End Date is chosen.
 	 */
-	
+
 	public static final String ROLE_START_DATE = "grantStartDateLit";
 	public static final String ROLE_END_DATE = "grantEndDateLit";
 	public static final String GRANT_START_DATE = "grantStartDateForGrantLit";
 	public static final String GRANT_END_DATE = "grantEndDateForGrantLit";
-	
-	
+
+
 	public static final String LAST_CACHED_AT_DATETIME = "lastCachedDateTimeLit";
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java
index 210810a6fc..39412d2011 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java
@@ -1,44 +1,44 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.constants;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-
-/**
- * This contains the constants related to all the value objects.
- * @author cdtank
- */
-public class VOConstants {
-	
-	public static final String DEFAULT_ACTIVITY_YEAR = "Unknown";
-	public static final String DEFAULT_PUBLICATION_YEAR = "Unknown";
-	public static final String DEFAULT_GRANT_YEAR = "Unknown";
-	
-	/*
-	 * Employee related constants 
-	 * */
-	public static enum EntityClassType {
-		ORGANIZATION, PERSON, UNKNOWN
-	} 
-	
-	public static final int NUM_CHARS_IN_YEAR_FORMAT = 4;
-	public static final int MINIMUM_PUBLICATION_YEAR = 1800;
-	public static final int CURRENT_YEAR = Calendar.getInstance().get(Calendar.YEAR);
-	
-	@SuppressWarnings("serial")
-	public static final List<DateTimeFormatter> POSSIBLE_DATE_TIME_FORMATTERS = new ArrayList<DateTimeFormatter>() {{
-		
-		add(ISODateTimeFormat.dateTimeNoMillis());
-		add(ISODateTimeFormat.dateHourMinuteSecond());
-		add(ISODateTimeFormat.dateTimeParser());
-		
-	}};
-	
-
-	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.constants;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
+/**
+ * This contains the constants related to all the value objects.
+ * @author cdtank
+ */
+public class VOConstants {
+
+	public static final String DEFAULT_ACTIVITY_YEAR = "Unknown";
+	public static final String DEFAULT_PUBLICATION_YEAR = "Unknown";
+	public static final String DEFAULT_GRANT_YEAR = "Unknown";
+
+	/*
+	 * Employee related constants
+	 * */
+	public static enum EntityClassType {
+		ORGANIZATION, PERSON, UNKNOWN
+	}
+
+	public static final int NUM_CHARS_IN_YEAR_FORMAT = 4;
+	public static final int MINIMUM_PUBLICATION_YEAR = 1800;
+	public static final int CURRENT_YEAR = Calendar.getInstance().get(Calendar.YEAR);
+
+	@SuppressWarnings("serial")
+	public static final List<DateTimeFormatter> POSSIBLE_DATE_TIME_FORMATTERS = new ArrayList<DateTimeFormatter>() {{
+
+		add(ISODateTimeFormat.dateTimeNoMillis());
+		add(ISODateTimeFormat.dateHourMinuteSecond());
+		add(ISODateTimeFormat.dateTimeParser());
+
+	}};
+
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java
index 344aef1d70..4bdbad0fe3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java
@@ -1,21 +1,21 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.constants;
-
-/**
- * This contains constants related to the visualization code.
- * @author cdtank
- */
-public class VisConstants {
-	
-	public static final int MAX_NAME_TEXT_LENGTH = 20;
-	public static final int MINIMUM_YEARS_CONSIDERED_FOR_SPARKLINE = 10;
-	
-	public static final String RESULT_FORMAT_PARAM = "RS_TEXT";
-	public static final String RDF_RESULT_FORMAT_PARAM = "RDF/XML-ABBREV";
-	
-	public static enum DataVisMode {
-		CSV, JSON
-	};
-	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.constants;
+
+/**
+ * This contains constants related to the visualization code.
+ * @author cdtank
+ */
+public class VisConstants {
+
+	public static final int MAX_NAME_TEXT_LENGTH = 20;
+	public static final int MINIMUM_YEARS_CONSIDERED_FOR_SPARKLINE = 10;
+
+	public static final String RESULT_FORMAT_PARAM = "RS_TEXT";
+	public static final String RDF_RESULT_FORMAT_PARAM = "RDF/XML-ABBREV";
+
+	public static enum DataVisMode {
+		CSV, JSON
+	};
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java
index 3a78ef5b7c..fb43c9b2dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java
@@ -36,7 +36,7 @@ public class CoPIGrantCountConstructQueryRunner implements ModelConstructor {
 	private Log log = LogFactory
 			.getLog(CoPIGrantCountConstructQueryRunner.class.getName());
 
-	private static final String SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING = 
+	private static final String SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING =
 			"?Role core:relatedBy ?Grant . "
 			+ "?Grant rdf:type core:Grant ."
 			+ "?Grant core:relates ?RelatedRole . ";
@@ -67,14 +67,14 @@ private String generateConstructQueryForInvestigatorRoleOfProperty(
 				+ "?RelatedRole <http://purl.obolibrary.org/obo/RO_0000052> ?coInvestigator ."
 			    + "?coInvestigator rdf:type foaf:Person  ."
 				+ "?coInvestigator rdfs:label ?coInvestigatorLabel . " + "}"
-				+ "WHERE { " + "<" + queryURI + ">" + preboundProperty + " ?Role . "  
+				+ "WHERE { " + "<" + queryURI + ">" + preboundProperty + " ?Role . "
 				+ "?Role rdf:type " + preboundRoleType + " . "
 				+ SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING
 				+ "?RelatedRole rdf:type core:InvestigatorRole ."
 				+ "?RelatedRole vitro:mostSpecificType ?subclass ."
 				+ "?RelatedRole <http://purl.obolibrary.org/obo/RO_0000052> ?coInvestigator ."
 		        + "?coInvestigator rdf:type foaf:Person  ."
-				+ "?coInvestigator rdfs:label ?coInvestigatorLabel . " 
+				+ "?coInvestigator rdfs:label ?coInvestigatorLabel . "
 				+ "FILTER (?subclass != core:PrincipalInvestigatorRole && ?subclass != core:CoPrincipalInvestigatorRole)}";
 
 		return sparqlQuery;
@@ -154,7 +154,7 @@ private String generateConstructQueryForDateTimeValueofRole(
 				+ "?dateTimeIntervalValue core:start ?startDate . "
 				+ "?startDate core:dateTime ?startDateTimeValue . "
 //				+ "?dateTimeIntervalValue core:end ?endDate . "
-//				+ "?endDate core:dateTime ?endDateTimeValue . " 
+//				+ "?endDate core:dateTime ?endDateTimeValue . "
 				+ "}"
 				+ "WHERE { " + "{" + "<" + queryURI + ">" + preboundProperty
 				+ " ?Role . "
@@ -166,7 +166,7 @@ private String generateConstructQueryForDateTimeValueofRole(
 //				+ " ?Role . "
 //				+ "?Role core:dateTimeInterval ?dateTimeIntervalValue . "
 //				+ "?dateTimeIntervalValue core:end ?endDate . "
-//				+ "?endDate core:dateTime ?endDateTimeValue . " 
+//				+ "?endDate core:dateTime ?endDateTimeValue . "
 				+ "}" + "}";
 
 		return sparqlQuery;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
index b32bfc94ab..c5fce80298 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
@@ -44,13 +44,13 @@
  * Deepak Konidena
  */
 public class CoPIGrantCountQueryRunner implements QueryRunner<CollaborationData> {
-	
+
 	private static final int MAX_PI_PER_GRANT_ALLOWED = 100;
-	
+
 	protected static final Syntax SYNTAX = Syntax.syntaxARQ;
-	
+
 	private String egoURI;
-	
+
 	private RDFService rdfService;
 	private VitroRequest vitroRequest;
 
@@ -59,28 +59,28 @@ public class CoPIGrantCountQueryRunner implements QueryRunner<CollaborationData>
 	private long before, after;
 
 	private static final String SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME = ""
-		+ 		"OPTIONAL {"		
+		+ 		"OPTIONAL {"
 		+ "			?Role core:dateTimeInterval ?dateTimeIntervalValue . "
-		+			"?dateTimeIntervalValue core:start ?startDate . "		
-		+			"?startDate core:dateTime ?startDateTimeValue . " 	
-//		+			"OPTIONAL {"	
-//		+				"?dateTimeIntervalValue core:end ?endDate . "	
-//		+				"?endDate core:dateTime ?endDateTimeValue . " 			
+		+			"?dateTimeIntervalValue core:start ?startDate . "
+		+			"?startDate core:dateTime ?startDateTimeValue . "
+//		+			"OPTIONAL {"
+//		+				"?dateTimeIntervalValue core:end ?endDate . "
+//		+				"?endDate core:dateTime ?endDateTimeValue . "
 //		+			"}"
-		+ 		"} . ";	
-	
+		+ 		"} . ";
+
 	private static final String SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME = ""
-		+ 		"OPTIONAL {"	
+		+ 		"OPTIONAL {"
 		+ "			?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . "
-		+			"?dateTimeIntervalValueForGrant core:start ?startDateForGrant . "		
-		+			"?startDateForGrant core:dateTime ?startDateTimeValueForGrant . " 	
-//		+			"OPTIONAL {"	
-//		+				"?dateTimeIntervalValueForGrant core:end ?endDateForGrant . "	
-//		+				"?endDateForGrant core:dateTime ?endDateTimeValueForGrant . " 			
+		+			"?dateTimeIntervalValueForGrant core:start ?startDateForGrant . "
+		+			"?startDateForGrant core:dateTime ?startDateTimeValueForGrant . "
+//		+			"OPTIONAL {"
+//		+				"?dateTimeIntervalValueForGrant core:end ?endDateForGrant . "
+//		+				"?endDateForGrant core:dateTime ?endDateTimeValueForGrant . "
 //		+			"}"
-		+ 		"}";	
-	
-	
+		+ 		"}";
+
+
 	public CoPIGrantCountQueryRunner(String egoURI, VitroRequest vreq, Log log) {
 
 		this.egoURI = egoURI;
@@ -88,24 +88,24 @@ public CoPIGrantCountQueryRunner(String egoURI, VitroRequest vreq, Log log) {
 		this.vitroRequest = vreq;
 	//	this.log = log;
 	}
-	
+
 	private String generateEgoCoPIquery(String queryURI) {
 
 		String sparqlQuery = QueryConstants.getSparqlPrefixQuery()
 			+ "SELECT "
-			+ "		(str(<" + queryURI + ">) as ?" + QueryFieldLabels.PI_URL + ") " 
-			+ "		(str(?PILabel) as ?" + QueryFieldLabels.PI_LABEL + ") " 
-			+ "		(str(?Grant) as ?"	+ QueryFieldLabels.GRANT_URL + ") "	
-//			+ "		(str(?GrantLabel) as ?" + QueryFieldLabels.GRANT_LABEL + ") " 
+			+ "		(str(<" + queryURI + ">) as ?" + QueryFieldLabels.PI_URL + ") "
+			+ "		(str(?PILabel) as ?" + QueryFieldLabels.PI_LABEL + ") "
+			+ "		(str(?Grant) as ?"	+ QueryFieldLabels.GRANT_URL + ") "
+//			+ "		(str(?GrantLabel) as ?" + QueryFieldLabels.GRANT_LABEL + ") "
 			+ " 	(str(?startDateTimeValue) as ?grantStartDateLit) "
 //			+ "		(str(?endDateTimeValue) as ?grantEndDateLit)  "
 			+ " 	(str(?startDateTimeValueForGrant) as ?grantStartDateForGrantLit) "
-//			+ "		(str(?endDateTimeValueForGrant) as ?grantEndDateForGrantLit)  "			
+//			+ "		(str(?endDateTimeValueForGrant) as ?grantEndDateForGrantLit)  "
 			+ "		(str(?CoPI) as ?" + QueryFieldLabels.CO_PI_URL + ") "
 			+ "		(str(?CoPILabel) as ?" + QueryFieldLabels.CO_PI_LABEL + ") "
 			+ "WHERE "
-			+ "{ "  	
-			+ 		"<" + queryURI + "> rdfs:label ?PILabel . "  	
+			+ "{ "
+			+ 		"<" + queryURI + "> rdfs:label ?PILabel . "
 			+  		"{ "
 			+			"<" + queryURI + "> <http://purl.obolibrary.org/obo/RO_0000053> ?Role . "
 		    +			"?Role rdf:type core:CoPrincipalInvestigatorRole . "
@@ -351,12 +351,12 @@ boolean hasExpired() {
 
 	private static class QueryResultConsumer extends ResultSetConsumer {
 		Set<Collaborator> nodes = new HashSet<Collaborator>();
-		
+
 		Map<String, Activity> grantURLToVO = new HashMap<String, Activity>();
 		Map<String, Set<Collaborator>> grantURLToCoPIs = new HashMap<String, Set<Collaborator>>();
 		Map<String, Collaborator> nodeURLToVO = new HashMap<String, Collaborator>();
 		Map<String, Collaboration> edgeUniqueIdentifierToVO = new HashMap<String, Collaboration>();
-		
+
 		Collaborator egoNode = null;
 
 		Set<Collaboration> edges = new HashSet<Collaboration>();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
index 8686787d25..4d4b249e0f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
@@ -27,12 +27,12 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
 
 public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler {
-	
+
 
 	@Override
 	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
 			Dataset dataset) throws MalformedQueryParametersException {
-		throw new UnsupportedOperationException("Co-PI Grant Count" 
+		throw new UnsupportedOperationException("Co-PI Grant Count"
 				+ " does not provide Ajax response.");
 	}
 
@@ -40,7 +40,7 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
 	public ResponseValues generateVisualizationForShortURLRequests(
 			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
 			Dataset dataSource) throws MalformedQueryParametersException {
-		throw new UnsupportedOperationException("Co-PI Grant Count" 
+		throw new UnsupportedOperationException("Co-PI Grant Count"
 				+ " does not provide Short URL response.");
 	}
 
@@ -48,104 +48,104 @@ public ResponseValues generateVisualizationForShortURLRequests(
 	public Map<String, String> generateDataVisualization(
 			VitroRequest vitroRequest, Log log, Dataset dataset)
 			throws MalformedQueryParametersException {
-		
+
 		String egoURI = vitroRequest.getParameter(VisualizationFrameworkConstants
 														.INDIVIDUAL_URI_KEY);
 		String visMode = vitroRequest.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY);
-		
-		ModelConstructor constructQueryRunner = 
+
+		ModelConstructor constructQueryRunner =
 				new CoPIGrantCountConstructQueryRunner(egoURI, vitroRequest.getRDFService(), log);
 		Model constructedModel = constructQueryRunner.getConstructedModel();
-		
-		QueryRunner<CollaborationData> queryManager = 
+
+		QueryRunner<CollaborationData> queryManager =
 				new CoPIGrantCountQueryRunner(egoURI, vitroRequest, log);
-		
+
 		CollaborationData investigatorNodesAndEdges = queryManager.getQueryResult();
-				
-    	/* 
+
+    	/*
     	 * We will be using the same visualization package for both sparkline & co-pi
-    	 * flash vis. We will use "VIS_MODE_KEY" as a modifier to differentiate 
+    	 * flash vis. We will use "VIS_MODE_KEY" as a modifier to differentiate
     	 * between these two. The default will be to render the co-pi network vis.
-    	 * */ 
+    	 * */
 		if (VisualizationFrameworkConstants.COPIS_COUNT_PER_YEAR_VIS_MODE
-				.equalsIgnoreCase(visMode)) { 
+				.equalsIgnoreCase(visMode)) {
 			/*
-			 * When the csv file is required - based on which sparkline visualization will 
+			 * When the csv file is required - based on which sparkline visualization will
 			 * be rendered.
 			 * */
 				return prepareCoPIsCountPerYearDataResponse(investigatorNodesAndEdges);
-				
+
 		} else if (VisualizationFrameworkConstants.COPIS_LIST_VIS_MODE
-				.equalsIgnoreCase(visMode)) { 
+				.equalsIgnoreCase(visMode)) {
 			/*
-			 * When the csv file is required - based on which sparkline visualization will 
+			 * When the csv file is required - based on which sparkline visualization will
 			 * be rendered.
 			 * */
 				return prepareCoPIsListDataResponse(investigatorNodesAndEdges);
-				
+
 		} else if (VisualizationFrameworkConstants.COPI_NETWORK_DOWNLOAD_VIS_MODE
-				.equalsIgnoreCase(visMode)) { 
+				.equalsIgnoreCase(visMode)) {
 			/*
-			 * When the csv file is required - based on which sparkline visualization will 
+			 * When the csv file is required - based on which sparkline visualization will
 			 * be rendered.
 			 * */
 				return prepareNetworkDownloadDataResponse(investigatorNodesAndEdges);
-				
+
 		} else {
     			/*
-    			 * When the graphML file is required - based on which co-pi network 
+    			 * When the graphML file is required - based on which co-pi network
     			 * visualization will be rendered.
     			 * */
     			return prepareNetworkStreamDataResponse(investigatorNodesAndEdges);
 		}
-			
+
 	}
-	
+
 	@Override
 	public ResponseValues generateStandardVisualization(
 			VitroRequest vitroRequest, Log log, Dataset dataset)
 			throws MalformedQueryParametersException {
 		/*
-		 * Support for this has ceased to exist. Standalone mode was created only for demo 
+		 * Support for this has ceased to exist. Standalone mode was created only for demo
 		 * purposes for VIVO Conf.
-		 * */		
+		 * */
 		throw new UnsupportedOperationException("CoPI does not provide Standalone Response.");
 	}
-	
+
 	private String getCoPIsListCSVContent(CollaborationData coPIData) {
-		
+
 		StringBuilder csvFileContent = new StringBuilder();
-		
+
 		csvFileContent.append("Co-investigator, Count\n");
-		
+
 		for (Collaborator currNode : coPIData.getCollaborators()) {
-			
+
 			/*
 			 * We have already printed the Ego Node info.
 			 * */
 			if (currNode != coPIData.getEgoCollaborator()) {
-			
+
 			csvFileContent.append(StringEscapeUtils.escapeCsv(currNode.getCollaboratorName()));
 			csvFileContent.append(",");
 			csvFileContent.append(currNode.getNumOfActivities());
 			csvFileContent.append("\n");
-			
+
 			}
-			
+
 		}
-		
+
 		return csvFileContent.toString();
-	}	
-	
+	}
+
 
 	private String getCoPIsPerYearCSVContent(Map<String, Set<Collaborator>> yearToCoPI) {
 
 		StringBuilder csvFileContent = new StringBuilder();
-		
+
 		csvFileContent.append("Year, Count, Co-investigator(s)\n");
 
 		for (Map.Entry<String, Set<Collaborator>> currentEntry : yearToCoPI.entrySet()) {
-			
+
 			csvFileContent.append(StringEscapeUtils.escapeCsv(currentEntry.getKey()));
 			csvFileContent.append(",");
 			csvFileContent.append(currentEntry.getValue().size());
@@ -154,136 +154,136 @@ private String getCoPIsPerYearCSVContent(Map<String, Set<Collaborator>> yearToCo
 										getCoPINamesAsString(currentEntry.getValue())));
 			csvFileContent.append("\n");
 		}
-		
+
 		return csvFileContent.toString();
 	}
 
 	private String getCoPINamesAsString(Set<Collaborator> coInvestigators) {
-		
+
 		StringBuilder coPIsMerged = new StringBuilder();
-		
+
 		String coPISeparator = ";";
 		for (Collaborator currentCoPI : coInvestigators) {
 			coPIsMerged.append(currentCoPI.getCollaboratorName()).append(coPISeparator);
 		}
-		
+
 		return StringUtils.removeEnd(coPIsMerged.toString(), coPISeparator);
 	}
-	
-	
+
+
 	/**
-	 * Provides response when a csv file containing number & names of unique co-pis per 
-	 * year is requested. 
+	 * Provides response when a csv file containing number & names of unique co-pis per
+	 * year is requested.
 	 * @param piNodesAndEdges PI nodes and edges
 	 */
 	private Map<String, String> prepareCoPIsCountPerYearDataResponse(
 					CollaborationData piNodesAndEdges) {
-		
+
 		String outputFileName;
 		Map<String, Set<Collaborator>> yearToCoPIs = new TreeMap<String, Set<Collaborator>>();
-		
-		if (piNodesAndEdges.getCollaborators() != null 
+
+		if (piNodesAndEdges.getCollaborators() != null
 				&& piNodesAndEdges.getCollaborators().size() > 0) {
-			
+
 			outputFileName = UtilityFunctions.slugify(piNodesAndEdges
 									.getEgoCollaborator().getCollaboratorName())
 			+ "_co-investigators-per-year" + ".csv";
-			
+
 			yearToCoPIs = UtilityFunctions.getActivityYearToCollaborators(piNodesAndEdges);
-			
+
 		} else {
-			
-			outputFileName = "no_co-investigators-per-year" + ".csv";			
+
+			outputFileName = "no_co-investigators-per-year" + ".csv";
 		}
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, 
+		fileData.put(DataVisualizationController.FILE_NAME_KEY,
 					 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 getCoPIsPerYearCSVContent(yearToCoPIs));
 
 		return fileData;
 	}
 
 	/**
-	 * Provides response when a csv file containing number & names of unique co-pis per 
-	 * year is requested. 
+	 * Provides response when a csv file containing number & names of unique co-pis per
+	 * year is requested.
 	 * @param coPIData Co Principal Investigator Data
 	 */
 	private Map<String, String> prepareCoPIsListDataResponse(CollaborationData coPIData) {
-		
+
 		String outputFileName = "";
-		
+
 		if (coPIData.getCollaborators() != null && coPIData.getCollaborators().size() > 0) {
-			
+
 			outputFileName = UtilityFunctions.slugify(coPIData.getEgoCollaborator()
-															.getCollaboratorName()) 
+															.getCollaboratorName())
 									+ "_co-investigators" + ".csv";
-	
+
 		} else {
 			outputFileName = "no_co-investigators" + ".csv";
 		}
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, 
+		fileData.put(DataVisualizationController.FILE_NAME_KEY,
 					 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 getCoPIsListCSVContent(coPIData));
 
 		return fileData;
 	}
 
 	/**
-	 * Provides a response when graphml formatted co-pi network is requested, typically by 
+	 * Provides a response when graphml formatted co-pi network is requested, typically by
 	 * the flash vis.
 	 * @param coPIData Co Investigator data
 	 */
 	private Map<String, String> prepareNetworkStreamDataResponse(CollaborationData coPIData) {
-	
-		CoPIGraphMLWriter coPIGraphMLWriter = 
+
+		CoPIGraphMLWriter coPIGraphMLWriter =
 				new CoPIGraphMLWriter(coPIData);
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "text/xml");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 coPIGraphMLWriter.getCoPIGraphMLContent().toString());
 
 		return fileData;
-	
+
 	}
-	
+
 	private Map<String, String> prepareNetworkDownloadDataResponse(CollaborationData coPIData) {
-		
+
 		String outputFileName = "";
-		
+
 		if (coPIData.getCollaborators() != null && coPIData.getCollaborators().size() > 0) {
-			
+
 			outputFileName = UtilityFunctions.slugify(coPIData.getEgoCollaborator()
-															.getCollaboratorName()) 
+															.getCollaboratorName())
 									+ "_co-investigator-network.graphml" + ".xml";
-			
+
 		} else {
-			outputFileName = "no_co-investigator-network.graphml" + ".xml";			
+			outputFileName = "no_co-investigator-network.graphml" + ".xml";
 		}
-		
-		CoPIGraphMLWriter coPIGraphMLWriter = 
+
+		CoPIGraphMLWriter coPIGraphMLWriter =
 				new CoPIGraphMLWriter(coPIData);
-		
+
         Map<String, String> fileData = new HashMap<String, String>();
-        fileData.put(DataVisualizationController.FILE_NAME_KEY, 
+        fileData.put(DataVisualizationController.FILE_NAME_KEY,
 				 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "text/xml");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					 coPIGraphMLWriter.getCoPIGraphMLContent().toString());
 
 		return fileData;
-	
+
 	}
 
 	@Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java
index 03cae0a0f6..15a13a0ae5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java
@@ -88,7 +88,7 @@ private StringBuilder createCoPIGraphMLContent(CollaborationData coPIData) {
 
         return graphMLContent;
 	}
-	
+
 	public StringBuilder getCoPIGraphMLContent(){
 		return coPIGraphMLContent;
 	}
@@ -103,7 +103,7 @@ private void generateGraphContent(CollaborationData coPIData, Element rootElemen
 		if (coPIData.getCollaborators() != null & coPIData.getCollaborators().size() > 0) {
 			generateNodeSectionContent(coPIData, graph);
 		}
-		
+
 		if (coPIData.getCollaborations() != null & coPIData.getCollaborations().size() > 0) {
 			generateEdgeSectionContent(coPIData, graph);
 		}
@@ -113,7 +113,7 @@ private void generateEdgeSectionContent(CollaborationData coPIData, Element grap
 		Document doc = graphElement.getOwnerDocument();
 
 		graphElement.appendChild(doc.createComment("edges"));
-		
+
 		Set<Collaboration> edges = coPIData.getCollaborations();
 		List<Collaboration> orderedEdges = new ArrayList<Collaboration>(edges);
 		orderedEdges.sort(new CollaborationComparator());
@@ -121,12 +121,12 @@ private void generateEdgeSectionContent(CollaborationData coPIData, Element grap
 		for (Collaboration currentEdge : orderedEdges) {
 			/*
 			 * This method actually creates the XML code for a single edge. "graphMLContent"
-			 * is being side-effected. 
+			 * is being side-effected.
 			 * */
 			getEdgeContent(graphElement, currentEdge);
 		}
 	}
-	
+
 	private void getEdgeContent(Element graphElement, Collaboration currentEdge) {
 		Document doc = graphElement.getOwnerDocument();
 
@@ -168,9 +168,9 @@ private void getEdgeContent(Element graphElement, Collaboration currentEdge) {
 				earliestCount.setTextContent(publicationInfo.getValue().toString());
 				edge.appendChild(earliestCount);
 			}
-			
+
 		}
-		
+
 		if (currentEdge.getLatestCollaborationYearCount() != null) {
 			for (Map.Entry<String, Integer> publicationInfo : currentEdge.getLatestCollaborationYearCount().entrySet()) {
 				Element latest = doc.createElementNS(GRAPHML_NS, "data");
@@ -183,9 +183,9 @@ private void getEdgeContent(Element graphElement, Collaboration currentEdge) {
 				latestCount.setTextContent(publicationInfo.getValue().toString());
 				edge.appendChild(latestCount);
 			}
-			
+
 		}
-		
+
 		if (currentEdge.getUnknownCollaborationYearCount() != null) {
 			Element unknown = doc.createElementNS(GRAPHML_NS, "data");
 			unknown.setAttribute("key", "num_unknown_collaboration");
@@ -201,21 +201,21 @@ private void generateNodeSectionContent(CollaborationData coPIData, Element grap
 
 		Collaborator egoNode = coPIData.getEgoCollaborator();
 		Set<Collaborator> piNodes = coPIData.getCollaborators();
-		
+
 		/*
 		 * This method actually creates the XML code for a single node. "graphMLContent"
 		 * is being side-effected. The egoNode is added first because this is the "requirement"
 		 * of the co-pi vis. Ego should always come first.
-		 * 
+		 *
 		 * */
 		getNodeContent(graphElement, egoNode);
-		
+
 		List<Collaborator> orderedPINodes = new ArrayList<Collaborator>(piNodes);
 		orderedPINodes.remove(egoNode);
-		
+
 		orderedPINodes.sort(new CollaboratorComparator());
-		
-		
+
+
 		for (Collaborator currNode : orderedPINodes) {
 			/*
 			 * We have already printed the Ego Node info.
@@ -247,7 +247,7 @@ private void getNodeContent(Element graphElement, Collaborator collaborator) {
 		label.setAttribute("key", "label");
 		label.setTextContent(collaborator.getCollaboratorName());
 		node.appendChild(label);
-		
+
 		if (profileURL != null) {
 			Element profile = doc.createElementNS(GRAPHML_NS, "data");
 			profile.setAttribute("key", "profile_url");
@@ -264,7 +264,7 @@ private void getNodeContent(Element graphElement, Collaborator collaborator) {
 			/*
 			 * There is no clean way of getting the map contents in java even though
 			 * we are sure to have only one entry on the map. So using the for loop.
-			 * I am feeling dirty just about now. 
+			 * I am feeling dirty just about now.
 			 * */
 			for (Map.Entry<String, Integer> publicationInfo : collaborator.getEarliestActivityYearCount().entrySet()) {
 				Element earliest = doc.createElementNS(GRAPHML_NS, "data");
@@ -278,7 +278,7 @@ private void getNodeContent(Element graphElement, Collaborator collaborator) {
 				node.appendChild(earliestCount);
 			}
 		}
-		
+
 		if (collaborator.getLatestActivityYearCount() != null) {
 			for (Map.Entry<String, Integer> publicationInfo : collaborator.getLatestActivityYearCount().entrySet()) {
 				Element latest = doc.createElementNS(GRAPHML_NS, "data");
@@ -292,7 +292,7 @@ private void getNodeContent(Element graphElement, Collaborator collaborator) {
 				node.appendChild(latestCount);
 			}
 		}
-		
+
 		if (collaborator.getUnknownActivityYearCount() != null) {
 			Element unknown = doc.createElementNS(GRAPHML_NS, "data");
 			unknown.setAttribute("key", "num_unknown_grant");
@@ -303,16 +303,16 @@ private void getNodeContent(Element graphElement, Collaborator collaborator) {
 
 	private void generateKeyDefinitionContent(CollaborationData coPIData, Element rootElement) {
 		/*
-		 * Generate the key definition content for node. 
+		 * Generate the key definition content for node.
 		 * */
 		getKeyDefinitionFromSchema(coPIData.getNodeSchema(), rootElement);
-		
+
 		/*
-		 * Generate the key definition content for edge. 
+		 * Generate the key definition content for edge.
 		 * */
 		getKeyDefinitionFromSchema(coPIData.getEdgeSchema(), rootElement);
 	}
-	
+
 	private void getKeyDefinitionFromSchema(Set<Map<String, String>> schema, Element rootElement) {
 		Document doc = rootElement.getOwnerDocument();
 
@@ -322,7 +322,7 @@ private void getKeyDefinitionFromSchema(Set<Map<String, String>> schema, Element
 			for (Map.Entry<String, String> currentAttributeKey : currentNodeSchemaAttribute.entrySet()) {
 				key.setAttribute(currentAttributeKey.getKey(), currentAttributeKey.getValue());
 			}
-			
+
 			if (currentNodeSchemaAttribute.containsKey("default")) {
 				Element def = doc.createElementNS(GRAPHML_NS, "default");
 				def.setTextContent(currentNodeSchemaAttribute.get("default"));
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java
index 71b2ae3888..031fa33834 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java
@@ -23,7 +23,7 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
 
 /**
- * This class contains code for rendering sparklines and displaying tables for 
+ * This class contains code for rendering sparklines and displaying tables for
  * Co-PI visualization.
  * @author bkoniden
  * Deepak Konidena
@@ -34,14 +34,14 @@ public class CoPIVisCodeGenerator {
 	 * There are 2 modes of sparkline that are available via this visualization.
 	 * 		1. Short Sparkline - This sparkline will render all the data points (or sparks),
 	 * 			which in this case are the copi(s) over the years, from the last 10 years.
-	 * 
-	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks) 
+	 *
+	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks)
 	 * 			spanning the career of the person & last 10 years at the minimum, in case if
 	 * 			the person started his career in the last 10 years.
 	 * */
-	private static final String DEFAULT_VISCONTAINER_DIV_ID = 
+	private static final String DEFAULT_VISCONTAINER_DIV_ID =
 								"unique_coinvestigators_vis_container";
-	
+
 	private Map<String, Set<Collaborator>> yearToUniqueCoPIs;
 
 	private Log log;
@@ -50,20 +50,20 @@ public class CoPIVisCodeGenerator {
 
 	private String individualURI;
 
-	public CoPIVisCodeGenerator(String individualURI, 
-			  String visMode, 
-			  String visContainer, 
-			  Map<String, Set<Collaborator>> yearToUniqueCoPIs, 
+	public CoPIVisCodeGenerator(String individualURI,
+			  String visMode,
+			  String visContainer,
+			  Map<String, Set<Collaborator>> yearToUniqueCoPIs,
 			  Log log){
-		
+
 		this.individualURI = individualURI;
-		
+
 		this.yearToUniqueCoPIs = yearToUniqueCoPIs;
 
 		this.log = log;
-		
+
 		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
-		
+
 	}
 
 	/**
@@ -78,11 +78,11 @@ private SparklineData setupSparklineParameters(String visMode,
 		SparklineData sparklineData = new SparklineData();
 
 		int numOfYearsToBeRendered = 0;
-		
+
 		/*
-		 * It was decided that to prevent downward curve that happens if there are no publications 
+		 * It was decided that to prevent downward curve that happens if there are no publications
 		 * in the current year seems a bit harsh, so we consider only publications from the last 10
-		 * complete years. 
+		 * complete years.
 		 * */
 		int currentYear = Calendar.getInstance().get(Calendar.YEAR) - 1;
 		int shortSparkMinYear = currentYear
@@ -133,12 +133,12 @@ private SparklineData setupSparklineParameters(String visMode,
 		}
 
 		numOfYearsToBeRendered = currentYear - minGrantYearConsidered + 1;
-		
+
 		sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered);
-		
+
 		int uniqueCoPICounter = 0;
 		Set<Collaborator> allCoPIsWithKnownGrantShipYears = new HashSet<Collaborator>();
-		List<YearToEntityCountDataElement> yearToUniqueInvestigatorsCountDataTable = 
+		List<YearToEntityCountDataElement> yearToUniqueInvestigatorsCountDataTable =
 					new ArrayList<YearToEntityCountDataElement>();
 
 		for (int grantYear = minGrantYearConsidered; grantYear <= currentYear; grantYear++) {
@@ -157,13 +157,13 @@ private SparklineData setupSparklineParameters(String visMode,
 			}
 
 			yearToUniqueInvestigatorsCountDataTable.add(new YearToEntityCountDataElement(
-					uniqueCoPICounter, 
-					grantYearAsString, 
+					uniqueCoPICounter,
+					grantYearAsString,
 					currentUniqueCoPIs));
-			
+
 			uniqueCoPICounter++;
 		}
-		
+
 		/*
 		 * For the purpose of this visualization I have come up with a term
 		 * "Sparks" which essentially means data points. Sparks that will be
@@ -171,18 +171,18 @@ private SparklineData setupSparklineParameters(String visMode,
 		 * associated with it. Hence.
 		 */
 		sparklineData.setRenderedSparks(allCoPIsWithKnownGrantShipYears.size());
-		
+
 		sparklineData.setYearToEntityCountDataTable(yearToUniqueInvestigatorsCountDataTable);
 
 		/*
-		 * This is required only for the sparklines which convey collaborationships like 
-		 * coinvestigatorships and coauthorship. There are edge cases where a collaborator can be 
-		 * present for in a collaboration with known & unknown year. We do not want to repeat the 
-		 * count for this collaborator when we present it in the front-end. 
+		 * This is required only for the sparklines which convey collaborationships like
+		 * coinvestigatorships and coauthorship. There are edge cases where a collaborator can be
+		 * present for in a collaboration with known & unknown year. We do not want to repeat the
+		 * count for this collaborator when we present it in the front-end.
 		 * */
-		Set<Collaborator> totalUniqueCoInvestigators = 
+		Set<Collaborator> totalUniqueCoInvestigators =
 					new HashSet<Collaborator>(allCoPIsWithKnownGrantShipYears);
-		
+
 		/*
 		 * Total grants will also consider grants that have no year
 		 * associated with them. Hence.
@@ -194,9 +194,9 @@ private SparklineData setupSparklineParameters(String visMode,
 			totalUniqueCoInvestigators.addAll(
 					yearToUniqueCoPIs.get(VOConstants.DEFAULT_GRANT_YEAR));
 		}
-		
+
 		sparklineData.setTotalCollaborationshipCount(totalUniqueCoInvestigators.size());
-		
+
 		sparklineData.setUnknownYearGrants(unknownYearGrants);
 
 		if (providedVisContainerID != null) {
@@ -206,7 +206,7 @@ private SparklineData setupSparklineParameters(String visMode,
 		}
 
 		sparklineData.setVisContainerDivID(visContainerID);
-		
+
 		/*
 		 * By default these represents the range of the rendered sparks. Only in
 		 * case of "short" sparkline mode we will set the Earliest
@@ -226,35 +226,35 @@ private SparklineData setupSparklineParameters(String visMode,
 
 			sparklineData.setEarliestRenderedGrantYear(shortSparkMinYear);
 			sparklineData.setShortVisMode(true);
-			
+
 		} else {
 			sparklineData.setShortVisMode(false);
 		}
-		
+
 		if (yearToUniqueCoPIs.size() > 0) {
-			
+
 			sparklineData.setFullTimelineNetworkLink(
 					UtilityFunctions.getCollaboratorshipNetworkLink(
 							individualURI,
 							VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
 							VisualizationFrameworkConstants.COPI_VIS_MODE));
-			
+
 			sparklineData.setDownloadDataLink(
 					UtilityFunctions.getCSVDownloadURL(
 							individualURI,
 							VisualizationFrameworkConstants.CO_PI_VIS,
 							VisualizationFrameworkConstants.COPIS_COUNT_PER_YEAR_VIS_MODE));
-			
+
 			Map<String, Integer> yearToUniqueCoPIsCount = new HashMap<String, Integer>();
-			for (Map.Entry<String, Set<Collaborator>> currentYearToUniqueCoPIsCount 
+			for (Map.Entry<String, Set<Collaborator>> currentYearToUniqueCoPIsCount
 					: yearToUniqueCoPIs.entrySet()) {
-				
-				yearToUniqueCoPIsCount.put(currentYearToUniqueCoPIsCount.getKey(), 
+
+				yearToUniqueCoPIsCount.put(currentYearToUniqueCoPIsCount.getKey(),
 											   currentYearToUniqueCoPIsCount.getValue().size());
 			}
 
 			sparklineData.setYearToActivityCount(yearToUniqueCoPIsCount);
-			
+
 		}
 
 		return sparklineData;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java
index 7d4de93b33..2bd6c64f20 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java
@@ -1,21 +1,21 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.exceptions;
-
-public class DocumentFieldNotFoundException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-	
-	public DocumentFieldNotFoundException(String message) {
-		super(message);
-	}
-	
-	public DocumentFieldNotFoundException(Exception cause) {
-		super(createMessage(cause), cause);
-	}
-
-	private static String createMessage(Exception cause) {
-		return "Document Field is empty " + cause.getMessage();
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.exceptions;
+
+public class DocumentFieldNotFoundException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+
+	public DocumentFieldNotFoundException(String message) {
+		super(message);
+	}
+
+	public DocumentFieldNotFoundException(Exception cause) {
+		super(createMessage(cause), cause);
+	}
+
+	private static String createMessage(Exception cause) {
+		return "Document Field is empty " + cause.getMessage();
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java
index a5bf5b8d96..22317cd8f5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java
@@ -1,21 +1,21 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.exceptions;
-
-public class IllegalConstructedModelIdentifierException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-	
-	public IllegalConstructedModelIdentifierException(String message) {
-		super(message);
-	}
-	
-	public IllegalConstructedModelIdentifierException(Exception cause) {
-		super(createMessage(cause), cause);
-	}
-
-	private static String createMessage(Exception cause) {
-		return "Illegal Constructed Model Identifier provided. It should be of the form <TYPE>$<URI>. " + cause.getMessage();
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.exceptions;
+
+public class IllegalConstructedModelIdentifierException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+
+	public IllegalConstructedModelIdentifierException(String message) {
+		super(message);
+	}
+
+	public IllegalConstructedModelIdentifierException(Exception cause) {
+		super(createMessage(cause), cause);
+	}
+
+	private static String createMessage(Exception cause) {
+		return "Illegal Constructed Model Identifier provided. It should be of the form <TYPE>$<URI>. " + cause.getMessage();
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java
index 8b361fe107..df39a4a4df 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java
@@ -1,21 +1,21 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.exceptions;
-
-public class MalformedQueryParametersException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-	
-	public MalformedQueryParametersException(String message) {
-		super(message);
-	}
-	
-	public MalformedQueryParametersException(Exception cause) {
-		super(createMessage(cause), cause);
-	}
-
-	private static String createMessage(Exception cause) {
-		return "Malformed Query Params " + cause.getMessage();
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.exceptions;
+
+public class MalformedQueryParametersException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+
+	public MalformedQueryParametersException(String message) {
+		super(message);
+	}
+
+	public MalformedQueryParametersException(Exception cause) {
+		super(createMessage(cause), cause);
+	}
+
+	private static String createMessage(Exception cause) {
+		return "Malformed Query Params " + cause.getMessage();
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
index cdf8992b07..f4fe4307e8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
@@ -1,667 +1,667 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience;
-
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.jena.query.QuerySolution;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.model.OrganizationPeopleMap;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.OrgUtils;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches;
-import mapping.ScienceMapping;
-import mapping.ScienceMappingResult;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-
-import org.apache.jena.query.Dataset;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.MapOfScienceConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
-import edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph.OrganizationUtilityFunctions;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.MapOfScience;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
-
-public class MapOfScienceVisualizationRequestHandler implements VisualizationRequestHandler {
-	
-	@Override
-	public ResponseValues generateStandardVisualization(
-			VitroRequest vitroRequest, Log log, Dataset dataset)
-			throws MalformedQueryParametersException {
-		
-		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-		return generateStandardVisualizationForScienceMapVis(vitroRequest, log, dataset, entityURI);
-	}
-	
-	@Override
-	public ResponseValues generateVisualizationForShortURLRequests(
-			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
-			Dataset dataset) throws MalformedQueryParametersException {
-
-		if (vitroRequest.getRequestURI().endsWith("/about")) {
-			return generateAboutScienceMapVisPage();
-		} else {
-			return generateStandardVisualizationForScienceMapVis(
-					vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
-		}
-	}
-
-	private ResponseValues generateAboutScienceMapVisPage() {
-		return new TemplateResponseValues("aboutMapOfScience.ftl");
-	}
-	
-	private ResponseValues generateStandardVisualizationForScienceMapVis(
-			VitroRequest vitroRequest, Log log, Dataset dataset,
-			String entityURI) throws MalformedQueryParametersException {
-		
-		if (StringUtils.isBlank(entityURI)) {
-			
-			entityURI = OrganizationUtilityFunctions
-								.getStaffProvidedOrComputedHighestLevelOrganization(
-											log, 
-											dataset, 
-											vitroRequest);
-			
-		}
-		
-		
-		return prepareStandaloneMarkupResponse(vitroRequest, entityURI);
-	}
-
-	private Set<String> getPublicationsForPerson(RDFService rdfService, String personUri) {
-		if (preferCachesForPersonMap() && VisualizationCaches.personToPublication.isCached()) {
-			Map<String, Set<String>> personToPublicationMap = VisualizationCaches.personToPublication.get(rdfService).personToPublication;
-			return personToPublicationMap.get(personUri);
-		} else {
-			final Set<String> queryResults = new HashSet<String>();
-			String query = QueryConstants.getSparqlPrefixQuery() +
-					"SELECT ?document\n" +
-					"WHERE\n" +
-					"{\n" +
-					"  <" + personUri + "> core:relatedBy ?authorship .\n" +
-					"  ?authorship a core:Authorship .\n" +
-					"  ?authorship core:relates ?document .\n" +
-					"  ?document a bibo:Document .\n" +
-					"}\n";
-
-			try {
-				rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
-					@Override
-					protected void processQuerySolution(QuerySolution qs) {
-						queryResults.add(qs.getResource("document").getURI());
-					}
-				});
-
-			} catch (RDFServiceException e) {
-			}
-
-			return queryResults;
-		}
-	}
-
-	private Map<String, String> getJournalsForPerson(RDFService rdfService, String personUri) {
-		if (preferCachesForPersonMap() && VisualizationCaches.publicationToJournal.isCached()) {
-			return VisualizationCaches.publicationToJournal.get(rdfService);
-		} else {
-			final Map<String, String> queryResults = new HashMap<String, String>();
-			String query = QueryConstants.getSparqlPrefixQuery() +
-					"SELECT ?document ?journalLabel\n" +
-					"WHERE\n" +
-					"{\n" +
-					"  <" + personUri + "> core:relatedBy ?authorship .\n" +
-					"  ?authorship a core:Authorship .\n" +
-					"  ?authorship core:relates ?document .\n" +
-					"  ?document a bibo:Document .\n" +
-					"  ?document core:hasPublicationVenue ?journal . \n" +
-					"  ?journal rdfs:label ?journalLabel . \n" +
-					"}\n";
-
-			try {
-				rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
-					@Override
-					protected void processQuerySolution(QuerySolution qs) {
-						queryResults.put(qs.getResource("document").getURI(), qs.getLiteral("journalLabel").getString());
-					}
-				});
-
-			} catch (RDFServiceException e) {
-			}
-
-			return queryResults;
-		}
-	}
-
-	private static boolean preferCachesForPersonMap() {
-		return timeToGeneratePersonMap > 2000;
-	}
-
-	private static long timeToGeneratePersonMap = -1;
-	private synchronized static void recordExecutionTimeForPersonMap(long time) {
-		timeToGeneratePersonMap = Math.max(timeToGeneratePersonMap, time);
-	}
-
-	private Map<String, String> getSubjectPersonEntityAndGenerateDataResponse(
-			VitroRequest vitroRequest, String subjectEntityURI, String entityLabel, VisConstants.DataVisMode dataOuputFormat)
-			throws MalformedQueryParametersException, JsonProcessingException {
-
-		long startTime = System.currentTimeMillis();
-		try {
-			RDFService rdfService = vitroRequest.getRDFService();
-
-			Set<String> publicationsForPerson = getPublicationsForPerson(rdfService, subjectEntityURI);
-
-			if (publicationsForPerson == null || publicationsForPerson.size() == 0) {
-				if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
-					return prepareStandaloneDataErrorResponse();
-				} else {
-					return prepareDataErrorResponse();
-				}
-			} else {
-				Map<String, String> publicationToJournalMap = getJournalsForPerson(rdfService, subjectEntityURI);
-
-				JournalPublicationCounts journalCounts = new JournalPublicationCounts();
-
-				for (String publication : publicationsForPerson) {
-					journalCounts.increment(publicationToJournalMap.get(publication));
-				}
-
-				ScienceMappingResult result = getScienceMappingResult(journalCounts.map);
-
-				Map<String, String> fileData = new HashMap<String, String>();
-				if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
-					Set jsonContent = new HashSet();
-
-					MapOfScience entityJson = new MapOfScience(subjectEntityURI);
-					entityJson.setLabel("");
-					entityJson.setType("PERSON");
-
-					entityJson.setPubsWithNoJournals(journalCounts.noJournalCount);
-					updateEntityMapOfScienceInformation(entityJson, result);
-
-					jsonContent.add(entityJson);
-
-					ObjectMapper mapper = new ObjectMapper();
-
-					fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-					fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(jsonContent));
-				} else {
-					if (StringUtils.isBlank(entityLabel)) {
-						entityLabel = "no-name";
-					}
-
-					String outputFileName = UtilityFunctions.slugify(entityLabel);
-					String fileContent = null;
-
-					String visModeKey = vitroRequest.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY);
-					if (VisualizationFrameworkConstants.SUBDISCIPLINE_TO_ACTIVTY_VIS_MODE.equalsIgnoreCase(visModeKey)) {
-						outputFileName += "_subdiscipline-to-publications" + ".csv";
-						fileContent = getSubDisciplineToPublicationsCSVContent(result);
-					} else if (VisualizationFrameworkConstants.SCIENCE_UNLOCATED_JOURNALS_VIS_MODE.equalsIgnoreCase(visModeKey)) {
-						outputFileName += "_unmapped-journals" + ".csv";
-						fileContent = getUnlocatedJournalsCSVContent(result, journalCounts.noJournalCount);
-					} else {
-						outputFileName += "_discipline-to-publications" + ".csv";
-						fileContent = getDisciplineToPublicationsCSVContent(result);
-					}
-
-					fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-					fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
-					fileData.put(DataVisualizationController.FILE_CONTENT_KEY, fileContent);
-				}
-
-				return fileData;
-			}
-		} finally {
-			recordExecutionTimeForPersonMap(System.currentTimeMillis() - startTime);
-		}
-	}
-
-	private Map<String, String> getSubjectEntityAndGenerateDataResponse(
-			VitroRequest vitroRequest, String subjectEntityURI, String entityLabel, VisConstants.DataVisMode dataOuputFormat)
-			throws MalformedQueryParametersException, JsonProcessingException {
-
-		RDFService rdfService = vitroRequest.getRDFService();
-
-		Map<String, String> orgLabelMap = VisualizationCaches.organizationLabels.get(rdfService);
-
-		if (orgLabelMap.get(subjectEntityURI) == null) {
-			if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
-				return prepareStandaloneDataErrorResponse();
-			} else {
-				return prepareDataErrorResponse();
-			}
-		}
-
-		Map<String, Set<String>> subOrgMap = VisualizationCaches.organizationSubOrgs.get(rdfService);
-		OrganizationPeopleMap organisationToPeopleMap = VisualizationCaches.organisationToPeopleMap.get(rdfService);
-		Map<String, Set<String>> personToPublicationMap = VisualizationCaches.personToPublication.get(rdfService).personToPublication;
-		Map<String, String> publicationToJournalMap = VisualizationCaches.publicationToJournal.get(rdfService);
-
-		Set<String> orgPublications       = new HashSet<String>();
-		Set<String> orgPublicationsPeople = new HashSet<String>();
-
-		Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
-
-		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
-				subjectEntityURI,
-				orgPublications,
-				orgPublicationsPeople,
-				subOrgPublicationsMap,
-				subOrgMap,
-				organisationToPeopleMap.organizationToPeople,
-				personToPublicationMap
-		);
-
-		if (orgPublications.isEmpty()) {
-			if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
-				return prepareStandaloneDataErrorResponse();
-			} else {
-				return prepareDataErrorResponse();
-			}
-		} else {
-			JournalPublicationCounts journalCounts = new JournalPublicationCounts();
-
-			for (String publication : orgPublications) {
-				journalCounts.increment(publicationToJournalMap.get(publication));
-			}
-
-			ScienceMappingResult result = getScienceMappingResult(journalCounts.map);
-
-			Map<String, String> fileData = new HashMap<String, String>();
-			if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
-				Set jsonContent = new HashSet();
-
-				MapOfScience entityJson = new MapOfScience(subjectEntityURI);
-				entityJson.setLabel(entityLabel);
-				entityJson.setType("ORGANIZATION");
-
-				if (subOrgMap.containsKey(subjectEntityURI)) {
-					for (String subOrg : subOrgMap.get(subjectEntityURI)) {
-						Set<String> publications = subOrgPublicationsMap.get(subOrg);
-						entityJson.addSubEntity(subOrg,
-								orgLabelMap.get(subOrg),
-								"ORGANIZATION",
-								publications == null ? 0 : publications.size());
-					}
-				}
-
-				entityJson.setPubsWithNoJournals(journalCounts.noJournalCount);
-				updateEntityMapOfScienceInformation(entityJson, result);
-
-				jsonContent.add(entityJson);
-
-				ObjectMapper mapper = new ObjectMapper();
-
-				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(jsonContent));
-			} else {
-				if (StringUtils.isBlank(entityLabel)) {
-					entityLabel = "no-organization";
-				}
-
-				String outputFileName = UtilityFunctions.slugify(entityLabel);
-				String fileContent = null;
-
-				String visModeKey = vitroRequest.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY);
-				if (VisualizationFrameworkConstants.SUBDISCIPLINE_TO_ACTIVTY_VIS_MODE.equalsIgnoreCase(visModeKey)) {
-					outputFileName += "_subdiscipline-to-publications" + ".csv";
-					fileContent = getSubDisciplineToPublicationsCSVContent(result);
-				} else if (VisualizationFrameworkConstants.SCIENCE_UNLOCATED_JOURNALS_VIS_MODE.equalsIgnoreCase(visModeKey)) {
-					outputFileName += "_unmapped-journals" + ".csv";
-					fileContent = getUnlocatedJournalsCSVContent(result, journalCounts.noJournalCount);
-				} else {
-					outputFileName += "_discipline-to-publications" + ".csv";
-					fileContent = getDisciplineToPublicationsCSVContent(result);
-				}
-
-				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-				fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
-				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, fileContent);
-			}
-			return fileData;
-		}
-	}
-
-	private Map<String, String> prepareDataErrorResponse() {
-		
-		String outputFileName = "no-organization_publications-per-year.csv";
-		
-		Map<String, String> fileData = new HashMap<String, String>();
-		
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, 
-					 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
-					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, "");
-		return fileData;
-	}
-
-	private Map<String, String> prepareStandaloneDataErrorResponse() throws JsonProcessingException {
-		
-		GenericQueryMap errorDataResponse = new GenericQueryMap();
-		errorDataResponse.addEntry("error", "No Publications for this Entity found in VIVO.");
-		
-		Map<String, String> fileData = new HashMap<String, String>();
-		
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
-					 "application/octet-stream");
-
-		ObjectMapper mapper = new ObjectMapper();
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(errorDataResponse));
-		
-		return fileData;
-	}
-
-	@Override
-	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
-			throws MalformedQueryParametersException, JsonProcessingException {
-
-		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-		
-		if (StringUtils.isBlank(entityURI)) {
-			entityURI = OrganizationUtilityFunctions
-							.getStaffProvidedOrComputedHighestLevelOrganization(
-									log,
-									dataset,
-									vitroRequest);
-		}
-		
-		VisConstants.DataVisMode currentDataVisMode = VisConstants.DataVisMode.CSV;
-		
-		if (VisualizationFrameworkConstants.JSON_OUTPUT_FORMAT
-				.equalsIgnoreCase(vitroRequest.getParameter(
-						VisualizationFrameworkConstants.OUTPUT_FORMAT_KEY))) {
-			currentDataVisMode = VisConstants.DataVisMode.JSON;
-		}
-
-		Individual individual = vitroRequest.getWebappDaoFactory()
-				.getIndividualDao()
-				.getIndividualByURI(entityURI);
-
-		try {
-			if (individual != null && individual.isVClass("http://xmlns.com/foaf/0.1/Person")) {
-				return getSubjectPersonEntityAndGenerateDataResponse(
-						vitroRequest,
-						entityURI,
-						individual != null ? individual.getDataValue("http://www.w3.org/2000/01/rdf-schema#label") : "",
-						currentDataVisMode);
-			} else {
-				return getSubjectEntityAndGenerateDataResponse(
-						vitroRequest,
-						entityURI,
-						individual != null ? individual.getDataValue("http://www.w3.org/2000/01/rdf-schema#label") : "",
-						currentDataVisMode);
-			}
-		} finally {
-			VisualizationCaches.buildMissing();
-		}
-	}
-	
-	
-	@Override
-	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, Dataset dataset) throws MalformedQueryParametersException {
-		throw new UnsupportedOperationException("Map of Science Vis does not provide Ajax Response.");
-	}
-
-	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq, String entityURI)
-				throws MalformedQueryParametersException {
-
-        String standaloneTemplate = "mapOfScienceStandalone.ftl";
-		
-        String entityLabel = UtilityFunctions.getIndividualLabelFromDAO(vreq, entityURI);
-        
-        Map<String, Object> body = new HashMap<String, Object>();
-        body.put("title", entityLabel + " - Map of Science Visualization");
-        body.put("entityURI", entityURI);
-        body.put("entityLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
-        body.put("entityLabel", entityLabel);
-        
-        if (UtilityFunctions.isEntityAPerson(vreq, entityURI)) {
-        	body.put("entityType", "PERSON");
-			if (preferCachesForPersonMap() && VisualizationCaches.personToPublication.isCached()) {
-				body.put("builtFromCacheTime", VisualizationCaches.personToPublication.cachedWhen());
-			}
-        } else {
-        	body.put("entityType", "ORGANIZATION");
-			if (VisualizationCaches.personToPublication.isCached()) {
-				body.put("builtFromCacheTime", VisualizationCaches.personToPublication.cachedWhen());
-			}
-        }
-
-
-        body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
-
-		ConfigurationProperties properties = ConfigurationProperties.getBean(vreq);
-		if (properties != null) {
-			String key = properties.getProperty("google.maps.key");
-			if (!StringUtils.isEmpty(key)) {
-				body.put("googleMapsKey", key);
-			}
-		}
-
-        return new TemplateResponseValues(standaloneTemplate, body);
-	}
-
-	private void updateEntityMapOfScienceInformation(MapOfScience entityJson, ScienceMappingResult result) {
-		int mappedPublicationCount = 0;
-		int publicationsWithInvalidJournalCount = 0;
-		Map<Integer, Float> subdisciplineToActivity = new HashMap<Integer, Float>();
-		
-		if (result != null) {
-			subdisciplineToActivity = result.getMappedResult();
-			publicationsWithInvalidJournalCount = Math.round(result.getUnMappedPublications());
-			mappedPublicationCount = Math.round(result.getMappedPublications());
-		}
-		
-		entityJson.setPubsMapped(mappedPublicationCount);
-		entityJson.setPubsWithInvalidJournals(publicationsWithInvalidJournalCount);
-		entityJson.setSubdisciplineActivity(subdisciplineToActivity);
-	}
-
-	private ScienceMappingResult getScienceMappingResult(
-			Map<String, Integer> journalToPublicationCount) {
-		ScienceMappingResult result = null;
-		try {
-			result = (new ScienceMapping()).generateScienceMappingResult(journalToPublicationCount);
-		} catch (NumberFormatException e) {
-			System.err.println("NumberFormatException coming from Map Of Science Vis");
-			e.printStackTrace();
-		} catch (IOException e) {
-			System.err.println("IOException coming from Map Of Science Vis");
-			e.printStackTrace();
-		}
-		return result;
-	}
-
-	private String getDisciplineToPublicationsCSVContent(ScienceMappingResult result) {
-		StringBuilder csvFileContent = new StringBuilder();
-		
-		csvFileContent.append("Discipline, Publication Count, % Activity\n");
-		
-		Map<Integer, Float> disciplineToPublicationCount = new HashMap<Integer, Float>();
-		
-		Float totalMappedPublications = new Float(0);
-		
-		if (result != null) {
-			for (Map.Entry<Integer, Float> currentMappedSubdiscipline : result.getMappedResult().entrySet()) {
-				float updatedPublicationCount = currentMappedSubdiscipline.getValue();
-				
-				Integer lookedUpDisciplineID = MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_DISCIPLINE_ID
-													.get(currentMappedSubdiscipline.getKey());
-				
-				if (disciplineToPublicationCount.containsKey(lookedUpDisciplineID)) {
-					updatedPublicationCount += disciplineToPublicationCount.get(lookedUpDisciplineID);
-				}
-				
-				disciplineToPublicationCount.put(lookedUpDisciplineID, updatedPublicationCount);
-			}
-			
-			totalMappedPublications = result.getMappedPublications();
-		}
-		
-		DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
-		
-		for (Map.Entry<Integer, Float> currentMappedDiscipline : disciplineToPublicationCount.entrySet()) {
-			csvFileContent.append(StringEscapeUtils.escapeCsv(MapOfScienceConstants.DISCIPLINE_ID_TO_LABEL.get(currentMappedDiscipline.getKey())));
-			csvFileContent.append(", ");
-			csvFileContent.append(percentageActivityFormat.format(currentMappedDiscipline.getValue()));
-			csvFileContent.append(", ");
-			
-			if (totalMappedPublications > 0) {
-				csvFileContent.append(percentageActivityFormat.format(100 * currentMappedDiscipline.getValue() / totalMappedPublications));
-			} else {
-				csvFileContent.append("Not Available");
-			}
-			
-			csvFileContent.append("\n");
-		}
-		
-		for (Map.Entry<Integer, String> currentDiscipline : MapOfScienceConstants.DISCIPLINE_ID_TO_LABEL.entrySet()) {
-			
-			Float currentDisciplineValue = disciplineToPublicationCount.get(currentDiscipline.getKey());
-			if (currentDisciplineValue == null) {
-				csvFileContent.append(StringEscapeUtils.escapeCsv(currentDiscipline.getValue()));
-				csvFileContent.append(", ");
-				csvFileContent.append(0);
-				csvFileContent.append(", ");
-				csvFileContent.append(0);	
-				csvFileContent.append("\n");
-			}
-		}
-		
-		return csvFileContent.toString();
-	}
-	
-	private String getUnlocatedJournalsCSVContent(ScienceMappingResult result, int noJournalCount) {
-		StringBuilder csvFileContent = new StringBuilder();
-		
-		csvFileContent.append("Publication Venue, Publication Count\n");
-		
-		DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
-		
-		if (noJournalCount > 0) {
-			csvFileContent.append(StringEscapeUtils.escapeCsv("No Publication Venue Given"));
-			csvFileContent.append(", ");
-			csvFileContent.append(percentageActivityFormat.format(noJournalCount));
-			csvFileContent.append("\n");
-		}
-		
-		if (result != null) {
-			Map<String, Float> mappedResult = result.getUnmappedResult();
-			
-			for (Map.Entry<String, Float> currentUnMappedJournal : mappedResult.entrySet()) {
-				csvFileContent.append(StringEscapeUtils.escapeCsv(currentUnMappedJournal.getKey()));
-				csvFileContent.append(", ");
-				csvFileContent.append(percentageActivityFormat.format(currentUnMappedJournal.getValue()));
-				csvFileContent.append("\n");
-			}
-		}
-		
-		return csvFileContent.toString();
-	}
-	
-	private String getSubDisciplineToPublicationsCSVContent(ScienceMappingResult result) {
-		StringBuilder csvFileContent = new StringBuilder();
-		
-		csvFileContent.append("Sub-Discipline, Publication Count, % Activity\n");
-		
-		Float totalMappedPublications = new Float(0);
-		
-		if (result != null) {
-			DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
-			
-			totalMappedPublications = result.getMappedPublications();
-			Map<Integer, Float> mappedResult = result.getMappedResult();
-			
-			for (Map.Entry<Integer, Float> currentMappedSubdiscipline : mappedResult.entrySet()) {
-				csvFileContent.append(StringEscapeUtils.escapeCsv(MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_LABEL
-																	.get(currentMappedSubdiscipline.getKey())));
-				csvFileContent.append(", ");
-				csvFileContent.append(percentageActivityFormat.format(currentMappedSubdiscipline.getValue()));
-				csvFileContent.append(", ");
-				
-				if (totalMappedPublications > 0) {
-					csvFileContent.append(percentageActivityFormat.format(100 * currentMappedSubdiscipline.getValue() / totalMappedPublications));
-				} else {
-					csvFileContent.append("Not Available");
-				}
-				csvFileContent.append("\n");
-			}
-			
-			for (Map.Entry<Integer, String> currentSubdiscipline : MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_LABEL.entrySet()) {
-				Float currentMappedSubdisciplineValue = mappedResult.get(currentSubdiscipline.getKey());
-				if (currentMappedSubdisciplineValue == null) {
-					csvFileContent.append(StringEscapeUtils.escapeCsv(currentSubdiscipline.getValue()));
-					csvFileContent.append(", ");
-					csvFileContent.append(0);
-					csvFileContent.append(", ");
-					csvFileContent.append(0);	
-					csvFileContent.append("\n");
-				}
-			}
-		}
-		
-		return csvFileContent.toString();
-	}
-
-	@Override
-	public AuthorizationRequest getRequiredPrivileges() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	private static class JournalPublicationCounts {
-		Map<String, Integer> map = new HashMap<String, Integer>();
-		int noJournalCount = 0;
-		int total = 0;
-
-		void increment(String journalName) {
-			if (StringUtils.isEmpty(journalName)) {
-				noJournalCount++;
-			} else {
-				Integer count = map.get(journalName);
-				if (count == null) {
-					map.put(journalName, 1);
-				} else {
-					map.put(journalName, 1 + count.intValue());
-				}
-			}
-
-			total++;
-		}
-
-		boolean isEmpty() {
-			return total == 0;
-		}
-
-		long getTotal() {
-			return total;
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience;
+
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.jena.query.QuerySolution;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.model.OrganizationPeopleMap;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.OrgUtils;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches;
+import mapping.ScienceMapping;
+import mapping.ScienceMappingResult;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+
+import org.apache.jena.query.Dataset;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.MapOfScienceConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
+import edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph.OrganizationUtilityFunctions;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.MapOfScience;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
+
+public class MapOfScienceVisualizationRequestHandler implements VisualizationRequestHandler {
+
+	@Override
+	public ResponseValues generateStandardVisualization(
+			VitroRequest vitroRequest, Log log, Dataset dataset)
+			throws MalformedQueryParametersException {
+
+		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+		return generateStandardVisualizationForScienceMapVis(vitroRequest, log, dataset, entityURI);
+	}
+
+	@Override
+	public ResponseValues generateVisualizationForShortURLRequests(
+			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
+			Dataset dataset) throws MalformedQueryParametersException {
+
+		if (vitroRequest.getRequestURI().endsWith("/about")) {
+			return generateAboutScienceMapVisPage();
+		} else {
+			return generateStandardVisualizationForScienceMapVis(
+					vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
+		}
+	}
+
+	private ResponseValues generateAboutScienceMapVisPage() {
+		return new TemplateResponseValues("aboutMapOfScience.ftl");
+	}
+
+	private ResponseValues generateStandardVisualizationForScienceMapVis(
+			VitroRequest vitroRequest, Log log, Dataset dataset,
+			String entityURI) throws MalformedQueryParametersException {
+
+		if (StringUtils.isBlank(entityURI)) {
+
+			entityURI = OrganizationUtilityFunctions
+								.getStaffProvidedOrComputedHighestLevelOrganization(
+											log,
+											dataset,
+											vitroRequest);
+
+		}
+
+
+		return prepareStandaloneMarkupResponse(vitroRequest, entityURI);
+	}
+
+	private Set<String> getPublicationsForPerson(RDFService rdfService, String personUri) {
+		if (preferCachesForPersonMap() && VisualizationCaches.personToPublication.isCached()) {
+			Map<String, Set<String>> personToPublicationMap = VisualizationCaches.personToPublication.get(rdfService).personToPublication;
+			return personToPublicationMap.get(personUri);
+		} else {
+			final Set<String> queryResults = new HashSet<String>();
+			String query = QueryConstants.getSparqlPrefixQuery() +
+					"SELECT ?document\n" +
+					"WHERE\n" +
+					"{\n" +
+					"  <" + personUri + "> core:relatedBy ?authorship .\n" +
+					"  ?authorship a core:Authorship .\n" +
+					"  ?authorship core:relates ?document .\n" +
+					"  ?document a bibo:Document .\n" +
+					"}\n";
+
+			try {
+				rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+					@Override
+					protected void processQuerySolution(QuerySolution qs) {
+						queryResults.add(qs.getResource("document").getURI());
+					}
+				});
+
+			} catch (RDFServiceException e) {
+			}
+
+			return queryResults;
+		}
+	}
+
+	private Map<String, String> getJournalsForPerson(RDFService rdfService, String personUri) {
+		if (preferCachesForPersonMap() && VisualizationCaches.publicationToJournal.isCached()) {
+			return VisualizationCaches.publicationToJournal.get(rdfService);
+		} else {
+			final Map<String, String> queryResults = new HashMap<String, String>();
+			String query = QueryConstants.getSparqlPrefixQuery() +
+					"SELECT ?document ?journalLabel\n" +
+					"WHERE\n" +
+					"{\n" +
+					"  <" + personUri + "> core:relatedBy ?authorship .\n" +
+					"  ?authorship a core:Authorship .\n" +
+					"  ?authorship core:relates ?document .\n" +
+					"  ?document a bibo:Document .\n" +
+					"  ?document core:hasPublicationVenue ?journal . \n" +
+					"  ?journal rdfs:label ?journalLabel . \n" +
+					"}\n";
+
+			try {
+				rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+					@Override
+					protected void processQuerySolution(QuerySolution qs) {
+						queryResults.put(qs.getResource("document").getURI(), qs.getLiteral("journalLabel").getString());
+					}
+				});
+
+			} catch (RDFServiceException e) {
+			}
+
+			return queryResults;
+		}
+	}
+
+	private static boolean preferCachesForPersonMap() {
+		return timeToGeneratePersonMap > 2000;
+	}
+
+	private static long timeToGeneratePersonMap = -1;
+	private synchronized static void recordExecutionTimeForPersonMap(long time) {
+		timeToGeneratePersonMap = Math.max(timeToGeneratePersonMap, time);
+	}
+
+	private Map<String, String> getSubjectPersonEntityAndGenerateDataResponse(
+			VitroRequest vitroRequest, String subjectEntityURI, String entityLabel, VisConstants.DataVisMode dataOuputFormat)
+			throws MalformedQueryParametersException, JsonProcessingException {
+
+		long startTime = System.currentTimeMillis();
+		try {
+			RDFService rdfService = vitroRequest.getRDFService();
+
+			Set<String> publicationsForPerson = getPublicationsForPerson(rdfService, subjectEntityURI);
+
+			if (publicationsForPerson == null || publicationsForPerson.size() == 0) {
+				if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
+					return prepareStandaloneDataErrorResponse();
+				} else {
+					return prepareDataErrorResponse();
+				}
+			} else {
+				Map<String, String> publicationToJournalMap = getJournalsForPerson(rdfService, subjectEntityURI);
+
+				JournalPublicationCounts journalCounts = new JournalPublicationCounts();
+
+				for (String publication : publicationsForPerson) {
+					journalCounts.increment(publicationToJournalMap.get(publication));
+				}
+
+				ScienceMappingResult result = getScienceMappingResult(journalCounts.map);
+
+				Map<String, String> fileData = new HashMap<String, String>();
+				if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
+					Set jsonContent = new HashSet();
+
+					MapOfScience entityJson = new MapOfScience(subjectEntityURI);
+					entityJson.setLabel("");
+					entityJson.setType("PERSON");
+
+					entityJson.setPubsWithNoJournals(journalCounts.noJournalCount);
+					updateEntityMapOfScienceInformation(entityJson, result);
+
+					jsonContent.add(entityJson);
+
+					ObjectMapper mapper = new ObjectMapper();
+
+					fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+					fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(jsonContent));
+				} else {
+					if (StringUtils.isBlank(entityLabel)) {
+						entityLabel = "no-name";
+					}
+
+					String outputFileName = UtilityFunctions.slugify(entityLabel);
+					String fileContent = null;
+
+					String visModeKey = vitroRequest.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY);
+					if (VisualizationFrameworkConstants.SUBDISCIPLINE_TO_ACTIVTY_VIS_MODE.equalsIgnoreCase(visModeKey)) {
+						outputFileName += "_subdiscipline-to-publications" + ".csv";
+						fileContent = getSubDisciplineToPublicationsCSVContent(result);
+					} else if (VisualizationFrameworkConstants.SCIENCE_UNLOCATED_JOURNALS_VIS_MODE.equalsIgnoreCase(visModeKey)) {
+						outputFileName += "_unmapped-journals" + ".csv";
+						fileContent = getUnlocatedJournalsCSVContent(result, journalCounts.noJournalCount);
+					} else {
+						outputFileName += "_discipline-to-publications" + ".csv";
+						fileContent = getDisciplineToPublicationsCSVContent(result);
+					}
+
+					fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+					fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
+					fileData.put(DataVisualizationController.FILE_CONTENT_KEY, fileContent);
+				}
+
+				return fileData;
+			}
+		} finally {
+			recordExecutionTimeForPersonMap(System.currentTimeMillis() - startTime);
+		}
+	}
+
+	private Map<String, String> getSubjectEntityAndGenerateDataResponse(
+			VitroRequest vitroRequest, String subjectEntityURI, String entityLabel, VisConstants.DataVisMode dataOuputFormat)
+			throws MalformedQueryParametersException, JsonProcessingException {
+
+		RDFService rdfService = vitroRequest.getRDFService();
+
+		Map<String, String> orgLabelMap = VisualizationCaches.organizationLabels.get(rdfService);
+
+		if (orgLabelMap.get(subjectEntityURI) == null) {
+			if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
+				return prepareStandaloneDataErrorResponse();
+			} else {
+				return prepareDataErrorResponse();
+			}
+		}
+
+		Map<String, Set<String>> subOrgMap = VisualizationCaches.organizationSubOrgs.get(rdfService);
+		OrganizationPeopleMap organisationToPeopleMap = VisualizationCaches.organisationToPeopleMap.get(rdfService);
+		Map<String, Set<String>> personToPublicationMap = VisualizationCaches.personToPublication.get(rdfService).personToPublication;
+		Map<String, String> publicationToJournalMap = VisualizationCaches.publicationToJournal.get(rdfService);
+
+		Set<String> orgPublications       = new HashSet<String>();
+		Set<String> orgPublicationsPeople = new HashSet<String>();
+
+		Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
+
+		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
+				subjectEntityURI,
+				orgPublications,
+				orgPublicationsPeople,
+				subOrgPublicationsMap,
+				subOrgMap,
+				organisationToPeopleMap.organizationToPeople,
+				personToPublicationMap
+		);
+
+		if (orgPublications.isEmpty()) {
+			if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
+				return prepareStandaloneDataErrorResponse();
+			} else {
+				return prepareDataErrorResponse();
+			}
+		} else {
+			JournalPublicationCounts journalCounts = new JournalPublicationCounts();
+
+			for (String publication : orgPublications) {
+				journalCounts.increment(publicationToJournalMap.get(publication));
+			}
+
+			ScienceMappingResult result = getScienceMappingResult(journalCounts.map);
+
+			Map<String, String> fileData = new HashMap<String, String>();
+			if (VisConstants.DataVisMode.JSON.equals(dataOuputFormat)) {
+				Set jsonContent = new HashSet();
+
+				MapOfScience entityJson = new MapOfScience(subjectEntityURI);
+				entityJson.setLabel(entityLabel);
+				entityJson.setType("ORGANIZATION");
+
+				if (subOrgMap.containsKey(subjectEntityURI)) {
+					for (String subOrg : subOrgMap.get(subjectEntityURI)) {
+						Set<String> publications = subOrgPublicationsMap.get(subOrg);
+						entityJson.addSubEntity(subOrg,
+								orgLabelMap.get(subOrg),
+								"ORGANIZATION",
+								publications == null ? 0 : publications.size());
+					}
+				}
+
+				entityJson.setPubsWithNoJournals(journalCounts.noJournalCount);
+				updateEntityMapOfScienceInformation(entityJson, result);
+
+				jsonContent.add(entityJson);
+
+				ObjectMapper mapper = new ObjectMapper();
+
+				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(jsonContent));
+			} else {
+				if (StringUtils.isBlank(entityLabel)) {
+					entityLabel = "no-organization";
+				}
+
+				String outputFileName = UtilityFunctions.slugify(entityLabel);
+				String fileContent = null;
+
+				String visModeKey = vitroRequest.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY);
+				if (VisualizationFrameworkConstants.SUBDISCIPLINE_TO_ACTIVTY_VIS_MODE.equalsIgnoreCase(visModeKey)) {
+					outputFileName += "_subdiscipline-to-publications" + ".csv";
+					fileContent = getSubDisciplineToPublicationsCSVContent(result);
+				} else if (VisualizationFrameworkConstants.SCIENCE_UNLOCATED_JOURNALS_VIS_MODE.equalsIgnoreCase(visModeKey)) {
+					outputFileName += "_unmapped-journals" + ".csv";
+					fileContent = getUnlocatedJournalsCSVContent(result, journalCounts.noJournalCount);
+				} else {
+					outputFileName += "_discipline-to-publications" + ".csv";
+					fileContent = getDisciplineToPublicationsCSVContent(result);
+				}
+
+				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+				fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
+				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, fileContent);
+			}
+			return fileData;
+		}
+	}
+
+	private Map<String, String> prepareDataErrorResponse() {
+
+		String outputFileName = "no-organization_publications-per-year.csv";
+
+		Map<String, String> fileData = new HashMap<String, String>();
+
+		fileData.put(DataVisualizationController.FILE_NAME_KEY,
+					 outputFileName);
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
+					 "application/octet-stream");
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, "");
+		return fileData;
+	}
+
+	private Map<String, String> prepareStandaloneDataErrorResponse() throws JsonProcessingException {
+
+		GenericQueryMap errorDataResponse = new GenericQueryMap();
+		errorDataResponse.addEntry("error", "No Publications for this Entity found in VIVO.");
+
+		Map<String, String> fileData = new HashMap<String, String>();
+
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
+					 "application/octet-stream");
+
+		ObjectMapper mapper = new ObjectMapper();
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(errorDataResponse));
+
+		return fileData;
+	}
+
+	@Override
+	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
+			throws MalformedQueryParametersException, JsonProcessingException {
+
+		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+
+		if (StringUtils.isBlank(entityURI)) {
+			entityURI = OrganizationUtilityFunctions
+							.getStaffProvidedOrComputedHighestLevelOrganization(
+									log,
+									dataset,
+									vitroRequest);
+		}
+
+		VisConstants.DataVisMode currentDataVisMode = VisConstants.DataVisMode.CSV;
+
+		if (VisualizationFrameworkConstants.JSON_OUTPUT_FORMAT
+				.equalsIgnoreCase(vitroRequest.getParameter(
+						VisualizationFrameworkConstants.OUTPUT_FORMAT_KEY))) {
+			currentDataVisMode = VisConstants.DataVisMode.JSON;
+		}
+
+		Individual individual = vitroRequest.getWebappDaoFactory()
+				.getIndividualDao()
+				.getIndividualByURI(entityURI);
+
+		try {
+			if (individual != null && individual.isVClass("http://xmlns.com/foaf/0.1/Person")) {
+				return getSubjectPersonEntityAndGenerateDataResponse(
+						vitroRequest,
+						entityURI,
+						individual != null ? individual.getDataValue("http://www.w3.org/2000/01/rdf-schema#label") : "",
+						currentDataVisMode);
+			} else {
+				return getSubjectEntityAndGenerateDataResponse(
+						vitroRequest,
+						entityURI,
+						individual != null ? individual.getDataValue("http://www.w3.org/2000/01/rdf-schema#label") : "",
+						currentDataVisMode);
+			}
+		} finally {
+			VisualizationCaches.buildMissing();
+		}
+	}
+
+
+	@Override
+	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, Dataset dataset) throws MalformedQueryParametersException {
+		throw new UnsupportedOperationException("Map of Science Vis does not provide Ajax Response.");
+	}
+
+	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq, String entityURI)
+				throws MalformedQueryParametersException {
+
+        String standaloneTemplate = "mapOfScienceStandalone.ftl";
+
+        String entityLabel = UtilityFunctions.getIndividualLabelFromDAO(vreq, entityURI);
+
+        Map<String, Object> body = new HashMap<String, Object>();
+        body.put("title", entityLabel + " - Map of Science Visualization");
+        body.put("entityURI", entityURI);
+        body.put("entityLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
+        body.put("entityLabel", entityLabel);
+
+        if (UtilityFunctions.isEntityAPerson(vreq, entityURI)) {
+        	body.put("entityType", "PERSON");
+			if (preferCachesForPersonMap() && VisualizationCaches.personToPublication.isCached()) {
+				body.put("builtFromCacheTime", VisualizationCaches.personToPublication.cachedWhen());
+			}
+        } else {
+        	body.put("entityType", "ORGANIZATION");
+			if (VisualizationCaches.personToPublication.isCached()) {
+				body.put("builtFromCacheTime", VisualizationCaches.personToPublication.cachedWhen());
+			}
+        }
+
+
+        body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
+
+		ConfigurationProperties properties = ConfigurationProperties.getBean(vreq);
+		if (properties != null) {
+			String key = properties.getProperty("google.maps.key");
+			if (!StringUtils.isEmpty(key)) {
+				body.put("googleMapsKey", key);
+			}
+		}
+
+        return new TemplateResponseValues(standaloneTemplate, body);
+	}
+
+	private void updateEntityMapOfScienceInformation(MapOfScience entityJson, ScienceMappingResult result) {
+		int mappedPublicationCount = 0;
+		int publicationsWithInvalidJournalCount = 0;
+		Map<Integer, Float> subdisciplineToActivity = new HashMap<Integer, Float>();
+
+		if (result != null) {
+			subdisciplineToActivity = result.getMappedResult();
+			publicationsWithInvalidJournalCount = Math.round(result.getUnMappedPublications());
+			mappedPublicationCount = Math.round(result.getMappedPublications());
+		}
+
+		entityJson.setPubsMapped(mappedPublicationCount);
+		entityJson.setPubsWithInvalidJournals(publicationsWithInvalidJournalCount);
+		entityJson.setSubdisciplineActivity(subdisciplineToActivity);
+	}
+
+	private ScienceMappingResult getScienceMappingResult(
+			Map<String, Integer> journalToPublicationCount) {
+		ScienceMappingResult result = null;
+		try {
+			result = (new ScienceMapping()).generateScienceMappingResult(journalToPublicationCount);
+		} catch (NumberFormatException e) {
+			System.err.println("NumberFormatException coming from Map Of Science Vis");
+			e.printStackTrace();
+		} catch (IOException e) {
+			System.err.println("IOException coming from Map Of Science Vis");
+			e.printStackTrace();
+		}
+		return result;
+	}
+
+	private String getDisciplineToPublicationsCSVContent(ScienceMappingResult result) {
+		StringBuilder csvFileContent = new StringBuilder();
+
+		csvFileContent.append("Discipline, Publication Count, % Activity\n");
+
+		Map<Integer, Float> disciplineToPublicationCount = new HashMap<Integer, Float>();
+
+		Float totalMappedPublications = new Float(0);
+
+		if (result != null) {
+			for (Map.Entry<Integer, Float> currentMappedSubdiscipline : result.getMappedResult().entrySet()) {
+				float updatedPublicationCount = currentMappedSubdiscipline.getValue();
+
+				Integer lookedUpDisciplineID = MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_DISCIPLINE_ID
+													.get(currentMappedSubdiscipline.getKey());
+
+				if (disciplineToPublicationCount.containsKey(lookedUpDisciplineID)) {
+					updatedPublicationCount += disciplineToPublicationCount.get(lookedUpDisciplineID);
+				}
+
+				disciplineToPublicationCount.put(lookedUpDisciplineID, updatedPublicationCount);
+			}
+
+			totalMappedPublications = result.getMappedPublications();
+		}
+
+		DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
+
+		for (Map.Entry<Integer, Float> currentMappedDiscipline : disciplineToPublicationCount.entrySet()) {
+			csvFileContent.append(StringEscapeUtils.escapeCsv(MapOfScienceConstants.DISCIPLINE_ID_TO_LABEL.get(currentMappedDiscipline.getKey())));
+			csvFileContent.append(", ");
+			csvFileContent.append(percentageActivityFormat.format(currentMappedDiscipline.getValue()));
+			csvFileContent.append(", ");
+
+			if (totalMappedPublications > 0) {
+				csvFileContent.append(percentageActivityFormat.format(100 * currentMappedDiscipline.getValue() / totalMappedPublications));
+			} else {
+				csvFileContent.append("Not Available");
+			}
+
+			csvFileContent.append("\n");
+		}
+
+		for (Map.Entry<Integer, String> currentDiscipline : MapOfScienceConstants.DISCIPLINE_ID_TO_LABEL.entrySet()) {
+
+			Float currentDisciplineValue = disciplineToPublicationCount.get(currentDiscipline.getKey());
+			if (currentDisciplineValue == null) {
+				csvFileContent.append(StringEscapeUtils.escapeCsv(currentDiscipline.getValue()));
+				csvFileContent.append(", ");
+				csvFileContent.append(0);
+				csvFileContent.append(", ");
+				csvFileContent.append(0);
+				csvFileContent.append("\n");
+			}
+		}
+
+		return csvFileContent.toString();
+	}
+
+	private String getUnlocatedJournalsCSVContent(ScienceMappingResult result, int noJournalCount) {
+		StringBuilder csvFileContent = new StringBuilder();
+
+		csvFileContent.append("Publication Venue, Publication Count\n");
+
+		DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
+
+		if (noJournalCount > 0) {
+			csvFileContent.append(StringEscapeUtils.escapeCsv("No Publication Venue Given"));
+			csvFileContent.append(", ");
+			csvFileContent.append(percentageActivityFormat.format(noJournalCount));
+			csvFileContent.append("\n");
+		}
+
+		if (result != null) {
+			Map<String, Float> mappedResult = result.getUnmappedResult();
+
+			for (Map.Entry<String, Float> currentUnMappedJournal : mappedResult.entrySet()) {
+				csvFileContent.append(StringEscapeUtils.escapeCsv(currentUnMappedJournal.getKey()));
+				csvFileContent.append(", ");
+				csvFileContent.append(percentageActivityFormat.format(currentUnMappedJournal.getValue()));
+				csvFileContent.append("\n");
+			}
+		}
+
+		return csvFileContent.toString();
+	}
+
+	private String getSubDisciplineToPublicationsCSVContent(ScienceMappingResult result) {
+		StringBuilder csvFileContent = new StringBuilder();
+
+		csvFileContent.append("Sub-Discipline, Publication Count, % Activity\n");
+
+		Float totalMappedPublications = new Float(0);
+
+		if (result != null) {
+			DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
+
+			totalMappedPublications = result.getMappedPublications();
+			Map<Integer, Float> mappedResult = result.getMappedResult();
+
+			for (Map.Entry<Integer, Float> currentMappedSubdiscipline : mappedResult.entrySet()) {
+				csvFileContent.append(StringEscapeUtils.escapeCsv(MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_LABEL
+																	.get(currentMappedSubdiscipline.getKey())));
+				csvFileContent.append(", ");
+				csvFileContent.append(percentageActivityFormat.format(currentMappedSubdiscipline.getValue()));
+				csvFileContent.append(", ");
+
+				if (totalMappedPublications > 0) {
+					csvFileContent.append(percentageActivityFormat.format(100 * currentMappedSubdiscipline.getValue() / totalMappedPublications));
+				} else {
+					csvFileContent.append("Not Available");
+				}
+				csvFileContent.append("\n");
+			}
+
+			for (Map.Entry<Integer, String> currentSubdiscipline : MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_LABEL.entrySet()) {
+				Float currentMappedSubdisciplineValue = mappedResult.get(currentSubdiscipline.getKey());
+				if (currentMappedSubdisciplineValue == null) {
+					csvFileContent.append(StringEscapeUtils.escapeCsv(currentSubdiscipline.getValue()));
+					csvFileContent.append(", ");
+					csvFileContent.append(0);
+					csvFileContent.append(", ");
+					csvFileContent.append(0);
+					csvFileContent.append("\n");
+				}
+			}
+		}
+
+		return csvFileContent.toString();
+	}
+
+	@Override
+	public AuthorizationRequest getRequiredPrivileges() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	private static class JournalPublicationCounts {
+		Map<String, Integer> map = new HashMap<String, Integer>();
+		int noJournalCount = 0;
+		int total = 0;
+
+		void increment(String journalName) {
+			if (StringUtils.isEmpty(journalName)) {
+				noJournalCount++;
+			} else {
+				Integer count = map.get(journalName);
+				if (count == null) {
+					map.put(journalName, 1);
+				} else {
+					map.put(journalName, 1 + count.intValue());
+				}
+			}
+
+			total++;
+		}
+
+		boolean isEmpty() {
+			return total == 0;
+		}
+
+		long getTotal() {
+			return total;
+		}
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
index 1cd82b1881..9f2390f352 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
@@ -33,7 +33,7 @@ public class ModelConstructorRequestHandler implements
 		VisualizationRequestHandler {
 
     public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTION;
-    
+
 	@Override
 	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
 			Dataset dataSource) throws MalformedQueryParametersException, JsonProcessingException {
@@ -82,7 +82,7 @@ private ResponseValues renderRefreshCacheMarkup(VitroRequest vitroRequest,
 		return new TemplateResponseValues(standaloneTemplate, body);
 	}
 
-	private Map<String, String> regenerateConstructedModels(VitroRequest vitroRequest, 
+	private Map<String, String> regenerateConstructedModels(VitroRequest vitroRequest,
 															Dataset dataSource) throws JsonProcessingException {
 
 		VisualizationCaches.rebuildAll(vitroRequest.getRDFService());
@@ -90,17 +90,17 @@ private Map<String, String> regenerateConstructedModels(VitroRequest vitroReques
 		List<ConstructedModel> refreshedModels = new ArrayList<ConstructedModel>();
 
 		Set<String> currentModelIdentifiers = new HashSet<String>(ConstructedModelTracker.getAllModels().keySet());
-		
+
 		for (String currentIdentifier : currentModelIdentifiers) {
 			try {
 
 				ConstructedModel parseModelIdentifier = ConstructedModelTracker
 																.parseModelIdentifier(currentIdentifier);
 
-				ConstructedModelTracker.removeModel(parseModelIdentifier.getUri(), 
+				ConstructedModelTracker.removeModel(parseModelIdentifier.getUri(),
 													parseModelIdentifier.getType());
 
-				ModelConstructorUtilities.getOrConstructModel(parseModelIdentifier.getUri(), 
+				ModelConstructorUtilities.getOrConstructModel(parseModelIdentifier.getUri(),
 															  parseModelIdentifier.getType(), vitroRequest.getRDFService());
 				refreshedModels.add(parseModelIdentifier);
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java
index 760c3a22e0..2b48b1c4a8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java
@@ -1,32 +1,32 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
-import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.ModelFactoryInterface;
-
-@SuppressWarnings("deprecation,serial")
-public class ModelConstructorUtilities {
-
-	/**
-	 * @deprecated
-	 */
-	private static final Map<String, ModelFactoryInterface> modelTypeIdentifierToFactory = new HashMap<String, ModelFactoryInterface>() {{
-	}};
-
-	/**
-	 * @deprecated
-	 */
-	public static final Map<String, String> modelTypeToHumanReadableName = new HashMap<String, String>() {{
-	}};
-
-	public static Model getOrConstructModel(String uri, String modelType, RDFService rdfService)
-			throws MalformedQueryParametersException {
-		return modelTypeIdentifierToFactory.get(modelType).getOrCreateModel(uri, rdfService);
-	}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
+import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.ModelFactoryInterface;
+
+@SuppressWarnings("deprecation,serial")
+public class ModelConstructorUtilities {
+
+	/**
+	 * @deprecated
+	 */
+	private static final Map<String, ModelFactoryInterface> modelTypeIdentifierToFactory = new HashMap<String, ModelFactoryInterface>() {{
+	}};
+
+	/**
+	 * @deprecated
+	 */
+	public static final Map<String, String> modelTypeToHumanReadableName = new HashMap<String, String>() {{
+	}};
+
+	public static Model getOrConstructModel(String uri, String modelType, RDFService rdfService)
+			throws MalformedQueryParametersException {
+		return modelTypeIdentifierToFactory.get(modelType).getOrCreateModel(uri, rdfService);
+	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
index 42300bd419..c97762d031 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
@@ -17,29 +17,29 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor;
 
 public class PersonToGrantsModelConstructor implements ModelConstructor {
-	
+
 	protected static final Syntax SYNTAX = Syntax.syntaxARQ;
-	
+
 	private RDFService rdfService;
-	
-	public static final String MODEL_TYPE = "PERSON_TO_GRANTS"; 
+
+	public static final String MODEL_TYPE = "PERSON_TO_GRANTS";
 	public static final String MODEL_TYPE_HUMAN_READABLE = "Grants for specific person via all roles";
-	
+
 	private String personURI;
-	
+
 	private Log log = LogFactory.getLog(PersonToGrantsModelConstructor.class.getName());
-	
+
 	private long before, after;
-	
+
 	public PersonToGrantsModelConstructor(String personURI, RDFService rdfService) {
 		this.personURI = personURI;
 		this.rdfService = rdfService;
 	}
-	
+
 private Set<String> constructPersonGrantsQueryTemplate(String constructProperty, String roleType) {
-		
+
 		Set<String> differentPerspectiveQueries = new HashSet<String>();
-		
+
 		String justGrantsQuery = ""
 			+ " CONSTRUCT {  "
 			+ "     <" + personURI + "> vivosocnet:lastCachedAt ?now . "
@@ -84,7 +84,7 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
 			+ "      "
 			+ "     LET(?now := now()) "
 			+ " } ";
-		
+
 		String justDateTimeOnRolesQuery = ""
 			+ " CONSTRUCT {  "
 			+ "     <" + personURI + "> vivosocnet:lastCachedAt ?now . "
@@ -110,18 +110,18 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
 			+ "      "
 			+ "     LET(?now := now()) "
 			+ " } ";
-		
+
 		differentPerspectiveQueries.add(justGrantsQuery);
 		differentPerspectiveQueries.add(justDateTimeOnGrantsQuery);
 		differentPerspectiveQueries.add(justDateTimeOnRolesQuery);
-		
+
 		return differentPerspectiveQueries;
 	}
-	
+
 	private Set<String> constructPersonToGrantsQuery() {
 
 		Set<String> differentInvestigatorTypeQueries = new HashSet<String>();
-		
+
 		Set<String> investigatorRoleQuery = constructPersonGrantsQueryTemplate("hasGrantAsAnInvestigator", "InvestigatorRole");
 		Set<String> piRoleQuery = constructPersonGrantsQueryTemplate("hasGrantAsPI", "PrincipalInvestigatorRole");
 		Set<String> coPIRoleQuery = constructPersonGrantsQueryTemplate("hasGrantAsCoPI", "CoPrincipalInvestigatorRole");
@@ -129,16 +129,16 @@ private Set<String> constructPersonToGrantsQuery() {
 		differentInvestigatorTypeQueries.addAll(investigatorRoleQuery);
 		differentInvestigatorTypeQueries.addAll(piRoleQuery);
 		differentInvestigatorTypeQueries.addAll(coPIRoleQuery);
-		
+
 		return differentInvestigatorTypeQueries;
 	}
-	
+
 	private Model executeQuery(Set<String> constructQueries) {
 		Model constructedModel = ModelFactory.createDefaultModel();
 
 		before = System.currentTimeMillis();
 		log.debug("CONSTRUCT query string : " + constructQueries);
-		
+
 		for (String currentQuery : constructQueries) {
 			try {
 				rdfService.sparqlConstructQuery(QueryConstants.getSparqlPrefixQuery() + currentQuery, constructedModel);
@@ -149,14 +149,14 @@ private Model executeQuery(Set<String> constructQueries) {
 			}
 
 		}
-		
+
 		after = System.currentTimeMillis();
 		log.debug("Time taken to execute the CONSTRUCT queries is in milliseconds: "
 				+ (after - before));
-		
+
 		return constructedModel;
-	}	
-	
+	}
+
 	public Model getConstructedModel() throws MalformedQueryParametersException {
 		return executeQuery(constructPersonToGrantsQuery());
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java
index bb9f8adb3d..b205712df9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java
@@ -7,6 +7,6 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
 
 public interface ModelFactoryInterface {
-	
+
 	public Model getOrCreateModel(String uri, RDFService rdfService) throws MalformedQueryParametersException;
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java
index cf5b012c54..ffd76d753e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java
@@ -31,7 +31,7 @@
 /**
  * This query runner is used to execute a sparql query that will fetch all the publications
  * defined by bibo:Document property for a particular individual.
- * 
+ *
  * @author cdtank
  */
 public class PersonGrantCountQueryRunner implements QueryRunner<Set<Activity>> {
@@ -107,7 +107,7 @@ private String getSparqlQuery(String queryURI) {
 							+ "} GROUP BY ?grant\n";
 
 		log.debug(sparqlQuery);
-		
+
 		return sparqlQuery;
 	}
 
@@ -127,7 +127,7 @@ public Set<Activity> getQueryResult()
                 throw new MalformedQueryParametersException(
                 		"URI provided for an individual is malformed.");
             }
-        	
+
         } else {
         	throw new MalformedQueryParametersException("URL parameter is either null or empty.");
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
index d2eda2e040..4e64ce4d2e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
@@ -28,22 +28,22 @@
 
 
 /**
- * 
+ *
  * This request handler is used to serve the content related to an individual's
  * grants over the years like,
  * 		1. Sparkline representing this
  * 		2. An entire page dedicated to the sparkline vis which will also have links to
  * download the data using which the sparkline was rendered & its tabular representation etc.
  * 		3. Downloadable CSV file containing number of grants over the years.
- * 		4. Downloadable PDf file containing the grant content, among other things. 
- * Currently this is disabled because the feature is half-baked. We plan to activate this in 
- * the next major release.  
- * 
+ * 		4. Downloadable PDf file containing the grant content, among other things.
+ * Currently this is disabled because the feature is half-baked. We plan to activate this in
+ * the next major release.
+ *
  * @author bkoniden
  * Deepak Konidena
  */
 public class PersonGrantCountRequestHandler implements VisualizationRequestHandler {
-	
+
 	@Override
 	public Map<String, String> generateDataVisualization(
 			VitroRequest vitroRequest, Log log, Dataset dataset)
@@ -51,11 +51,11 @@ public Map<String, String> generateDataVisualization(
 
 		String personURI = vitroRequest
 				.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-		
+
 		SubEntity person = new SubEntity(
 									personURI,
 									UtilityFunctions.getIndividualLabelFromDAO(vitroRequest, personURI));
-		
+
 		QueryRunner<Set<Activity>> queryManager = new PersonGrantCountQueryRunner(
 				personURI,
 				vitroRequest.getRDFService(),
@@ -69,18 +69,18 @@ public Map<String, String> generateDataVisualization(
 		 */
 		Map<String, Integer> yearToGrantCount =
 				UtilityFunctions.getYearToActivityCount(authorGrants);
-	
+
     	return prepareDataResponse(person,
 				yearToGrantCount);
 
-	
+
 	}
-	
+
 	@Override
 	public ResponseValues generateVisualizationForShortURLRequests(
 			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
 			Dataset dataSource) throws MalformedQueryParametersException {
-		throw new UnsupportedOperationException("Person Grant Count Visualization does not provide " 
+		throw new UnsupportedOperationException("Person Grant Count Visualization does not provide "
 					+ "Short URL Response.");
 	}
 
@@ -93,7 +93,7 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
 
 		String visMode = vitroRequest
 				.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY);
-		
+
 		String visContainer = vitroRequest
 				.getParameter(VisualizationFrameworkConstants.VIS_CONTAINER_KEY);
 
@@ -113,11 +113,11 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
 
 
 		boolean shouldVIVOrenderVis = (yearToGrantCount.size() > 0);
-			
+
 			/*
 	    	 * Computations required to generate HTML for the sparkline & related context.
 	    	 * */
-	    	PersonGrantCountVisCodeGenerator visualizationCodeGenerator = 
+	    	PersonGrantCountVisCodeGenerator visualizationCodeGenerator =
 	    		new PersonGrantCountVisCodeGenerator(personURI,
 	    									   visMode,
 	    									   visContainer,
@@ -127,19 +127,19 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
 
 	    	SparklineData sparklineData = visualizationCodeGenerator
 			.getValueObjectContainer();
-	    	
-	    	return prepareDynamicResponse(vitroRequest, 
-			   		  sparklineData, 
+
+	    	return prepareDynamicResponse(vitroRequest,
+			   		  sparklineData,
 			   		shouldVIVOrenderVis);
 
-		
+
 	}
-	
+
 	@Override
 	public ResponseValues generateStandardVisualization(
 			VitroRequest vitroRequest, Log log, Dataset dataset)
 			throws MalformedQueryParametersException {
-		
+
 		String personURI = vitroRequest
 				.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
 
@@ -162,28 +162,28 @@ public ResponseValues generateStandardVisualization(
 		 */
 		Map<String, Integer> yearToGrantCount =
 				UtilityFunctions.getYearToActivityCount(authorGrants);
-	
+
     	/*
     	 * Computations required to generate HTML for the sparkline & related context.
     	 * */
-    	PersonGrantCountVisCodeGenerator visualizationCodeGenerator = 
+    	PersonGrantCountVisCodeGenerator visualizationCodeGenerator =
     		new PersonGrantCountVisCodeGenerator(personURI,
     									   visMode,
     									   visContainer,
     									   yearToGrantCount,
     									   log);
-    	
+
     	SparklineData sparklineData = visualizationCodeGenerator
 											.getValueObjectContainer();
-    	
-			return prepareStandaloneResponse(vitroRequest, 
+
+			return prepareStandaloneResponse(vitroRequest,
     							  sparklineData);
 	}
-	
+
 	private String getGrantsOverTimeCSVContent(Map<String, Integer> yearToGrantCount) {
-		
+
 		StringBuilder csvFileContent = new StringBuilder();
-		
+
 		csvFileContent.append("Year, Grants\n");
 
 		for (Entry<String, Integer> currentEntry : yearToGrantCount.entrySet()) {
@@ -195,7 +195,7 @@ private String getGrantsOverTimeCSVContent(Map<String, Integer> yearToGrantCount
 
 		return csvFileContent.toString();
 	}
-	
+
 	/**
 	 * Provides response when csv file containing the grant count over the years
 	 * is requested.
@@ -205,23 +205,23 @@ private String getGrantsOverTimeCSVContent(Map<String, Integer> yearToGrantCount
 	private Map<String, String> prepareDataResponse(
 						SubEntity investigator,
 						Map<String, Integer> yearToGrantCount) {
-		
+
 		String piName = investigator.getIndividualLabel();
-		
-		String outputFileName = UtilityFunctions.slugify(piName) 
+
+		String outputFileName = UtilityFunctions.slugify(piName)
 										+ "_grants-per-year" + ".csv";
 
 		Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, 
+		fileData.put(DataVisualizationController.FILE_NAME_KEY,
 					 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
 					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
 					getGrantsOverTimeCSVContent(yearToGrantCount));
 
 		return fileData;
 	}
-	
+
 	/**
 	 * Provides response when an entire page dedicated to grant sparkline is requested.
 	 * @param vreq Vitro Request
@@ -229,7 +229,7 @@ private Map<String, String> prepareDataResponse(
 	 */
 	private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
 			SparklineData valueObjectContainer) {
-        
+
         String standaloneTemplate = "personGrantCountStandaloneActivator.ftl";
 
         Map<String, Object> body = new HashMap<String, Object>();
@@ -237,11 +237,11 @@ private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
         body.put("sparklineVO", valueObjectContainer);
 
         return new TemplateResponseValues(standaloneTemplate, body);
-        
+
 	}
-	
+
 	/**
-	 * Provides response when the grant sparkline has to be rendered in already existing 
+	 * Provides response when the grant sparkline has to be rendered in already existing
 	 * page, e.g. profile page.
 	 * @param vreq Vitro Request
 	 * @param valueObjectContainer Sparkline data
@@ -249,7 +249,7 @@ private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
 	 */
 	private TemplateResponseValues prepareDynamicResponse(
 			VitroRequest vreq,
-			SparklineData valueObjectContainer, 
+			SparklineData valueObjectContainer,
 			boolean shouldVIVOrenderVis) {
 
         String dynamicTemplate = "personGrantCountDynamicActivator.ftl";
@@ -257,9 +257,9 @@ private TemplateResponseValues prepareDynamicResponse(
         Map<String, Object> body = new HashMap<String, Object>();
         body.put("sparklineVO", valueObjectContainer);
         body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);
-        
+
         return new TemplateResponseValues(dynamicTemplate, body);
-        
+
 	}
 
 	@Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java
index 95f16033d1..e6bee35b50 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java
@@ -22,19 +22,19 @@
 
 
 public class PersonGrantCountVisCodeGenerator {
-	
+
 	/*
 	 * There are 2 modes of sparkline that are available via this visualization.
 	 * 		1. Short Sparkline - This sparkline will render all the data points (or sparks),
 	 * 			which in this case are the grants over the years, from the last 10 years.
-	 * 
-	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks) 
+	 *
+	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks)
 	 * 			spanning the career of the person & last 10 years at the minimum, in case if
 	 * 			the person started his career in the last 10 yeras.
 	 * */
-	
+
 	private static final String DEFAULT_VIS_CONTAINER_DIV_ID = "grant_count_vis_container";
-	
+
 	private Map<String, Integer> yearToGrantCount;
 
 	private Log log;
@@ -42,7 +42,7 @@ public class PersonGrantCountVisCodeGenerator {
 	private SparklineData sparklineParameterVO;
 
 	private String individualURI;
-	
+
 	public PersonGrantCountVisCodeGenerator(String individualURIParam,
 			String visMode, String visContainer, Map<String, Integer> yearToGrantCount,
 			Log log) {
@@ -50,13 +50,13 @@ public PersonGrantCountVisCodeGenerator(String individualURIParam,
 		this.individualURI = individualURIParam;
 
 		this.yearToGrantCount = yearToGrantCount;
-		
+
 		this.log = log;
-		
+
 		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
 
 	}
-	
+
 	/**
 	 * This method is used to setup parameters for the sparkline value object. These parameters
 	 * will be used in the template to construct the actual html/javascript code.
@@ -65,16 +65,16 @@ public PersonGrantCountVisCodeGenerator(String individualURIParam,
 	 */
 	private SparklineData setupSparklineParameters(String visMode,
 			  							  String providedVisContainerID) {
-		
+
 		SparklineData sparklineData = new SparklineData();
 		sparklineData.setYearToActivityCount(yearToGrantCount);
-		
+
 		int numOfYearsToBeRendered = 0;
-		
+
 		/*
-		 * It was decided that to prevent downward curve that happens if there are no publications 
+		 * It was decided that to prevent downward curve that happens if there are no publications
 		 * in the current year seems a bit harsh, so we consider only publications from the last 10
-		 * complete years. 
+		 * complete years.
 		 * */
 		int currentYear = Calendar.getInstance().get(Calendar.YEAR) - 1;
 		int shortSparkMinYear = currentYear
@@ -137,7 +137,7 @@ private SparklineData setupSparklineParameters(String visMode,
 		 */
 		int renderedFullSparks = 0;
 
-		List<YearToEntityCountDataElement> yearToGrantCountDataTable = 
+		List<YearToEntityCountDataElement> yearToGrantCountDataTable =
 					new ArrayList<YearToEntityCountDataElement>();
 
 		for (int grantYear = minGrantYearConsidered; grantYear <= currentYear; grantYear++) {
@@ -211,12 +211,12 @@ private SparklineData setupSparklineParameters(String visMode,
 		}
 
 		if (yearToGrantCount.size() > 0) {
-			
+
 			sparklineData.setFullTimelineNetworkLink(
 					UtilityFunctions.getCollaboratorshipNetworkLink(individualURI,
 						VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
 						VisualizationFrameworkConstants.COPI_VIS_MODE));
-			
+
 			sparklineData.setDownloadDataLink(
 					UtilityFunctions.getCSVDownloadURL(
 							individualURI,
@@ -225,7 +225,7 @@ private SparklineData setupSparklineParameters(String visMode,
 		}
 		return sparklineData;
 	}
-	
+
 	public SparklineData getValueObjectContainer() {
 		return this.sparklineParameterVO;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
index d9d3920109..e2ae7a2278 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
@@ -38,16 +38,16 @@
  * 		2. Downloadable file having the co-author network in graphml format.
  * 		3. Downloadable file having the list of co-authors that the individual has
  * worked with & count of such co-authorships.
- * 
+ *
  * @author cdtank
  */
 public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 
     private static final String EGO_PUB_SPARKLINE_VIS_CONTAINER_ID = "ego_pub_sparkline";
-    private static final String UNIQUE_COAUTHORS_SPARKLINE_VIS_CONTAINER_ID = 
+    private static final String UNIQUE_COAUTHORS_SPARKLINE_VIS_CONTAINER_ID =
     									"unique_coauthors_sparkline";
     private static final String EGO_GRANT_SPARKLINE_VIS_CONTAINER_ID = "ego_grant_sparkline";
-    private static final String UNIQUE_COPIS_SPARKLINE_VIS_CONTAINER_ID = 
+    private static final String UNIQUE_COPIS_SPARKLINE_VIS_CONTAINER_ID =
     									"unique_copis_sparkline";
 
 	@Override
@@ -62,13 +62,13 @@ public Map<String, String> generateDataVisualization(
 			throws MalformedQueryParametersException {
 		throw new UnsupportedOperationException("Person Level does not provide Data Response.");
 	}
-    
-	
+
+
 	@Override
 	public ResponseValues generateStandardVisualization(
 			VitroRequest vitroRequest, Log log, Dataset dataset)
 			throws MalformedQueryParametersException {
-		
+
         String egoURI = vitroRequest.getParameter(
         							VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
 
@@ -113,7 +113,7 @@ public ResponseValues generateVisualizationForShortURLRequests(
 	private ResponseValues generateStandardVisualizationForPersonLevelVis(
 			VitroRequest vitroRequest, Log log, Dataset dataset, String egoURI,
 			String visMode) throws MalformedQueryParametersException {
-		
+
 		if (VisualizationFrameworkConstants.COPI_VIS_MODE.equalsIgnoreCase(visMode)) {
 			CoPIGrantCountQueryRunner coPIQueryManager = new CoPIGrantCountQueryRunner(egoURI, vitroRequest, log);
 
@@ -125,43 +125,43 @@ private ResponseValues generateStandardVisualizationForPersonLevelVis(
         	 * Create a map from the year to number of grants. Use the Grant's
         	 * parsedGrantYear to populate the data.
         	 * */
-        	Map<String, Integer> yearToGrantCount = 
+        	Map<String, Integer> yearToGrantCount =
     			UtilityFunctions.getYearToActivityCount(grantsToURI.values());
-        	
-	    	
-	    	PersonGrantCountVisCodeGenerator personGrantCountVisCodeGenerator = 
+
+
+	    	PersonGrantCountVisCodeGenerator personGrantCountVisCodeGenerator =
 	    		new PersonGrantCountVisCodeGenerator(
 	    			egoURI,
 	    			VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
 	    			EGO_GRANT_SPARKLINE_VIS_CONTAINER_ID,
 	    			yearToGrantCount,
 	    			log);
-	    	
+
 	    	SparklineData grantSparklineVO = personGrantCountVisCodeGenerator.getValueObjectContainer();
-	    	
-	    	
+
+
 	    	/*
 	    	 * Co-PI's over time sparkline
 	    	 */
-	    	CoPIVisCodeGenerator uniqueCopisVisCodeGenerator = 
+	    	CoPIVisCodeGenerator uniqueCopisVisCodeGenerator =
 	    		new CoPIVisCodeGenerator(
 	    			egoURI,
 	    			VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
 	    			UNIQUE_COPIS_SPARKLINE_VIS_CONTAINER_ID,
 	    			UtilityFunctions.getActivityYearToCollaborators(coPIData),
 	    			log);
-	    	
+
 	    	SparklineData uniqueCopisSparklineVO = uniqueCopisVisCodeGenerator.getValueObjectContainer();
 
 	    	return prepareCoPIStandaloneResponse(
-					egoURI, 
+					egoURI,
 					grantSparklineVO,
 					uniqueCopisSparklineVO,
 					coPIData,
 	    			vitroRequest);
-	    	
+
         } else {
-        	
+
         	CoAuthorshipQueryRunner coAuthorshipQueryManager =
         			new CoAuthorshipQueryRunner(egoURI, vitroRequest, log);
 
@@ -178,30 +178,30 @@ private ResponseValues generateStandardVisualizationForPersonLevelVis(
 	    	/*
 	    	 * Computations required to generate HTML for the sparklines & related context.
 	    	 * */
-	    	PersonPublicationCountVisCodeGenerator personPubCountVisCodeGenerator = 
+	    	PersonPublicationCountVisCodeGenerator personPubCountVisCodeGenerator =
 	    		new PersonPublicationCountVisCodeGenerator(
 	    			egoURI,
 	    			VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
 	    			EGO_PUB_SPARKLINE_VIS_CONTAINER_ID,
 	    			yearToPublicationCount,
-	    			log);	  
-	    	
+	    			log);
+
 	    	SparklineData publicationSparklineVO = personPubCountVisCodeGenerator
 	    														.getValueObjectContainer();
-	    	
-            CoAuthorshipVisCodeGenerator uniqueCoauthorsVisCodeGenerator = 
+
+            CoAuthorshipVisCodeGenerator uniqueCoauthorsVisCodeGenerator =
 	    		new CoAuthorshipVisCodeGenerator(
 	    			egoURI,
 	    			VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
 	    			UNIQUE_COAUTHORS_SPARKLINE_VIS_CONTAINER_ID,
 	    			UtilityFunctions.getActivityYearToCollaborators(coAuthorshipData),
 	    			log);
-	    	
+
 	    	SparklineData uniqueCoauthorsSparklineVO = uniqueCoauthorsVisCodeGenerator
 	    															.getValueObjectContainer();
-	    	
+
 	    	return prepareCoAuthorStandaloneResponse(
-					egoURI, 
+					egoURI,
 	    			publicationSparklineVO,
 	    			uniqueCoauthorsSparklineVO,
 	    			coAuthorshipData,
@@ -209,36 +209,36 @@ private ResponseValues generateStandardVisualizationForPersonLevelVis(
 
         }
 	}
-	
+
 	private TemplateResponseValues prepareCoAuthorStandaloneResponse(
-					String egoURI, 
-					SparklineData egoPubSparklineVO, 
-					SparklineData uniqueCoauthorsSparklineVO, 
-					CollaborationData coAuthorshipVO, 
+					String egoURI,
+					SparklineData egoPubSparklineVO,
+					SparklineData uniqueCoauthorsSparklineVO,
+					CollaborationData coAuthorshipVO,
 					VitroRequest vitroRequest) {
-		
+
 		Map<String, Object> body = new HashMap<String, Object>();
-		
+
         String	standaloneTemplate = "coAuthorPersonLevelD3.ftl";
 		body.put("coAuthorshipData", new CollaborationDataViewHelper(coAuthorshipVO));
 
 		body.put("egoURIParam", egoURI);
-        
+
         body.put("egoLocalName", UtilityFunctions.getIndividualLocalName(egoURI, vitroRequest));
-        
+
         String title = "";
-        
-        if (coAuthorshipVO.getCollaborators() != null 
+
+        if (coAuthorshipVO.getCollaborators() != null
         			&& coAuthorshipVO.getCollaborators().size() > 0) {
         	body.put("numOfAuthors", coAuthorshipVO.getCollaborators().size());
         	title = coAuthorshipVO.getEgoCollaborator().getCollaboratorName() + " - ";
 		}
-		
-		if (coAuthorshipVO.getCollaborations() != null 
+
+		if (coAuthorshipVO.getCollaborations() != null
 					&& coAuthorshipVO.getCollaborations().size() > 0) {
 			body.put("numOfCoAuthorShips", coAuthorshipVO.getCollaborations().size());
 		}
-		
+
 		body.put("egoPubSparklineVO", egoPubSparklineVO);
 		body.put("uniqueCoauthorsSparklineVO", uniqueCoauthorsSparklineVO);
 
@@ -249,43 +249,43 @@ private TemplateResponseValues prepareCoAuthorStandaloneResponse(
 		body.put("title",  title + "Person Level Visualization");
 
 		return new TemplateResponseValues(standaloneTemplate, body);
-		
+
 	}
-	
+
 	private TemplateResponseValues prepareCoPIStandaloneResponse(
-					String egoURI, 
-					SparklineData egoGrantSparklineVO, 
-					SparklineData uniqueCopisSparklineVO, 
-					CollaborationData coPIVO, 
+					String egoURI,
+					SparklineData egoGrantSparklineVO,
+					SparklineData uniqueCopisSparklineVO,
+					CollaborationData coPIVO,
 					VitroRequest vitroRequest) {
-		
+
 		Map<String, Object> body = new HashMap<String, Object>();
-        
+
         body.put("egoURIParam", egoURI);
-        
+
         body.put("egoLocalName", UtilityFunctions.getIndividualLocalName(egoURI, vitroRequest));
-        
+
         String title = "";
-        
+
         if (coPIVO.getCollaborators() != null && coPIVO.getCollaborators().size() > 0) {
         	body.put("numOfInvestigators", coPIVO.getCollaborators().size());
         	title = coPIVO.getEgoCollaborator().getCollaboratorName() + " - ";
 		}
-		
+
 		if (coPIVO.getCollaborations() != null && coPIVO.getCollaborations().size() > 0) {
 			body.put("numOfCoInvestigations", coPIVO.getCollaborations().size());
 		}
-		
+
         String	standaloneTemplate = "coPIPersonLevelD3.ftl";
 		body.put("coInvestigatorData", new CollaborationDataViewHelper(coPIVO));
 
 		body.put("egoGrantSparklineVO", egoGrantSparklineVO);
-		body.put("uniqueCoInvestigatorsSparklineVO", uniqueCopisSparklineVO);        	
+		body.put("uniqueCoInvestigatorsSparklineVO", uniqueCopisSparklineVO);
 
 		body.put("title",  title + "Person Level Visualization");
 
 		return new TemplateResponseValues(standaloneTemplate, body);
-		
+
 	}
 
 	@Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java
index e0409cd2d8..984ec6aa56 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java
@@ -37,7 +37,7 @@
 /**
  * This query runner is used to execute a sparql query that will fetch all the publications
  * defined by bibo:Document property for a particular individual.
- * 
+ *
  * @author cdtank
  */
 public class PersonPublicationCountQueryRunner implements QueryRunner<Set<Activity>> {
@@ -111,7 +111,7 @@ private String getSparqlQuery(String queryURI) {
 							+ "}\n";
 
 		log.debug(sparqlQuery);
-		
+
 		return sparqlQuery;
 	}
 
@@ -131,7 +131,7 @@ public Set<Activity> getQueryResult()
                 throw new MalformedQueryParametersException(
                 		"URI provided for an individual is malformed.");
             }
-        	
+
         } else {
         	throw new MalformedQueryParametersException("URL parameter is either null or empty.");
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
index c2cd583e3f..18932360bb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
@@ -1,295 +1,295 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-
-import org.apache.jena.query.Dataset;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
-
-/**
- * 
- * This request handler is used to serve the content related to an individual's
- * publications over the years like, 1. Sprakline representing this 2. An entire
- * page dedicated to the sparkline vis which will also have links to download
- * the data using which the sparkline was rendered & its tabular representation
- * etc. 3. Downloadable CSV file containing number of publications over the
- * years. 4. Downloadable PDf file containing the publications content, among
- * other things. Currently this is disabled because the feature is half-baked.
- * We plan to activate this in the next major release.
- * 
- * @author cdtank
- */
-public class PersonPublicationCountRequestHandler implements
-VisualizationRequestHandler {
-
-	@Override
-	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
-			Dataset dataset) throws MalformedQueryParametersException {
-
-		String personURI = vitroRequest
-								.getParameter(
-										VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-
-		String visMode = vitroRequest
-								.getParameter(
-										VisualizationFrameworkConstants.VIS_MODE_KEY);
-
-		String visContainer = vitroRequest
-								.getParameter(
-										VisualizationFrameworkConstants.VIS_CONTAINER_KEY);
-
-        /* tlw72 -- Added in 1.6 for multi-view support. There are now two different "sparkline" templates     */
-        /* and the one that gets loaded depends on which foaf person template is being used by the app. The    */
-        /* personPublicationCountDynamicActivator.ftl template needs to know which is the requesting template. */
-        String requestingTemplate = vitroRequest
-            					.getParameter(
-										VisualizationFrameworkConstants.REQUESTING_TEMPLATE_KEY);  
-
-		QueryRunner<Set<Activity>> queryManager = new PersonPublicationCountQueryRunner(
-															personURI,
-															vitroRequest.getRDFService(),
-															log);
-
-		Set<Activity> authorDocuments = queryManager.getQueryResult();
-
-		/*
-		 * Create a map from the year to number of publications. Use the
-		 * BiboDocument's parsedPublicationYear to populate the data.
-		 */
-		Map<String, Integer> yearToPublicationCount = 
-				UtilityFunctions.getYearToActivityCount(authorDocuments);
-
-		boolean shouldVIVOrenderVis = false;
-
-		if (yearToPublicationCount.containsKey("Unknown")) {
-			if (yearToPublicationCount.size() > 1) {
-				shouldVIVOrenderVis = true;
-			}
-		} else {
-			if (yearToPublicationCount.size() > 0) {
-				shouldVIVOrenderVis = true;
-			}
-		}
-
-		/*
-		 * Computations required to generate HTML for the sparkline & related
-		 * context.
-		 */
-		PersonPublicationCountVisCodeGenerator visualizationCodeGenerator = 
-				new PersonPublicationCountVisCodeGenerator(
-						personURI, 
-						visMode, 
-						visContainer, 
-						yearToPublicationCount,
-						log);
-
-		SparklineData sparklineData = visualizationCodeGenerator.getValueObjectContainer();
-
-		return prepareDynamicResponse(vitroRequest, sparklineData,
-				shouldVIVOrenderVis, requestingTemplate);
-
-	}
-	
-	@Override
-	public ResponseValues generateVisualizationForShortURLRequests(
-			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
-			Dataset dataSource) throws MalformedQueryParametersException {
-		throw new UnsupportedOperationException("Person Publication Count Visualization does not provide " 
-					+ "Short URL Response.");
-	}
-
-	@Override
-	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log,
-			Dataset dataset) throws MalformedQueryParametersException {
-
-		String personURI = vitroRequest
-		.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-
-		QueryRunner<Set<Activity>> queryManager = new PersonPublicationCountQueryRunner(
-																personURI,
-																vitroRequest.getRDFService(),
-																log);
-
-		Set<Activity> authorDocuments = queryManager.getQueryResult();
-
-		/*
-		 * Create a map from the year to number of publications. Use the
-		 * BiboDocument's parsedPublicationYear to populate the data.
-		 */
-		Map<String, Integer> yearToPublicationCount = 
-				UtilityFunctions.getYearToActivityCount(authorDocuments);
-
-		String authorName = ((PersonPublicationCountQueryRunner) queryManager).getAuthorName();
-
-
-		return prepareDataResponse(authorName,
-								   yearToPublicationCount);
-
-	}
-
-	@Override
-	public ResponseValues generateStandardVisualization(
-			VitroRequest vitroRequest, Log log, Dataset dataset)
-		throws MalformedQueryParametersException {
-
-		String personURI = vitroRequest.getParameter(
-									VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-
-		String visMode = vitroRequest.getParameter(
-									VisualizationFrameworkConstants.VIS_MODE_KEY);
-
-		String visContainer = vitroRequest.getParameter(
-									VisualizationFrameworkConstants.VIS_CONTAINER_KEY);
-
-		QueryRunner<Set<Activity>> queryManager = new PersonPublicationCountQueryRunner(
-																personURI,
-																vitroRequest.getRDFService(),
-																log);
-
-		Set<Activity> authorDocuments = queryManager.getQueryResult();
-
-		/*
-		 * Create a map from the year to number of publications. Use the
-		 * BiboDocument's parsedPublicationYear to populate the data.
-		 */
-		Map<String, Integer> yearToPublicationCount = 
-				UtilityFunctions.getYearToActivityCount(authorDocuments);
-
-		/*
-		 * Computations required to generate HTML for the sparkline & related
-		 * context.
-		 */
-		PersonPublicationCountVisCodeGenerator visualizationCodeGenerator = 
-				new PersonPublicationCountVisCodeGenerator(
-						personURI, 
-						visMode, 
-						visContainer, 
-						yearToPublicationCount,
-						log);
-
-		SparklineData sparklineData = 
-				visualizationCodeGenerator.getValueObjectContainer();
-
-		return prepareStandaloneResponse(vitroRequest, sparklineData);
-	}
-
-	private String getPublicationsOverTimeCSVContent(
-			Map<String, Integer> yearToPublicationCount) {
-
-		StringBuilder csvFileContent = new StringBuilder();
-
-		csvFileContent.append("Year, Publications\n");
-
-		for (Entry<String, Integer> currentEntry : yearToPublicationCount
-				.entrySet()) {
-			csvFileContent.append(StringEscapeUtils.escapeCsv(currentEntry
-					.getKey()));
-			csvFileContent.append(",");
-			csvFileContent.append(currentEntry.getValue());
-			csvFileContent.append("\n");
-		}
-
-		return csvFileContent.toString();
-	}
-
-	/**
-	 * Provides response when csv file containing the publication count over the
-	 * years is requested.
-	 * 
-	 * @param authorName Name of author
-	 * @param yearToPublicationCount Year / publication counts
-	 */
-	private Map<String, String> prepareDataResponse(String authorName,
-			Map<String, Integer> yearToPublicationCount) {
-
-		/*
-		 * To make sure that null/empty records for author names do not cause
-		 * any mischief.
-		 */
-		if (StringUtils.isBlank(authorName)) {
-			authorName = "no-author";
-		}
-
-		String outputFileName = UtilityFunctions.slugify(authorName)
-									+ "_publications-per-year" + ".csv";
-
-		Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, 
-					 outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
-					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
-					 getPublicationsOverTimeCSVContent(yearToPublicationCount));
-
-		return fileData;
-	}
-
-	/**
-	 * Provides response when an entire page dedicated to publication sparkline
-	 * is requested.
-	 * 
-	 * @param vreq Vitro Request
-	 * @param valueObjectContainer Sparkline Data
-	 */
-	private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
-			SparklineData valueObjectContainer) {
-
-		String standaloneTemplate = "personPublicationCountStandaloneActivator.ftl";
-
-		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("title", "Individual Publication Count visualization");
-		body.put("sparklineVO", valueObjectContainer);
-
-		return new TemplateResponseValues(standaloneTemplate, body);
-
-	}
-
-	/**
-	 * Provides response when the publication sparkline has to be rendered in
-	 * already existing page, e.g. profile page.
-	 * 
-	 * @param vreq Vitro Request
-	 * @param valueObjectContainer Sparkline data
-	 * @param shouldVIVOrenderVis Flag to render visualization
-	 * @param requestingTemplate Requesting template name
-	 */
-	private TemplateResponseValues prepareDynamicResponse(VitroRequest vreq,
-			SparklineData valueObjectContainer, boolean shouldVIVOrenderVis, String requestingTemplate) {
-
-		String dynamicTemplate = "personPublicationCountDynamicActivator.ftl";
-
-		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("sparklineVO", valueObjectContainer);
-		body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);
-		body.put("requestingTemplate", requestingTemplate); /* tlw72 -- Added in 1.6 for multi-view support.*/
-
-		return new TemplateResponseValues(dynamicTemplate, body);
-
-	}
-
-	@Override
-	public AuthorizationRequest getRequiredPrivileges() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+
+import org.apache.jena.query.Dataset;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
+
+/**
+ *
+ * This request handler is used to serve the content related to an individual's
+ * publications over the years like, 1. Sprakline representing this 2. An entire
+ * page dedicated to the sparkline vis which will also have links to download
+ * the data using which the sparkline was rendered & its tabular representation
+ * etc. 3. Downloadable CSV file containing number of publications over the
+ * years. 4. Downloadable PDf file containing the publications content, among
+ * other things. Currently this is disabled because the feature is half-baked.
+ * We plan to activate this in the next major release.
+ *
+ * @author cdtank
+ */
+public class PersonPublicationCountRequestHandler implements
+VisualizationRequestHandler {
+
+	@Override
+	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,
+			Dataset dataset) throws MalformedQueryParametersException {
+
+		String personURI = vitroRequest
+								.getParameter(
+										VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+
+		String visMode = vitroRequest
+								.getParameter(
+										VisualizationFrameworkConstants.VIS_MODE_KEY);
+
+		String visContainer = vitroRequest
+								.getParameter(
+										VisualizationFrameworkConstants.VIS_CONTAINER_KEY);
+
+        /* tlw72 -- Added in 1.6 for multi-view support. There are now two different "sparkline" templates     */
+        /* and the one that gets loaded depends on which foaf person template is being used by the app. The    */
+        /* personPublicationCountDynamicActivator.ftl template needs to know which is the requesting template. */
+        String requestingTemplate = vitroRequest
+            					.getParameter(
+										VisualizationFrameworkConstants.REQUESTING_TEMPLATE_KEY);
+
+		QueryRunner<Set<Activity>> queryManager = new PersonPublicationCountQueryRunner(
+															personURI,
+															vitroRequest.getRDFService(),
+															log);
+
+		Set<Activity> authorDocuments = queryManager.getQueryResult();
+
+		/*
+		 * Create a map from the year to number of publications. Use the
+		 * BiboDocument's parsedPublicationYear to populate the data.
+		 */
+		Map<String, Integer> yearToPublicationCount =
+				UtilityFunctions.getYearToActivityCount(authorDocuments);
+
+		boolean shouldVIVOrenderVis = false;
+
+		if (yearToPublicationCount.containsKey("Unknown")) {
+			if (yearToPublicationCount.size() > 1) {
+				shouldVIVOrenderVis = true;
+			}
+		} else {
+			if (yearToPublicationCount.size() > 0) {
+				shouldVIVOrenderVis = true;
+			}
+		}
+
+		/*
+		 * Computations required to generate HTML for the sparkline & related
+		 * context.
+		 */
+		PersonPublicationCountVisCodeGenerator visualizationCodeGenerator =
+				new PersonPublicationCountVisCodeGenerator(
+						personURI,
+						visMode,
+						visContainer,
+						yearToPublicationCount,
+						log);
+
+		SparklineData sparklineData = visualizationCodeGenerator.getValueObjectContainer();
+
+		return prepareDynamicResponse(vitroRequest, sparklineData,
+				shouldVIVOrenderVis, requestingTemplate);
+
+	}
+
+	@Override
+	public ResponseValues generateVisualizationForShortURLRequests(
+			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
+			Dataset dataSource) throws MalformedQueryParametersException {
+		throw new UnsupportedOperationException("Person Publication Count Visualization does not provide "
+					+ "Short URL Response.");
+	}
+
+	@Override
+	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log,
+			Dataset dataset) throws MalformedQueryParametersException {
+
+		String personURI = vitroRequest
+		.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+
+		QueryRunner<Set<Activity>> queryManager = new PersonPublicationCountQueryRunner(
+																personURI,
+																vitroRequest.getRDFService(),
+																log);
+
+		Set<Activity> authorDocuments = queryManager.getQueryResult();
+
+		/*
+		 * Create a map from the year to number of publications. Use the
+		 * BiboDocument's parsedPublicationYear to populate the data.
+		 */
+		Map<String, Integer> yearToPublicationCount =
+				UtilityFunctions.getYearToActivityCount(authorDocuments);
+
+		String authorName = ((PersonPublicationCountQueryRunner) queryManager).getAuthorName();
+
+
+		return prepareDataResponse(authorName,
+								   yearToPublicationCount);
+
+	}
+
+	@Override
+	public ResponseValues generateStandardVisualization(
+			VitroRequest vitroRequest, Log log, Dataset dataset)
+		throws MalformedQueryParametersException {
+
+		String personURI = vitroRequest.getParameter(
+									VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+
+		String visMode = vitroRequest.getParameter(
+									VisualizationFrameworkConstants.VIS_MODE_KEY);
+
+		String visContainer = vitroRequest.getParameter(
+									VisualizationFrameworkConstants.VIS_CONTAINER_KEY);
+
+		QueryRunner<Set<Activity>> queryManager = new PersonPublicationCountQueryRunner(
+																personURI,
+																vitroRequest.getRDFService(),
+																log);
+
+		Set<Activity> authorDocuments = queryManager.getQueryResult();
+
+		/*
+		 * Create a map from the year to number of publications. Use the
+		 * BiboDocument's parsedPublicationYear to populate the data.
+		 */
+		Map<String, Integer> yearToPublicationCount =
+				UtilityFunctions.getYearToActivityCount(authorDocuments);
+
+		/*
+		 * Computations required to generate HTML for the sparkline & related
+		 * context.
+		 */
+		PersonPublicationCountVisCodeGenerator visualizationCodeGenerator =
+				new PersonPublicationCountVisCodeGenerator(
+						personURI,
+						visMode,
+						visContainer,
+						yearToPublicationCount,
+						log);
+
+		SparklineData sparklineData =
+				visualizationCodeGenerator.getValueObjectContainer();
+
+		return prepareStandaloneResponse(vitroRequest, sparklineData);
+	}
+
+	private String getPublicationsOverTimeCSVContent(
+			Map<String, Integer> yearToPublicationCount) {
+
+		StringBuilder csvFileContent = new StringBuilder();
+
+		csvFileContent.append("Year, Publications\n");
+
+		for (Entry<String, Integer> currentEntry : yearToPublicationCount
+				.entrySet()) {
+			csvFileContent.append(StringEscapeUtils.escapeCsv(currentEntry
+					.getKey()));
+			csvFileContent.append(",");
+			csvFileContent.append(currentEntry.getValue());
+			csvFileContent.append("\n");
+		}
+
+		return csvFileContent.toString();
+	}
+
+	/**
+	 * Provides response when csv file containing the publication count over the
+	 * years is requested.
+	 *
+	 * @param authorName Name of author
+	 * @param yearToPublicationCount Year / publication counts
+	 */
+	private Map<String, String> prepareDataResponse(String authorName,
+			Map<String, Integer> yearToPublicationCount) {
+
+		/*
+		 * To make sure that null/empty records for author names do not cause
+		 * any mischief.
+		 */
+		if (StringUtils.isBlank(authorName)) {
+			authorName = "no-author";
+		}
+
+		String outputFileName = UtilityFunctions.slugify(authorName)
+									+ "_publications-per-year" + ".csv";
+
+		Map<String, String> fileData = new HashMap<String, String>();
+		fileData.put(DataVisualizationController.FILE_NAME_KEY,
+					 outputFileName);
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
+					 "application/octet-stream");
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
+					 getPublicationsOverTimeCSVContent(yearToPublicationCount));
+
+		return fileData;
+	}
+
+	/**
+	 * Provides response when an entire page dedicated to publication sparkline
+	 * is requested.
+	 *
+	 * @param vreq Vitro Request
+	 * @param valueObjectContainer Sparkline Data
+	 */
+	private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
+			SparklineData valueObjectContainer) {
+
+		String standaloneTemplate = "personPublicationCountStandaloneActivator.ftl";
+
+		Map<String, Object> body = new HashMap<String, Object>();
+		body.put("title", "Individual Publication Count visualization");
+		body.put("sparklineVO", valueObjectContainer);
+
+		return new TemplateResponseValues(standaloneTemplate, body);
+
+	}
+
+	/**
+	 * Provides response when the publication sparkline has to be rendered in
+	 * already existing page, e.g. profile page.
+	 *
+	 * @param vreq Vitro Request
+	 * @param valueObjectContainer Sparkline data
+	 * @param shouldVIVOrenderVis Flag to render visualization
+	 * @param requestingTemplate Requesting template name
+	 */
+	private TemplateResponseValues prepareDynamicResponse(VitroRequest vreq,
+			SparklineData valueObjectContainer, boolean shouldVIVOrenderVis, String requestingTemplate) {
+
+		String dynamicTemplate = "personPublicationCountDynamicActivator.ftl";
+
+		Map<String, Object> body = new HashMap<String, Object>();
+		body.put("sparklineVO", valueObjectContainer);
+		body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);
+		body.put("requestingTemplate", requestingTemplate); /* tlw72 -- Added in 1.6 for multi-view support.*/
+
+		return new TemplateResponseValues(dynamicTemplate, body);
+
+	}
+
+	@Override
+	public AuthorizationRequest getRequiredPrivileges() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
index 435ae0ae0b..fd21058522 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
@@ -1,233 +1,233 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-
-
-public class PersonPublicationCountVisCodeGenerator {
-
-	/*
-	 * There are 2 modes of sparkline that are available via this visualization.
-	 * 		1. Short Sparkline - This sparkline will render all the data points (or sparks),
-	 * 			which in this case are the publications over the years, from the last 10 years.
-	 * 
-	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks) 
-	 * 			spanning the career of the person & last 10 years at the minimum, in case if
-	 * 			the person started his career in the last 10 yeras.
-	 * */
-
-	private static final String DEFAULT_VIS_CONTAINER_DIV_ID = "pub_count_vis_container";
-	
-	private Map<String, Integer> yearToPublicationCount;
-
-	private Log log;
-
-	private String individualURI;
-	
-	private SparklineData sparklineParameterVO;
-
-	public PersonPublicationCountVisCodeGenerator(String individualURIParam, 
-									  String visMode, 
-									  String visContainer, 
-									  Map<String, Integer> yearToPublicationCount, 
-									  Log log) {
-		
-		this.individualURI = individualURIParam;
-		
-		this.yearToPublicationCount = yearToPublicationCount;
-
-		this.log = log;
-		
-		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
-		
-	}
-	
-	/**
-	 * This method is used to setup parameters for the sparkline value object. These parameters
-	 * will be used in the template to construct the actual html/javascript code.
-	 * @param visMode Visualization mode
-	 * @param providedVisContainerID container id
-	 */
-	private SparklineData setupSparklineParameters(String visMode,
-			  							  String providedVisContainerID) {
-		
-		SparklineData sparklineData = new SparklineData();
-		sparklineData.setYearToActivityCount(yearToPublicationCount);
-		
-
-		int numOfYearsToBeRendered = 0;
-		
-		/*
-		 * It was decided that to prevent downward curve that happens if there are no publications 
-		 * in the current year seems a bit harsh, so we consider only publications from the last 10
-		 * complete years. 
-		 * */
-		int currentYear = Calendar.getInstance().get(Calendar.YEAR) - 1;
-		int shortSparkMinYear = currentYear 
-									- VisConstants.MINIMUM_YEARS_CONSIDERED_FOR_SPARKLINE
-									+ 1;
-		
-    	/*
-    	 * This is required because when deciding the range of years over which the vis
-    	 * was rendered we dont want to be influenced by the "DEFAULT_PUBLICATION_YEAR".
-    	 * */
-		Set<String> publishedYears = new HashSet<String>(yearToPublicationCount.keySet());
-    	publishedYears.remove(VOConstants.DEFAULT_PUBLICATION_YEAR);
-		
-		/*
-		 * We are setting the default value of minPublishedYear to be 10 years before 
-		 * the current year (which is suitably represented by the shortSparkMinYear),
-		 * this in case we run into invalid set of published years.
-		 * */
-		int minPublishedYear = shortSparkMinYear;
-		
-		String visContainerID = null;
-		
-		if (yearToPublicationCount.size() > 0) {
-			try {
-				minPublishedYear = Integer.parseInt(Collections.min(publishedYears));
-			} catch (NoSuchElementException | NumberFormatException e1) {
-				log.debug("vis: " + e1.getMessage() + " error occurred for " 
-								+ yearToPublicationCount.toString());
-			}
-        }
-		
-		int minPubYearConsidered = 0;
-		
-		/*
-		 * There might be a case that the author has made his first publication within the 
-		 * last 10 years but we want to make sure that the sparkline is representative of 
-		 * at least the last 10 years, so we will set the minPubYearConsidered to 
-		 * "currentYear - 10" which is also given by "shortSparkMinYear".
-		 * */
-		if (minPublishedYear > shortSparkMinYear) {
-			minPubYearConsidered = shortSparkMinYear;
-		} else {
-			minPubYearConsidered = minPublishedYear;
-		}
-		
-		numOfYearsToBeRendered = currentYear - minPubYearConsidered + 1;
-		
-		sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered);
-		
-		int publicationCounter = 0;
-		
-		/*
-		 * For the purpose of this visualization I have come up with a term "Sparks" which 
-		 * essentially means data points. 
-		 * Sparks that will be rendered in full mode will always be the one's which have any year
-		 * associated with it. Hence.
-		 * */
-		int renderedFullSparks = 0;
-
-		List<YearToEntityCountDataElement> yearToPublicationCountDataTable = 
-				new ArrayList<YearToEntityCountDataElement>();
-		
-		for (int publicationYear = minPubYearConsidered; 
-					publicationYear <= currentYear; 
-					publicationYear++) {
-
-				String stringPublishedYear = String.valueOf(publicationYear);
-				Integer currentPublications = yearToPublicationCount.get(stringPublishedYear);
-
-				if (currentPublications == null) {
-					currentPublications = 0;
-				}
-
-				yearToPublicationCountDataTable.add(new YearToEntityCountDataElement(
-															publicationCounter, 
-															stringPublishedYear, 
-															currentPublications));
-				
-				/*
-				 * Sparks that will be rendered will always be the one's which has 
-				 * any year associated with it. Hence.
-				 * */
-				renderedFullSparks += currentPublications;
-				publicationCounter++;
-		}
-		
-		sparklineData.setYearToEntityCountDataTable(yearToPublicationCountDataTable);
-		sparklineData.setRenderedSparks(renderedFullSparks);
-
-		/*
-		 * Total publications will also consider publications that have no year associated with
-		 * it. Hence.
-		 * */
-		Integer unknownYearPublications = 0;
-		if (yearToPublicationCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR) != null) {
-			unknownYearPublications = yearToPublicationCount
-											.get(VOConstants.DEFAULT_PUBLICATION_YEAR);
-		}
-		
-		sparklineData.setUnknownYearPublications(unknownYearPublications);
-
-		if (providedVisContainerID != null) {
-			visContainerID = providedVisContainerID;
-		} else {
-			visContainerID = DEFAULT_VIS_CONTAINER_DIV_ID;
-		}
-		
-		sparklineData.setVisContainerDivID(visContainerID);
-		
-		/*
-		 * By default these represents the range of the rendered sparks. Only in case of
-		 * "short" sparkline mode we will set the Earliest RenderedPublication year to
-		 * "currentYear - 10". 
-		 * */
-		sparklineData.setEarliestYearConsidered(minPubYearConsidered);
-		sparklineData.setEarliestRenderedPublicationYear(minPublishedYear);
-		sparklineData.setLatestRenderedPublicationYear(currentYear);
-		
-		if (yearToPublicationCount.size() > 0) {
-			
-			sparklineData.setFullTimelineNetworkLink(
-					UtilityFunctions.getCollaboratorshipNetworkLink(
-						individualURI,
-						VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
-						VisualizationFrameworkConstants.COAUTHOR_VIS_MODE));
-			
-			sparklineData.setDownloadDataLink(
-					UtilityFunctions.getCSVDownloadURL(
-									individualURI, 
-									VisualizationFrameworkConstants.PERSON_PUBLICATION_COUNT_VIS,
-									""));
-		} 
-		
-		/*
-		 * The Full Sparkline will be rendered by default. Only if the url has specific mention of
-		 * SHORT_SPARKLINE_MODE_URL_HANDLE then we render the short sparkline and not otherwise.
-		 * */
-		if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) {
-			
-			sparklineData.setEarliestRenderedPublicationYear(shortSparkMinYear);
-			sparklineData.setShortVisMode(true);
-			
-		} else {
-			sparklineData.setShortVisMode(false);
-		}
-		
-		return sparklineData; 
-	}
-
-	public SparklineData getValueObjectContainer() {
-		return this.sparklineParameterVO;
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+
+
+public class PersonPublicationCountVisCodeGenerator {
+
+	/*
+	 * There are 2 modes of sparkline that are available via this visualization.
+	 * 		1. Short Sparkline - This sparkline will render all the data points (or sparks),
+	 * 			which in this case are the publications over the years, from the last 10 years.
+	 *
+	 * 		2. Full Sparkline - This sparkline will render all the data points (or sparks)
+	 * 			spanning the career of the person & last 10 years at the minimum, in case if
+	 * 			the person started his career in the last 10 yeras.
+	 * */
+
+	private static final String DEFAULT_VIS_CONTAINER_DIV_ID = "pub_count_vis_container";
+
+	private Map<String, Integer> yearToPublicationCount;
+
+	private Log log;
+
+	private String individualURI;
+
+	private SparklineData sparklineParameterVO;
+
+	public PersonPublicationCountVisCodeGenerator(String individualURIParam,
+									  String visMode,
+									  String visContainer,
+									  Map<String, Integer> yearToPublicationCount,
+									  Log log) {
+
+		this.individualURI = individualURIParam;
+
+		this.yearToPublicationCount = yearToPublicationCount;
+
+		this.log = log;
+
+		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
+
+	}
+
+	/**
+	 * This method is used to setup parameters for the sparkline value object. These parameters
+	 * will be used in the template to construct the actual html/javascript code.
+	 * @param visMode Visualization mode
+	 * @param providedVisContainerID container id
+	 */
+	private SparklineData setupSparklineParameters(String visMode,
+			  							  String providedVisContainerID) {
+
+		SparklineData sparklineData = new SparklineData();
+		sparklineData.setYearToActivityCount(yearToPublicationCount);
+
+
+		int numOfYearsToBeRendered = 0;
+
+		/*
+		 * It was decided that to prevent downward curve that happens if there are no publications
+		 * in the current year seems a bit harsh, so we consider only publications from the last 10
+		 * complete years.
+		 * */
+		int currentYear = Calendar.getInstance().get(Calendar.YEAR) - 1;
+		int shortSparkMinYear = currentYear
+									- VisConstants.MINIMUM_YEARS_CONSIDERED_FOR_SPARKLINE
+									+ 1;
+
+    	/*
+    	 * This is required because when deciding the range of years over which the vis
+    	 * was rendered we dont want to be influenced by the "DEFAULT_PUBLICATION_YEAR".
+    	 * */
+		Set<String> publishedYears = new HashSet<String>(yearToPublicationCount.keySet());
+    	publishedYears.remove(VOConstants.DEFAULT_PUBLICATION_YEAR);
+
+		/*
+		 * We are setting the default value of minPublishedYear to be 10 years before
+		 * the current year (which is suitably represented by the shortSparkMinYear),
+		 * this in case we run into invalid set of published years.
+		 * */
+		int minPublishedYear = shortSparkMinYear;
+
+		String visContainerID = null;
+
+		if (yearToPublicationCount.size() > 0) {
+			try {
+				minPublishedYear = Integer.parseInt(Collections.min(publishedYears));
+			} catch (NoSuchElementException | NumberFormatException e1) {
+				log.debug("vis: " + e1.getMessage() + " error occurred for "
+								+ yearToPublicationCount.toString());
+			}
+        }
+
+		int minPubYearConsidered = 0;
+
+		/*
+		 * There might be a case that the author has made his first publication within the
+		 * last 10 years but we want to make sure that the sparkline is representative of
+		 * at least the last 10 years, so we will set the minPubYearConsidered to
+		 * "currentYear - 10" which is also given by "shortSparkMinYear".
+		 * */
+		if (minPublishedYear > shortSparkMinYear) {
+			minPubYearConsidered = shortSparkMinYear;
+		} else {
+			minPubYearConsidered = minPublishedYear;
+		}
+
+		numOfYearsToBeRendered = currentYear - minPubYearConsidered + 1;
+
+		sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered);
+
+		int publicationCounter = 0;
+
+		/*
+		 * For the purpose of this visualization I have come up with a term "Sparks" which
+		 * essentially means data points.
+		 * Sparks that will be rendered in full mode will always be the one's which have any year
+		 * associated with it. Hence.
+		 * */
+		int renderedFullSparks = 0;
+
+		List<YearToEntityCountDataElement> yearToPublicationCountDataTable =
+				new ArrayList<YearToEntityCountDataElement>();
+
+		for (int publicationYear = minPubYearConsidered;
+					publicationYear <= currentYear;
+					publicationYear++) {
+
+				String stringPublishedYear = String.valueOf(publicationYear);
+				Integer currentPublications = yearToPublicationCount.get(stringPublishedYear);
+
+				if (currentPublications == null) {
+					currentPublications = 0;
+				}
+
+				yearToPublicationCountDataTable.add(new YearToEntityCountDataElement(
+															publicationCounter,
+															stringPublishedYear,
+															currentPublications));
+
+				/*
+				 * Sparks that will be rendered will always be the one's which has
+				 * any year associated with it. Hence.
+				 * */
+				renderedFullSparks += currentPublications;
+				publicationCounter++;
+		}
+
+		sparklineData.setYearToEntityCountDataTable(yearToPublicationCountDataTable);
+		sparklineData.setRenderedSparks(renderedFullSparks);
+
+		/*
+		 * Total publications will also consider publications that have no year associated with
+		 * it. Hence.
+		 * */
+		Integer unknownYearPublications = 0;
+		if (yearToPublicationCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR) != null) {
+			unknownYearPublications = yearToPublicationCount
+											.get(VOConstants.DEFAULT_PUBLICATION_YEAR);
+		}
+
+		sparklineData.setUnknownYearPublications(unknownYearPublications);
+
+		if (providedVisContainerID != null) {
+			visContainerID = providedVisContainerID;
+		} else {
+			visContainerID = DEFAULT_VIS_CONTAINER_DIV_ID;
+		}
+
+		sparklineData.setVisContainerDivID(visContainerID);
+
+		/*
+		 * By default these represents the range of the rendered sparks. Only in case of
+		 * "short" sparkline mode we will set the Earliest RenderedPublication year to
+		 * "currentYear - 10".
+		 * */
+		sparklineData.setEarliestYearConsidered(minPubYearConsidered);
+		sparklineData.setEarliestRenderedPublicationYear(minPublishedYear);
+		sparklineData.setLatestRenderedPublicationYear(currentYear);
+
+		if (yearToPublicationCount.size() > 0) {
+
+			sparklineData.setFullTimelineNetworkLink(
+					UtilityFunctions.getCollaboratorshipNetworkLink(
+						individualURI,
+						VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
+						VisualizationFrameworkConstants.COAUTHOR_VIS_MODE));
+
+			sparklineData.setDownloadDataLink(
+					UtilityFunctions.getCSVDownloadURL(
+									individualURI,
+									VisualizationFrameworkConstants.PERSON_PUBLICATION_COUNT_VIS,
+									""));
+		}
+
+		/*
+		 * The Full Sparkline will be rendered by default. Only if the url has specific mention of
+		 * SHORT_SPARKLINE_MODE_URL_HANDLE then we render the short sparkline and not otherwise.
+		 * */
+		if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) {
+
+			sparklineData.setEarliestRenderedPublicationYear(shortSparkMinYear);
+			sparklineData.setShortVisMode(true);
+
+		} else {
+			sparklineData.setShortVisMode(false);
+		}
+
+		return sparklineData;
+	}
+
+	public SparklineData getValueObjectContainer() {
+		return this.sparklineParameterVO;
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
index 896b979591..b409f7e905 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
@@ -43,7 +43,7 @@ public static String getHighestLevelOrganizationURI(ResultSet resultSet, Map<Str
 
 	public static String getHighestLevelOrganizationURI(Log log, Dataset dataset)
 			throws MalformedQueryParametersException {
-		
+
 		Map<String, String> fieldLabelToOutputFieldLabel = new HashMap<String, String>();
 		fieldLabelToOutputFieldLabel.put("organization",
 				QueryFieldLabels.ORGANIZATION_URL);
@@ -52,7 +52,7 @@ public static String getHighestLevelOrganizationURI(Log log, Dataset dataset)
 
 		String aggregationRules = "(count(?organization) AS ?numOfChildren)";
 
-		String whereClause = "?organization rdf:type foaf:Organization ;" 
+		String whereClause = "?organization rdf:type foaf:Organization ;"
 						+ " rdfs:label ?organizationLabel . \n"
 				+ "OPTIONAL { ?organization <http://purl.obolibrary.org/obo/BFO_0000051> ?subOrg . \n"
 			    + "           ?subOrg rdf:type foaf:Organization } . \n"
@@ -73,79 +73,79 @@ public static String getHighestLevelOrganizationURI(Log log, Dataset dataset)
 						fieldLabelToOutputFieldLabel);
 		return highestLevelOrgURI;
 	}
-	
+
 	public static String getEntityLabelFromDAO(VitroRequest vitroRequest,
 			String entityURI) {
-		
+
 		IndividualDao iDao = vitroRequest.getWebappDaoFactory().getIndividualDao();
         Individual ind = iDao.getIndividualByURI(entityURI);
-        
-        String organizationLabel = "Unknown Organization"; 
-        
+
+        String organizationLabel = "Unknown Organization";
+
         if (ind != null) {
         	organizationLabel = ind.getName();
         }
 		return organizationLabel;
 	}
-	
+
 	public static String getStaffProvidedOrComputedHighestLevelOrganization(Log log,
 			Dataset dataset, VitroRequest vitroRequest)
 			throws MalformedQueryParametersException {
-		
+
 		String staffProvidedHighestLevelOrganization = ConfigurationProperties.getBean(vitroRequest)
 					.getProperty("visualization.topLevelOrg");
-		
+
 		/*
 		 * First checking if the staff has provided highest level organization in runtime.properties
 		 * if so use to temporal graph vis.
 		 */
 		if (StringUtils.isNotBlank(staffProvidedHighestLevelOrganization)) {
-			
+
 			/*
 			 * To test for the validity of the URI submitted.
 			 */
 			IRIFactory iRIFactory = IRIFactory.jenaImplementation();
 			IRI iri = iRIFactory.create(staffProvidedHighestLevelOrganization);
-		    
-			
+
+
 			if (!iri.hasViolation(false)) {
 		    	return staffProvidedHighestLevelOrganization;
 		    }
-		} 
-		
+		}
+
 		/*
 		 * If the provided value was not proper compute it yourself.
 		 * */
 		return OrganizationUtilityFunctions.getHighestLevelOrganizationURI(log, dataset);
 	}
-	
+
 	public static Entity mergeEntityIfShareSameURI(Entity entityA, Entity entityB) {
-		
+
 		if (StringUtils.equalsIgnoreCase(entityA.getEntityURI(), entityB.getEntityURI())) {
-			
+
 			Entity mergedEntity = new Entity(entityA.getEntityURI());
-			
+
 			if (StringUtils.isNotBlank(entityA.getEntityLabel())) {
-				
+
 				mergedEntity.setEntityLabel(entityA.getEntityLabel());
-				
+
 			} else if (StringUtils.isNotBlank(entityB.getEntityLabel())) {
-				
+
 				mergedEntity.setEntityLabel(entityB.getEntityLabel());
 			}
-			
+
 			mergedEntity.addSubEntitities(entityA.getSubEntities());
 			mergedEntity.addSubEntitities(entityB.getSubEntities());
-			
+
 			mergedEntity.addParents(entityA.getParents());
 			mergedEntity.addParents(entityB.getParents());
-			
+
 			return mergedEntity;
-			
+
 		} else {
 			return null;
 		}
-		
+
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
index 10986918ce..7c73effbbe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
@@ -1,313 +1,313 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.visualization.model.OrganizationPeopleMap;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.CounterUtils;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.OrgUtils;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-
-import org.apache.jena.query.Dataset;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
-
-
-public class TemporalGrantVisualizationRequestHandler implements
-		VisualizationRequestHandler {
-	
-	@Override
-	public ResponseValues generateStandardVisualization(
-			VitroRequest vitroRequest, Log log, Dataset dataset)
-			throws MalformedQueryParametersException {
-		
-		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-		return generateStandardVisualizationForGrantTemporalVis(vitroRequest, log, dataset, entityURI);
-	}
-
-
-	private ResponseValues generateStandardVisualizationForGrantTemporalVis(
-			VitroRequest vitroRequest, Log log, Dataset dataset,
-			String entityURI) throws MalformedQueryParametersException {
-
-		if (StringUtils.isBlank(entityURI)) {
-			entityURI = OrganizationUtilityFunctions.getStaffProvidedOrComputedHighestLevelOrganization(
-										log,
-										dataset, 
-										vitroRequest);
-			
-		}
-		
-		return prepareStandaloneMarkupResponse(vitroRequest, entityURI);
-	}
-	
-	
-	@Override
-	public ResponseValues generateVisualizationForShortURLRequests(
-			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
-			Dataset dataset) throws MalformedQueryParametersException {
-
-		return generateStandardVisualizationForGrantTemporalVis(
-				vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
-		
-	}
-
-	@Override
-	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
-			throws MalformedQueryParametersException, JsonProcessingException {
-
-		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-		
-		VisConstants.DataVisMode currentDataMode = VisConstants.DataVisMode.CSV;
-		
-		/*
-		 * This will provide the data in json format mainly used for standalone temporal vis. 
-		 * */
-		if (VisualizationFrameworkConstants.JSON_OUTPUT_FORMAT
-					.equalsIgnoreCase(vitroRequest
-							.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY))) {
-			
-			currentDataMode = VisConstants.DataVisMode.JSON;
-			
-			if (StringUtils.isBlank(entityURI)) {
-				
-				entityURI = OrganizationUtilityFunctions
-								.getStaffProvidedOrComputedHighestLevelOrganization(
-										log,
-										dataset,
-										vitroRequest);								
-								
-			} 
-			
-		} 		
-
-		try {
-			return getSubjectEntityAndGenerateDataResponse(
-					vitroRequest,
-					log,
-					dataset,
-					entityURI,
-					currentDataMode);
-		} finally {
-			VisualizationCaches.buildMissing();
-		}
-	}
-	
-	private Map<String, String> prepareDataErrorResponse() {
-		String outputFileName = "no-organization_grants-per-year.csv";
-		
-		Map<String, String> fileData = new HashMap<String, String>();
-		
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, "");
-		return fileData;
-	}
-	
-	@Override
-	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
-			throws MalformedQueryParametersException {
-		
-		throw new UnsupportedOperationException("Entity Grant Count does not provide Ajax response.");
-	}
-	
-	private Map<String, String> getSubjectEntityAndGenerateDataResponse(
-			VitroRequest vitroRequest, Log log, Dataset dataset,
-			String subjectEntityURI, VisConstants.DataVisMode visMode)
-			throws MalformedQueryParametersException, JsonProcessingException {
-
-		RDFService rdfService = vitroRequest.getRDFService();
-
-		Map<String, String> orgLabelMap = VisualizationCaches.organizationLabels.get(rdfService);
-		Map<String, String> personLabelMap = VisualizationCaches.personLabels.get(rdfService);
-
-		if (orgLabelMap.get(subjectEntityURI) == null) {
-			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
-				return prepareStandaloneDataErrorResponse();
-			} else {
-				return prepareDataErrorResponse();
-			}
-		}
-
-		Map<String, Set<String>> subOrgMap               = VisualizationCaches.organizationSubOrgs.get(rdfService);
-		OrganizationPeopleMap organisationToPeopleMap = VisualizationCaches.organisationToPeopleMap.get(rdfService);
-		Map<String, String> orgMostSpecificLabelMap      = VisualizationCaches.organizationToMostSpecificLabel.get(rdfService);
-		Map<String, String> personMostSpecificLabelMap   = VisualizationCaches.personToMostSpecificLabel.get(rdfService);
-		Map<String, Set<String>> personToGrantMap        = VisualizationCaches.personToGrant.get(rdfService);
-		Map<String, String>      grantToYearMap          = VisualizationCaches.grantToYear.get(rdfService);
-
-		Set<String> orgGrants       = new HashSet<String>();
-		Set<String> orgGrantsPeople = new HashSet<String>();
-
-		Map<String, Set<String>> subOrgGrantsMap = new HashMap<String, Set<String>>();
-
-		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
-				subjectEntityURI,
-				orgGrants,
-				orgGrantsPeople,
-				subOrgGrantsMap,
-				subOrgMap,
-				organisationToPeopleMap.organizationToPeople,
-				personToGrantMap
-		);
-
-		if (orgGrants.isEmpty()) {
-			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
-				return prepareStandaloneDataErrorResponse();
-			} else {
-				return prepareDataErrorResponse();
-			}
-		} else {
-
-			Map<String, String> fileData = new HashMap<String, String>();
-			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
-				Set subEntitiesJson = new HashSet();
-
-				// For each suborganisation
-				for (String subOrg : subOrgGrantsMap.keySet()) {
-					JsonObject entityJson = new JsonObject(orgLabelMap.get(subOrg));
-
-					if (subOrgGrantsMap.containsKey(subOrg)) {
-						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgGrantsMap.get(subOrg), grantToYearMap);
-						entityJson.setYearToActivityCount(yearPubCounts);
-					} else {
-						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
-					}
-
-					String type = orgMostSpecificLabelMap.get(subOrg);
-					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Organization" : type));
-
-					entityJson.setEntityURI(subOrg);
-					entityJson.setVisMode("ORGANIZATION");
-
-					subEntitiesJson.add(entityJson);
-				}
-
-				// For each person
-				for (String person : orgGrantsPeople) {
-					JsonObject entityJson = new JsonObject(personLabelMap.get(person));
-
-					if (personToGrantMap.containsKey(person)) {
-						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(personToGrantMap.get(person), grantToYearMap);
-						entityJson.setYearToActivityCount(yearPubCounts);
-					} else {
-						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
-					}
-
-					String type = personMostSpecificLabelMap.get(person);
-					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Person" : type));
-
-					entityJson.setEntityURI(person);
-					entityJson.setVisMode("PERSON");
-
-					subEntitiesJson.add(entityJson);
-				}
-
-				SubjectEntityJSON subjectEntityJSON = new SubjectEntityJSON(
-						orgLabelMap.get(subjectEntityURI),
-						subjectEntityURI,
-						OrgUtils.getParentURIsToLabel(subjectEntityURI, subOrgMap, orgLabelMap));
-
-				subEntitiesJson.add(subjectEntityJSON);
-
-				ObjectMapper mapper = new ObjectMapper();
-
-				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(subEntitiesJson));
-
-			} else {
-				String entityLabel = orgLabelMap.get(subjectEntityURI);
-				if (StringUtils.isBlank(entityLabel)) {
-					entityLabel = "no-organization";
-				}
-
-				StringBuilder csvFileContent = new StringBuilder();
-
-				csvFileContent.append("Entity Name, Grant Count, Entity Type\n");
-
-				for (String subOrg : subOrgGrantsMap.keySet()) {
-					csvFileContent.append(StringEscapeUtils.escapeCsv(orgLabelMap.get(subOrg)));
-					csvFileContent.append(", ");
-
-					csvFileContent.append(subOrgGrantsMap.get(subOrg).size());
-					csvFileContent.append(", ");
-
-					csvFileContent.append("Organization");
-					csvFileContent.append("\n");
-
-				}
-
-				String outputFileName = UtilityFunctions.slugify(entityLabel) + "_grants-per-year" + ".csv";
-				fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
-				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, csvFileContent.toString());
-			}
-			return fileData;
-		}
-	}
-
-	private Map<String, String> prepareStandaloneDataErrorResponse() {
-
-		Map<String, String> fileData = new HashMap<String, String>();
-		
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, 
-					 "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
-					 "{\"error\" : \"No Grants for this Organization found in VIVO.\"}");
-		return fileData;
-	}
-	
-	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
-			   String entityURI) {
-
-		String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl";
-
-		String organizationLabel = OrganizationUtilityFunctions.getEntityLabelFromDAO(vreq,
-											  entityURI);
-
-		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("title", organizationLabel + " - Temporal Graph Visualization");
-		body.put("organizationURI", entityURI);
-		body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
-		body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
-		body.put("organizationLabel", organizationLabel);
-
-		if (VisualizationCaches.personToGrant.isCached()) {
-			body.put("builtFromCacheTime", VisualizationCaches.personToGrant.cachedWhen());
-		}
-
-		return new TemplateResponseValues(standaloneTemplate, body);
-	}
-	
-	@Override
-	public AuthorizationRequest getRequiredPrivileges() {
-		return null;
-	}	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.visualization.model.OrganizationPeopleMap;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.CounterUtils;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.OrgUtils;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+
+import org.apache.jena.query.Dataset;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
+
+
+public class TemporalGrantVisualizationRequestHandler implements
+		VisualizationRequestHandler {
+
+	@Override
+	public ResponseValues generateStandardVisualization(
+			VitroRequest vitroRequest, Log log, Dataset dataset)
+			throws MalformedQueryParametersException {
+
+		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+		return generateStandardVisualizationForGrantTemporalVis(vitroRequest, log, dataset, entityURI);
+	}
+
+
+	private ResponseValues generateStandardVisualizationForGrantTemporalVis(
+			VitroRequest vitroRequest, Log log, Dataset dataset,
+			String entityURI) throws MalformedQueryParametersException {
+
+		if (StringUtils.isBlank(entityURI)) {
+			entityURI = OrganizationUtilityFunctions.getStaffProvidedOrComputedHighestLevelOrganization(
+										log,
+										dataset,
+										vitroRequest);
+
+		}
+
+		return prepareStandaloneMarkupResponse(vitroRequest, entityURI);
+	}
+
+
+	@Override
+	public ResponseValues generateVisualizationForShortURLRequests(
+			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
+			Dataset dataset) throws MalformedQueryParametersException {
+
+		return generateStandardVisualizationForGrantTemporalVis(
+				vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
+
+	}
+
+	@Override
+	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
+			throws MalformedQueryParametersException, JsonProcessingException {
+
+		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+
+		VisConstants.DataVisMode currentDataMode = VisConstants.DataVisMode.CSV;
+
+		/*
+		 * This will provide the data in json format mainly used for standalone temporal vis.
+		 * */
+		if (VisualizationFrameworkConstants.JSON_OUTPUT_FORMAT
+					.equalsIgnoreCase(vitroRequest
+							.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY))) {
+
+			currentDataMode = VisConstants.DataVisMode.JSON;
+
+			if (StringUtils.isBlank(entityURI)) {
+
+				entityURI = OrganizationUtilityFunctions
+								.getStaffProvidedOrComputedHighestLevelOrganization(
+										log,
+										dataset,
+										vitroRequest);
+
+			}
+
+		}
+
+		try {
+			return getSubjectEntityAndGenerateDataResponse(
+					vitroRequest,
+					log,
+					dataset,
+					entityURI,
+					currentDataMode);
+		} finally {
+			VisualizationCaches.buildMissing();
+		}
+	}
+
+	private Map<String, String> prepareDataErrorResponse() {
+		String outputFileName = "no-organization_grants-per-year.csv";
+
+		Map<String, String> fileData = new HashMap<String, String>();
+
+		fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY, "");
+		return fileData;
+	}
+
+	@Override
+	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
+			throws MalformedQueryParametersException {
+
+		throw new UnsupportedOperationException("Entity Grant Count does not provide Ajax response.");
+	}
+
+	private Map<String, String> getSubjectEntityAndGenerateDataResponse(
+			VitroRequest vitroRequest, Log log, Dataset dataset,
+			String subjectEntityURI, VisConstants.DataVisMode visMode)
+			throws MalformedQueryParametersException, JsonProcessingException {
+
+		RDFService rdfService = vitroRequest.getRDFService();
+
+		Map<String, String> orgLabelMap = VisualizationCaches.organizationLabels.get(rdfService);
+		Map<String, String> personLabelMap = VisualizationCaches.personLabels.get(rdfService);
+
+		if (orgLabelMap.get(subjectEntityURI) == null) {
+			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
+				return prepareStandaloneDataErrorResponse();
+			} else {
+				return prepareDataErrorResponse();
+			}
+		}
+
+		Map<String, Set<String>> subOrgMap               = VisualizationCaches.organizationSubOrgs.get(rdfService);
+		OrganizationPeopleMap organisationToPeopleMap = VisualizationCaches.organisationToPeopleMap.get(rdfService);
+		Map<String, String> orgMostSpecificLabelMap      = VisualizationCaches.organizationToMostSpecificLabel.get(rdfService);
+		Map<String, String> personMostSpecificLabelMap   = VisualizationCaches.personToMostSpecificLabel.get(rdfService);
+		Map<String, Set<String>> personToGrantMap        = VisualizationCaches.personToGrant.get(rdfService);
+		Map<String, String>      grantToYearMap          = VisualizationCaches.grantToYear.get(rdfService);
+
+		Set<String> orgGrants       = new HashSet<String>();
+		Set<String> orgGrantsPeople = new HashSet<String>();
+
+		Map<String, Set<String>> subOrgGrantsMap = new HashMap<String, Set<String>>();
+
+		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
+				subjectEntityURI,
+				orgGrants,
+				orgGrantsPeople,
+				subOrgGrantsMap,
+				subOrgMap,
+				organisationToPeopleMap.organizationToPeople,
+				personToGrantMap
+		);
+
+		if (orgGrants.isEmpty()) {
+			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
+				return prepareStandaloneDataErrorResponse();
+			} else {
+				return prepareDataErrorResponse();
+			}
+		} else {
+
+			Map<String, String> fileData = new HashMap<String, String>();
+			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
+				Set subEntitiesJson = new HashSet();
+
+				// For each suborganisation
+				for (String subOrg : subOrgGrantsMap.keySet()) {
+					JsonObject entityJson = new JsonObject(orgLabelMap.get(subOrg));
+
+					if (subOrgGrantsMap.containsKey(subOrg)) {
+						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgGrantsMap.get(subOrg), grantToYearMap);
+						entityJson.setYearToActivityCount(yearPubCounts);
+					} else {
+						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
+					}
+
+					String type = orgMostSpecificLabelMap.get(subOrg);
+					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Organization" : type));
+
+					entityJson.setEntityURI(subOrg);
+					entityJson.setVisMode("ORGANIZATION");
+
+					subEntitiesJson.add(entityJson);
+				}
+
+				// For each person
+				for (String person : orgGrantsPeople) {
+					JsonObject entityJson = new JsonObject(personLabelMap.get(person));
+
+					if (personToGrantMap.containsKey(person)) {
+						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(personToGrantMap.get(person), grantToYearMap);
+						entityJson.setYearToActivityCount(yearPubCounts);
+					} else {
+						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
+					}
+
+					String type = personMostSpecificLabelMap.get(person);
+					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Person" : type));
+
+					entityJson.setEntityURI(person);
+					entityJson.setVisMode("PERSON");
+
+					subEntitiesJson.add(entityJson);
+				}
+
+				SubjectEntityJSON subjectEntityJSON = new SubjectEntityJSON(
+						orgLabelMap.get(subjectEntityURI),
+						subjectEntityURI,
+						OrgUtils.getParentURIsToLabel(subjectEntityURI, subOrgMap, orgLabelMap));
+
+				subEntitiesJson.add(subjectEntityJSON);
+
+				ObjectMapper mapper = new ObjectMapper();
+
+				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(subEntitiesJson));
+
+			} else {
+				String entityLabel = orgLabelMap.get(subjectEntityURI);
+				if (StringUtils.isBlank(entityLabel)) {
+					entityLabel = "no-organization";
+				}
+
+				StringBuilder csvFileContent = new StringBuilder();
+
+				csvFileContent.append("Entity Name, Grant Count, Entity Type\n");
+
+				for (String subOrg : subOrgGrantsMap.keySet()) {
+					csvFileContent.append(StringEscapeUtils.escapeCsv(orgLabelMap.get(subOrg)));
+					csvFileContent.append(", ");
+
+					csvFileContent.append(subOrgGrantsMap.get(subOrg).size());
+					csvFileContent.append(", ");
+
+					csvFileContent.append("Organization");
+					csvFileContent.append("\n");
+
+				}
+
+				String outputFileName = UtilityFunctions.slugify(entityLabel) + "_grants-per-year" + ".csv";
+				fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
+				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, csvFileContent.toString());
+			}
+			return fileData;
+		}
+	}
+
+	private Map<String, String> prepareStandaloneDataErrorResponse() {
+
+		Map<String, String> fileData = new HashMap<String, String>();
+
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY,
+					 "application/octet-stream");
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
+					 "{\"error\" : \"No Grants for this Organization found in VIVO.\"}");
+		return fileData;
+	}
+
+	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
+			   String entityURI) {
+
+		String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl";
+
+		String organizationLabel = OrganizationUtilityFunctions.getEntityLabelFromDAO(vreq,
+											  entityURI);
+
+		Map<String, Object> body = new HashMap<String, Object>();
+		body.put("title", organizationLabel + " - Temporal Graph Visualization");
+		body.put("organizationURI", entityURI);
+		body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
+		body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
+		body.put("organizationLabel", organizationLabel);
+
+		if (VisualizationCaches.personToGrant.isCached()) {
+			body.put("builtFromCacheTime", VisualizationCaches.personToGrant.cachedWhen());
+		}
+
+		return new TemplateResponseValues(standaloneTemplate, body);
+	}
+
+	@Override
+	public AuthorizationRequest getRequiredPrivileges() {
+		return null;
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
index 02b0a57673..133ab57bd5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
@@ -1,316 +1,316 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.visualization.model.OrganizationPeopleMap;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.CounterUtils;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.OrgUtils;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-
-import org.apache.jena.query.Dataset;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
-
-public class TemporalPublicationVisualizationRequestHandler implements
-		VisualizationRequestHandler {
-	
-	@Override
-	public ResponseValues generateStandardVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
-			throws MalformedQueryParametersException {
-		
-		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-		return generateStandardVisualizationForPublicationTemporalVis(vitroRequest, log, dataset, entityURI);
-	}
-	
-	@Override
-	public ResponseValues generateVisualizationForShortURLRequests(
-			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
-			Dataset dataset) throws MalformedQueryParametersException {
-
-		return generateStandardVisualizationForPublicationTemporalVis(
-				vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
-	}
-
-	private ResponseValues generateStandardVisualizationForPublicationTemporalVis(
-			VitroRequest vitroRequest, Log log, Dataset dataset,
-			String entityURI) throws MalformedQueryParametersException {
-		
-		if (StringUtils.isBlank(entityURI)) {
-			entityURI = OrganizationUtilityFunctions
-								.getStaffProvidedOrComputedHighestLevelOrganization(
-											log, 
-											dataset, 
-											vitroRequest);
-		}
-		
-		
-		return prepareStandaloneMarkupResponse(vitroRequest, entityURI);
-	}
-
-	private Map<String, String> getSubjectEntityAndGenerateDataResponse(
-			VitroRequest vitroRequest, Log log, Dataset dataset,
-			String subjectEntityURI, VisConstants.DataVisMode visMode)
-            throws MalformedQueryParametersException, JsonProcessingException {
-
-		RDFService rdfService = vitroRequest.getRDFService();
-
-		Map<String, String> orgLabelMap = VisualizationCaches.organizationLabels.get(rdfService);
-		Map<String, String> personLabelMap = VisualizationCaches.personLabels.get(rdfService);
-
-		if (orgLabelMap.get(subjectEntityURI) == null) {
-			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
-				return prepareStandaloneDataErrorResponse();
-			} else {
-				return prepareDataErrorResponse();
-			}
-		}
-
-		Map<String, Set<String>> subOrgMap               = VisualizationCaches.organizationSubOrgs.get(rdfService);
-		Map<String, String> orgMostSpecificLabelMap      = VisualizationCaches.organizationToMostSpecificLabel.get(rdfService);
-		Map<String, String> personMostSpecificLabelMap   = VisualizationCaches.personToMostSpecificLabel.get(rdfService);
-		OrganizationPeopleMap organisationToPeopleMap = VisualizationCaches.organisationToPeopleMap.get(rdfService);
-		Map<String, Set<String>> personToPublicationMap  = VisualizationCaches.personToPublication.get(rdfService).personToPublication;
-		Map<String, String>      publicationToYearMap    = VisualizationCaches.publicationToYear.get(rdfService);
-
-		Set<String> orgPublications       = new HashSet<String>();
-		Set<String> orgPublicationsPeople = new HashSet<String>();
-
-		Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
-
-		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
-				subjectEntityURI,
-				orgPublications,
-				orgPublicationsPeople,
-				subOrgPublicationsMap,
-				subOrgMap,
-				organisationToPeopleMap.organizationToPeople,
-				personToPublicationMap
-		);
-
-		if (orgPublications.isEmpty()) {
-			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
-				return prepareStandaloneDataErrorResponse();
-			} else {
-				return prepareDataErrorResponse();
-			}
-		} else {
-
-			Map<String, String> fileData = new HashMap<String, String>();
-			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
-				Set subEntitiesJson = new HashSet();
-
-				// For each suborganisation
-				for (String subOrg : subOrgPublicationsMap.keySet()) {
-					JsonObject entityJson = new JsonObject(orgLabelMap.get(subOrg));
-
-					if (subOrgPublicationsMap.containsKey(subOrg)) {
-						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgPublicationsMap.get(subOrg), publicationToYearMap);
-						entityJson.setYearToActivityCount(yearPubCounts);
-					} else {
-						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
-					}
-
-					String type = orgMostSpecificLabelMap.get(subOrg);
-					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Organization" : type));
-
-					entityJson.setEntityURI(subOrg);
-					entityJson.setVisMode("ORGANIZATION");
-
-					subEntitiesJson.add(entityJson);
-				}
-
-				// For each person
-				for (String person : orgPublicationsPeople) {
-					JsonObject entityJson = new JsonObject(personLabelMap.get(person));
-
-					if (personToPublicationMap.containsKey(person)) {
-						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(personToPublicationMap.get(person), publicationToYearMap);
-						entityJson.setYearToActivityCount(yearPubCounts);
-					} else {
-						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
-					}
-
-					String type = personMostSpecificLabelMap.get(person);
-					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Person" : type));
-
-					entityJson.setEntityURI(person);
-					entityJson.setVisMode("PERSON");
-
-					subEntitiesJson.add(entityJson);
-				}
-
-				SubjectEntityJSON subjectEntityJSON = new SubjectEntityJSON(
-						orgLabelMap.get(subjectEntityURI),
-						subjectEntityURI,
-						OrgUtils.getParentURIsToLabel(subjectEntityURI, subOrgMap, orgLabelMap));
-
-				subEntitiesJson.add(subjectEntityJSON);
-
-				ObjectMapper mapper = new ObjectMapper();
-
-				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(subEntitiesJson));
-
-			} else {
-				String entityLabel = orgLabelMap.get(subjectEntityURI);
-				if (StringUtils.isBlank(entityLabel)) {
-					entityLabel = "no-organization";
-				}
-
-				StringBuilder csvFileContent = new StringBuilder();
-
-				csvFileContent.append("Entity Name, Publication Count, Entity Type\n");
-
-				for (String subOrg : subOrgPublicationsMap.keySet()) {
-					csvFileContent.append(StringEscapeUtils.escapeCsv(orgLabelMap.get(subOrg)));
-					csvFileContent.append(", ");
-
-					csvFileContent.append(subOrgPublicationsMap.get(subOrg).size());
-					csvFileContent.append(", ");
-
-					csvFileContent.append("Organization");
-					csvFileContent.append("\n");
-
-				}
-
-				// For each person
-				for (String person : orgPublicationsPeople) {
-					csvFileContent.append(StringEscapeUtils.escapeCsv(personLabelMap.get(person)));
-					csvFileContent.append(", ");
-
-					if (personToPublicationMap.containsKey(person)) {
-						csvFileContent.append(personToPublicationMap.get(person).size());
-						csvFileContent.append(", ");
-					} else {
-						csvFileContent.append("0, ");
-					}
-
-					csvFileContent.append("Person");
-					csvFileContent.append("\n");
-				}
-
-				String outputFileName = UtilityFunctions.slugify(entityLabel) + "_publications-per-year" + ".csv";
-				fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
-				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, csvFileContent.toString());
-			}
-			return fileData;
-		}
-	}
-
-	private Map<String, String> prepareDataErrorResponse() {
-		String outputFileName = "no-organization_publications-per-year.csv";
-		
-		Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,      "");
-		return fileData;
-	}
-
-	private Map<String, String> prepareStandaloneDataErrorResponse() {
-		Map<String, String> fileData = new HashMap<String, String>();
-		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
-		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,      "{\"error\" : \"No Publications for this Organization found in VIVO.\"}");
-		return fileData;
-	}
-
-	@Override
-	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
-            throws MalformedQueryParametersException, JsonProcessingException {
-
-		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
-		
-		VisConstants.DataVisMode currentDataMode = VisConstants.DataVisMode.CSV;
-		
-		/*
-		 * This will provide the data in json format mainly used for standalone tmeporal vis. 
-		 * */
-		if (VisualizationFrameworkConstants.JSON_OUTPUT_FORMAT
-					.equalsIgnoreCase(vitroRequest.getParameter(
-							VisualizationFrameworkConstants.VIS_MODE_KEY))) {
-			
-			currentDataMode = VisConstants.DataVisMode.JSON;
-			
-			if (StringUtils.isBlank(entityURI)) {
-				
-				entityURI = OrganizationUtilityFunctions
-								.getStaffProvidedOrComputedHighestLevelOrganization(
-										log,
-										dataset,
-										vitroRequest);	
-				
-			} 
-			
-		} 
-
-		try {
-			return getSubjectEntityAndGenerateDataResponse(
-					vitroRequest,
-					log,
-					dataset,
-					entityURI,
-					currentDataMode);
-		} finally {
-			VisualizationCaches.buildMissing();
-		}
-	}
-	
-	
-	@Override
-	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, Dataset dataset) throws MalformedQueryParametersException {
-		throw new UnsupportedOperationException("Entity Pub Count does not provide Ajax Response.");
-	}
-
-	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq, String entityURI) {
-        String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl";
-        String organizationLabel = OrganizationUtilityFunctions.getEntityLabelFromDAO(vreq, entityURI);
-
-        Map<String, Object> body = new HashMap<String, Object>();
-        body.put("title", organizationLabel + " - Temporal Graph Visualization");
-        body.put("organizationURI", entityURI);
-        body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
-        body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
-        body.put("organizationLabel", organizationLabel);
-
-		if (VisualizationCaches.personToPublication.isCached()) {
-			body.put("builtFromCacheTime", VisualizationCaches.personToPublication.cachedWhen());
-		}
-
-        return new TemplateResponseValues(standaloneTemplate, body);
-	}
-
-	@Override
-	public AuthorizationRequest getRequiredPrivileges() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.visualization.model.OrganizationPeopleMap;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.CounterUtils;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.OrgUtils;
+import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+
+import org.apache.jena.query.Dataset;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject;
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
+
+public class TemporalPublicationVisualizationRequestHandler implements
+		VisualizationRequestHandler {
+
+	@Override
+	public ResponseValues generateStandardVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
+			throws MalformedQueryParametersException {
+
+		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+		return generateStandardVisualizationForPublicationTemporalVis(vitroRequest, log, dataset, entityURI);
+	}
+
+	@Override
+	public ResponseValues generateVisualizationForShortURLRequests(
+			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
+			Dataset dataset) throws MalformedQueryParametersException {
+
+		return generateStandardVisualizationForPublicationTemporalVis(
+				vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
+	}
+
+	private ResponseValues generateStandardVisualizationForPublicationTemporalVis(
+			VitroRequest vitroRequest, Log log, Dataset dataset,
+			String entityURI) throws MalformedQueryParametersException {
+
+		if (StringUtils.isBlank(entityURI)) {
+			entityURI = OrganizationUtilityFunctions
+								.getStaffProvidedOrComputedHighestLevelOrganization(
+											log,
+											dataset,
+											vitroRequest);
+		}
+
+
+		return prepareStandaloneMarkupResponse(vitroRequest, entityURI);
+	}
+
+	private Map<String, String> getSubjectEntityAndGenerateDataResponse(
+			VitroRequest vitroRequest, Log log, Dataset dataset,
+			String subjectEntityURI, VisConstants.DataVisMode visMode)
+            throws MalformedQueryParametersException, JsonProcessingException {
+
+		RDFService rdfService = vitroRequest.getRDFService();
+
+		Map<String, String> orgLabelMap = VisualizationCaches.organizationLabels.get(rdfService);
+		Map<String, String> personLabelMap = VisualizationCaches.personLabels.get(rdfService);
+
+		if (orgLabelMap.get(subjectEntityURI) == null) {
+			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
+				return prepareStandaloneDataErrorResponse();
+			} else {
+				return prepareDataErrorResponse();
+			}
+		}
+
+		Map<String, Set<String>> subOrgMap               = VisualizationCaches.organizationSubOrgs.get(rdfService);
+		Map<String, String> orgMostSpecificLabelMap      = VisualizationCaches.organizationToMostSpecificLabel.get(rdfService);
+		Map<String, String> personMostSpecificLabelMap   = VisualizationCaches.personToMostSpecificLabel.get(rdfService);
+		OrganizationPeopleMap organisationToPeopleMap = VisualizationCaches.organisationToPeopleMap.get(rdfService);
+		Map<String, Set<String>> personToPublicationMap  = VisualizationCaches.personToPublication.get(rdfService).personToPublication;
+		Map<String, String>      publicationToYearMap    = VisualizationCaches.publicationToYear.get(rdfService);
+
+		Set<String> orgPublications       = new HashSet<String>();
+		Set<String> orgPublicationsPeople = new HashSet<String>();
+
+		Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
+
+		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
+				subjectEntityURI,
+				orgPublications,
+				orgPublicationsPeople,
+				subOrgPublicationsMap,
+				subOrgMap,
+				organisationToPeopleMap.organizationToPeople,
+				personToPublicationMap
+		);
+
+		if (orgPublications.isEmpty()) {
+			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
+				return prepareStandaloneDataErrorResponse();
+			} else {
+				return prepareDataErrorResponse();
+			}
+		} else {
+
+			Map<String, String> fileData = new HashMap<String, String>();
+			if (VisConstants.DataVisMode.JSON.equals(visMode)) {
+				Set subEntitiesJson = new HashSet();
+
+				// For each suborganisation
+				for (String subOrg : subOrgPublicationsMap.keySet()) {
+					JsonObject entityJson = new JsonObject(orgLabelMap.get(subOrg));
+
+					if (subOrgPublicationsMap.containsKey(subOrg)) {
+						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgPublicationsMap.get(subOrg), publicationToYearMap);
+						entityJson.setYearToActivityCount(yearPubCounts);
+					} else {
+						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
+					}
+
+					String type = orgMostSpecificLabelMap.get(subOrg);
+					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Organization" : type));
+
+					entityJson.setEntityURI(subOrg);
+					entityJson.setVisMode("ORGANIZATION");
+
+					subEntitiesJson.add(entityJson);
+				}
+
+				// For each person
+				for (String person : orgPublicationsPeople) {
+					JsonObject entityJson = new JsonObject(personLabelMap.get(person));
+
+					if (personToPublicationMap.containsKey(person)) {
+						List<List<Integer>> yearPubCounts = CounterUtils.getObjectCountByYear(personToPublicationMap.get(person), publicationToYearMap);
+						entityJson.setYearToActivityCount(yearPubCounts);
+					} else {
+						entityJson.setYearToActivityCount(new ArrayList<List<Integer>>());
+					}
+
+					String type = personMostSpecificLabelMap.get(person);
+					entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Person" : type));
+
+					entityJson.setEntityURI(person);
+					entityJson.setVisMode("PERSON");
+
+					subEntitiesJson.add(entityJson);
+				}
+
+				SubjectEntityJSON subjectEntityJSON = new SubjectEntityJSON(
+						orgLabelMap.get(subjectEntityURI),
+						subjectEntityURI,
+						OrgUtils.getParentURIsToLabel(subjectEntityURI, subOrgMap, orgLabelMap));
+
+				subEntitiesJson.add(subjectEntityJSON);
+
+				ObjectMapper mapper = new ObjectMapper();
+
+				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, mapper.writeValueAsString(subEntitiesJson));
+
+			} else {
+				String entityLabel = orgLabelMap.get(subjectEntityURI);
+				if (StringUtils.isBlank(entityLabel)) {
+					entityLabel = "no-organization";
+				}
+
+				StringBuilder csvFileContent = new StringBuilder();
+
+				csvFileContent.append("Entity Name, Publication Count, Entity Type\n");
+
+				for (String subOrg : subOrgPublicationsMap.keySet()) {
+					csvFileContent.append(StringEscapeUtils.escapeCsv(orgLabelMap.get(subOrg)));
+					csvFileContent.append(", ");
+
+					csvFileContent.append(subOrgPublicationsMap.get(subOrg).size());
+					csvFileContent.append(", ");
+
+					csvFileContent.append("Organization");
+					csvFileContent.append("\n");
+
+				}
+
+				// For each person
+				for (String person : orgPublicationsPeople) {
+					csvFileContent.append(StringEscapeUtils.escapeCsv(personLabelMap.get(person)));
+					csvFileContent.append(", ");
+
+					if (personToPublicationMap.containsKey(person)) {
+						csvFileContent.append(personToPublicationMap.get(person).size());
+						csvFileContent.append(", ");
+					} else {
+						csvFileContent.append("0, ");
+					}
+
+					csvFileContent.append("Person");
+					csvFileContent.append("\n");
+				}
+
+				String outputFileName = UtilityFunctions.slugify(entityLabel) + "_publications-per-year" + ".csv";
+				fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
+				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+				fileData.put(DataVisualizationController.FILE_CONTENT_KEY, csvFileContent.toString());
+			}
+			return fileData;
+		}
+	}
+
+	private Map<String, String> prepareDataErrorResponse() {
+		String outputFileName = "no-organization_publications-per-year.csv";
+
+		Map<String, String> fileData = new HashMap<String, String>();
+		fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,      "");
+		return fileData;
+	}
+
+	private Map<String, String> prepareStandaloneDataErrorResponse() {
+		Map<String, String> fileData = new HashMap<String, String>();
+		fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
+		fileData.put(DataVisualizationController.FILE_CONTENT_KEY,      "{\"error\" : \"No Publications for this Organization found in VIVO.\"}");
+		return fileData;
+	}
+
+	@Override
+	public Map<String, String> generateDataVisualization(VitroRequest vitroRequest, Log log, Dataset dataset)
+            throws MalformedQueryParametersException, JsonProcessingException {
+
+		String entityURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
+
+		VisConstants.DataVisMode currentDataMode = VisConstants.DataVisMode.CSV;
+
+		/*
+		 * This will provide the data in json format mainly used for standalone tmeporal vis.
+		 * */
+		if (VisualizationFrameworkConstants.JSON_OUTPUT_FORMAT
+					.equalsIgnoreCase(vitroRequest.getParameter(
+							VisualizationFrameworkConstants.VIS_MODE_KEY))) {
+
+			currentDataMode = VisConstants.DataVisMode.JSON;
+
+			if (StringUtils.isBlank(entityURI)) {
+
+				entityURI = OrganizationUtilityFunctions
+								.getStaffProvidedOrComputedHighestLevelOrganization(
+										log,
+										dataset,
+										vitroRequest);
+
+			}
+
+		}
+
+		try {
+			return getSubjectEntityAndGenerateDataResponse(
+					vitroRequest,
+					log,
+					dataset,
+					entityURI,
+					currentDataMode);
+		} finally {
+			VisualizationCaches.buildMissing();
+		}
+	}
+
+
+	@Override
+	public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, Dataset dataset) throws MalformedQueryParametersException {
+		throw new UnsupportedOperationException("Entity Pub Count does not provide Ajax Response.");
+	}
+
+	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq, String entityURI) {
+        String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl";
+        String organizationLabel = OrganizationUtilityFunctions.getEntityLabelFromDAO(vreq, entityURI);
+
+        Map<String, Object> body = new HashMap<String, Object>();
+        body.put("title", organizationLabel + " - Temporal Graph Visualization");
+        body.put("organizationURI", entityURI);
+        body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
+        body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
+        body.put("organizationLabel", organizationLabel);
+
+		if (VisualizationCaches.personToPublication.isCached()) {
+			body.put("builtFromCacheTime", VisualizationCaches.personToPublication.cachedWhen());
+		}
+
+        return new TemplateResponseValues(standaloneTemplate, body);
+	}
+
+	@Override
+	public AuthorizationRequest getRequiredPrivileges() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
index f0f95bc0f0..2b5f711350 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
@@ -18,7 +18,7 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
 
 public class ToolsRequestHandler implements VisualizationRequestHandler {
-	
+
 	public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTION;
 
 	@Override
@@ -45,7 +45,7 @@ public ResponseValues generateStandardVisualization(
 	public ResponseValues generateVisualizationForShortURLRequests(
 			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
 			Dataset dataSource) throws MalformedQueryParametersException {
-		
+
 		return renderToolsMenu(vitroRequest, log, dataSource);
 	}
 
@@ -53,7 +53,7 @@ public ResponseValues generateVisualizationForShortURLRequests(
 	public AuthorizationRequest getRequiredPrivileges() {
 		return REQUIRED_ACTIONS;
 	}
-	
+
 	private ResponseValues renderToolsMenu(VitroRequest vitroRequest,
 			Log log, Dataset dataSource) {
 
@@ -63,6 +63,6 @@ private ResponseValues renderToolsMenu(VitroRequest vitroRequest,
 		body.put("title", "Visualization Tools");
 
 		return new TemplateResponseValues(standaloneTemplate, body);
-	} 
+	}
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
index 1496132ecf..6e3666bd92 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
@@ -42,18 +42,18 @@
 
 /**
  * This request handler is used when you need helpful information to add more context
- * to the visualization. It does not have any code for generating the visualization, 
+ * to the visualization. It does not have any code for generating the visualization,
  * just fires sparql queries to get info for specific cases like,
  * 		1. thumbnail/image location for a particular individual
  * 		2. profile information for a particular individual like label, moniker etc
  * 		3. person level vis url for a particular individual
- * 		etc.  
+ * 		etc.
  * @author cdtank
  */
 public class UtilitiesRequestHandler implements VisualizationRequestHandler {
-	
+
 	public Object generateAjaxVisualization(VitroRequest vitroRequest,
-											Log log, 
+											Log log,
 											Dataset dataset)
 			throws MalformedQueryParametersException, JsonProcessingException {
 
@@ -62,52 +62,52 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 
         String visMode = vitroRequest.getParameter(
         									VisualizationFrameworkConstants.VIS_MODE_KEY);
-        
+
         /*
 		 * If the info being requested is about a profile which includes the name, moniker
 		 * & image url.
 		 * */
 		if (VisualizationFrameworkConstants.PROFILE_INFO_UTILS_VIS_MODE
 					.equalsIgnoreCase(visMode)) {
-			
-			
+
+
 			String filterRule = "?predicate = public:mainImage "
-									+ " || ?predicate = rdfs:label "   
+									+ " || ?predicate = rdfs:label "
 									+ " || ?predicate =  <http://www.w3.org/2006/vcard/ns#title>";
-			
+
 			AllPropertiesQueryRunner profileQueryHandler =
-					new AllPropertiesQueryRunner(individualURI, 
+					new AllPropertiesQueryRunner(individualURI,
 												  filterRule,
 												  vitroRequest.getRDFService(),
 												  log);
-			
-			GenericQueryMap profilePropertiesToValues = 
+
+			GenericQueryMap profilePropertiesToValues =
 						profileQueryHandler.getQueryResult();
 
 			ObjectMapper mapper = new ObjectMapper();
 
 			return mapper.writeValueAsString(profilePropertiesToValues);
 
-				
+
 		} else if (VisualizationFrameworkConstants.IMAGE_UTILS_VIS_MODE
 						.equalsIgnoreCase(visMode)) {
 			/*
-    		 * If the url being requested is about a standalone image, which is used when we 
+    		 * If the url being requested is about a standalone image, which is used when we
     		 * want to render an image & other info for a co-author OR ego for that matter.
     		 * */
-			
+
 			Map<String, String> fieldLabelToOutputFieldLabel = new HashMap<String, String>();
-			fieldLabelToOutputFieldLabel.put("downloadLocation", 
+			fieldLabelToOutputFieldLabel.put("downloadLocation",
 											  QueryFieldLabels.THUMBNAIL_LOCATION_URL);
 			fieldLabelToOutputFieldLabel.put("fileName", QueryFieldLabels.THUMBNAIL_FILENAME);
-			
-			String whereClause = "<" + individualURI 
+
+			String whereClause = "<" + individualURI
 									+ "> public:thumbnailImage ?thumbnailImage .  "
 									+ "?thumbnailImage public:downloadLocation "
 									+ "?downloadLocation ; public:filename ?fileName .";
-			
-			
-			
+
+
+
 			GenericQueryRunner imageQueryHandler =
 					new GenericQueryRunner(fieldLabelToOutputFieldLabel,
 											"",
@@ -121,20 +121,20 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 
 		} else if (VisualizationFrameworkConstants.ARE_PUBLICATIONS_AVAILABLE_UTILS_VIS_MODE
 						.equalsIgnoreCase(visMode)) {
-			
+
 			Map<String, String> fieldLabelToOutputFieldLabel = new HashMap<String, String>();
-			
+
 			String aggregationRules = "(count(DISTINCT ?document) AS ?numOfPublications)";
-			
-			String whereClause = 
-				"<" + individualURI + "> rdf:type foaf:Person ;" 
+
+			String whereClause =
+				"<" + individualURI + "> rdf:type foaf:Person ;"
 					+ " core:relatedBy ?authorshipNode . \n"
-				+ "?authorshipNode rdf:type core:Authorship ;" 
+				+ "?authorshipNode rdf:type core:Authorship ;"
 					+ " core:relates ?document . \n"
 				+ "?document rdf:type bibo:Document .";
 
-			String groupOrderClause = "GROUP BY ?" + QueryFieldLabels.AUTHOR_URL + " \n"; 
-			
+			String groupOrderClause = "GROUP BY ?" + QueryFieldLabels.AUTHOR_URL + " \n";
+
 			GenericQueryRunner numberOfPublicationsQueryHandler =
 			new GenericQueryRunner(fieldLabelToOutputFieldLabel,
 									aggregationRules,
@@ -153,27 +153,27 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 						.equalsIgnoreCase(visMode)) {
 
 			Map<String, String> fieldLabelToOutputFieldLabel = new HashMap<String, String>();
-			
+
 			String aggregationRules = "(count(DISTINCT ?Grant) AS ?numOfGrants)";
 			String grantType = "http://vivoweb.org/ontology/core#Grant";
 
 			ObjectProperty predicate = ModelUtils.getPropertyForRoleInClass(grantType, vitroRequest.getWebappDaoFactory());
 			String roleToGrantPredicate = "<" + predicate.getURI() + ">";
-			String whereClause = "{ <" + individualURI + "> rdf:type foaf:Person ;" 
+			String whereClause = "{ <" + individualURI + "> rdf:type foaf:Person ;"
 										+ " <http://purl.obolibrary.org/obo/RO_0000053> ?Role . \n"
 									+ "?Role rdf:type core:PrincipalInvestigatorRole . \n"
 									+ "?Role " + roleToGrantPredicate + " ?Grant . }"
 									+ "UNION \n"
-									+ "{ <" + individualURI + "> rdf:type foaf:Person ;" 
+									+ "{ <" + individualURI + "> rdf:type foaf:Person ;"
 										+ " <http://purl.obolibrary.org/obo/RO_0000053> ?Role . \n"
 									+ "?Role rdf:type core:CoPrincipalInvestigatorRole . \n"
 									+ "?Role " + roleToGrantPredicate + " ?Grant . }"
 									+ "UNION \n"
-									+ "{ <" + individualURI + "> rdf:type foaf:Person ;" 
+									+ "{ <" + individualURI + "> rdf:type foaf:Person ;"
 										+ " <http://purl.obolibrary.org/obo/RO_0000053> ?Role . \n"
 									+ "?Role rdf:type core:InvestigatorRole. \n"
     								+ "?Role vitro:mostSpecificType ?subclass . \n"
-									+ "?Role " + roleToGrantPredicate + " ?Grant . \n" 
+									+ "?Role " + roleToGrantPredicate + " ?Grant . \n"
 									+ "FILTER (?subclass != core:PrincipalInvestigatorRole && "
 									+ "?subclass != core:CoPrincipalInvestigatorRole)}";
 
@@ -183,30 +183,30 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 									whereClause,
 									"",
 									dataset);
-			
+
 			NumGrantsForIndividualConsumer consumer = new NumGrantsForIndividualConsumer();
 			numberOfGrantsQueryHandler.sparqlSelectQuery(vitroRequest.getRDFService(), consumer);
 
 			ObjectMapper mapper = new ObjectMapper();
 			return mapper.writeValueAsString(consumer.getMap());
-				
+
 		} else if (VisualizationFrameworkConstants.COAUTHOR_UTILS_VIS_MODE
 						.equalsIgnoreCase(visMode)) {
-			
-			
-			
+
+
+
 			String individualLocalName = UtilityFunctions.getIndividualLocalName(
 					individualURI,
 					vitroRequest);
 
 			if (StringUtils.isNotBlank(individualLocalName)) {
-			
+
 				return UrlBuilder.getUrl(VisualizationFrameworkConstants.SHORT_URL_VISUALIZATION_REQUEST_PREFIX)
-				 			+ "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL 
+				 			+ "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL
 				 			+ "/" + individualLocalName;
-				
-			} 
-			
+
+			}
+
 			ParamMap coAuthorProfileURLParams = new ParamMap(
 					VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
 					individualURI,
@@ -218,25 +218,25 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 			return UrlBuilder.getUrl(
 						VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX,
 						coAuthorProfileURLParams);
-			
+
 		} else if (VisualizationFrameworkConstants.COPI_UTILS_VIS_MODE
 						.equalsIgnoreCase(visMode)) {
-			
-			
+
+
 			String individualLocalName = UtilityFunctions.getIndividualLocalName(
 					individualURI,
 					vitroRequest);
 
 			if (StringUtils.isNotBlank(individualLocalName)) {
-			
+
 				return UrlBuilder.getUrl(VisualizationFrameworkConstants.SHORT_URL_VISUALIZATION_REQUEST_PREFIX)
 				 			+ "/" + VisualizationFrameworkConstants.COINVESTIGATOR_VIS_SHORT_URL
 				 			+ "/" + individualLocalName;
-				
-			} 
-			
+
+			}
+
 	    	/*
-	    	 * By default we will be generating profile url else some specific url like 
+	    	 * By default we will be generating profile url else some specific url like
 	    	 * coPI vis url for that individual.
 	    	 * */
 			ParamMap coInvestigatorProfileURLParams = new ParamMap(
@@ -246,15 +246,15 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 								VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
 								VisualizationFrameworkConstants.VIS_MODE_KEY,
 								VisualizationFrameworkConstants.COPI_VIS_MODE);
-			
+
 			return UrlBuilder.getUrl(
 							VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX,
 							coInvestigatorProfileURLParams);
-			
+
 		} else if (VisualizationFrameworkConstants.PERSON_LEVEL_UTILS_VIS_MODE
 						.equalsIgnoreCase(visMode)) {
 	    	/*
-	    	 * By default we will be generating profile url else some specific url like 
+	    	 * By default we will be generating profile url else some specific url like
 	    	 * coAuthorShip vis url for that individual.
 	    	 * */
 			ParamMap personLevelURLParams = new ParamMap(
@@ -264,34 +264,34 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 							VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
 							VisualizationFrameworkConstants.RENDER_MODE_KEY,
 							VisualizationFrameworkConstants.STANDALONE_RENDER_MODE);
-			
+
 			return UrlBuilder.getUrl(
 							VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX,
 							personLevelURLParams);
-			
+
 		} else if (VisualizationFrameworkConstants.HIGHEST_LEVEL_ORGANIZATION_VIS_MODE
 						.equalsIgnoreCase(visMode)) {
-			
+
 			String staffProvidedHighestLevelOrganization = ConfigurationProperties
 						.getBean(vitroRequest).getProperty("visualization.topLevelOrg");
-			
+
 			/*
-			 * First checking if the staff has provided highest level organization in 
+			 * First checking if the staff has provided highest level organization in
 			 * deploy.properties if so use to temporal graph vis.
 			 * */
 			if (StringUtils.isNotBlank(staffProvidedHighestLevelOrganization)) {
-				
+
 				/*
 	        	 * To test for the validity of the URI submitted.
 	        	 * */
 	        	IRIFactory iRIFactory = IRIFactory.jenaImplementation();
 	    		IRI iri = iRIFactory.create(staffProvidedHighestLevelOrganization);
-	            
+
 	    		if (iri.hasViolation(false)) {
-	            	
+
 	                String errorMsg = ((Violation) iri.violations(false).next()).getShortMessage();
 	                log.error("Highest Level Organization URI provided is invalid " + errorMsg);
-	                
+
 	            } else {
 
 					ParamMap highestLevelOrganizationTemporalGraphVisURLParams = new ParamMap(
@@ -303,30 +303,30 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 					return UrlBuilder.getUrl(
 							VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX,
 							highestLevelOrganizationTemporalGraphVisURLParams);
-					
+
 	            }
 			}
-			
+
 			Map<String, String> fieldLabelToOutputFieldLabel = new HashMap<String, String>();
-			fieldLabelToOutputFieldLabel.put("organization", 
+			fieldLabelToOutputFieldLabel.put("organization",
 											  QueryFieldLabels.ORGANIZATION_URL);
-			fieldLabelToOutputFieldLabel.put("organizationLabel", 
+			fieldLabelToOutputFieldLabel.put("organizationLabel",
 											 QueryFieldLabels.ORGANIZATION_LABEL);
-			
+
 			String aggregationRules = "(count(?organization) AS ?numOfChildren)";
-			
-			String whereClause = "?organization rdf:type foaf:Organization ;" 
-								+ " rdfs:label ?organizationLabel . \n"  
+
+			String whereClause = "?organization rdf:type foaf:Organization ;"
+								+ " rdfs:label ?organizationLabel . \n"
 							    + "OPTIONAL { ?organization core:http://purl.obolibrary.org/obo/BFO_0000051 ?subOrg  . \n"
 						        + "           ?subOrg rdf:type foaf:Organization } . \n"
 							    + "OPTIONAL { ?organization core:http://purl.obolibrary.org/obo/BFO_0000050 ?parent } . \n"
 				                + "           ?parent rdf:type foaf:Organization } . \n"
 							    + "FILTER ( !bound(?parent) ). \n";
-			
-			String groupOrderClause = "GROUP BY ?organization ?organizationLabel \n" 
-										+ "ORDER BY DESC(?numOfChildren)\n" 
+
+			String groupOrderClause = "GROUP BY ?organization ?organizationLabel \n"
+										+ "ORDER BY DESC(?numOfChildren)\n"
 										+ "LIMIT 1\n";
-			
+
 			GenericQueryRunner highestLevelOrganizationQueryHandler =
 					new GenericQueryRunner(fieldLabelToOutputFieldLabel,
 											aggregationRules,
@@ -337,13 +337,13 @@ public Object generateAjaxVisualization(VitroRequest vitroRequest,
 			HighetTopLevelOrgTemporalGraphURLConsumer consumer = new HighetTopLevelOrgTemporalGraphURLConsumer(vitroRequest, fieldLabelToOutputFieldLabel);
 			highestLevelOrganizationQueryHandler.sparqlSelectQuery(vitroRequest.getRDFService(), consumer);
 			return consumer.getTopLevelURL();
-			
+
 		} else {
-			
+
 			ParamMap individualProfileURLParams = new ParamMap(
 							VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
 							individualURI);
-			
+
 			return UrlBuilder.getUrl(VisualizationFrameworkConstants.INDIVIDUAL_URL_PREFIX,
 											individualProfileURLParams);
 		}
@@ -467,13 +467,13 @@ public String getInformation() {
 	private String getThumbnailInformation(ResultSet resultSet,
 										   Map<String, String> fieldLabelToOutputFieldLabel,
 										   VitroRequest vitroRequest) {
-		
+
 		String finalThumbNailLocation = "";
-		
+
 		while (resultSet.hasNext())  {
 			QuerySolution solution = resultSet.nextSolution();
-			
-			
+
+
 		}
 		return finalThumbNailLocation;
 	}
@@ -491,12 +491,12 @@ public ResponseValues generateStandardVisualization(
 			throws MalformedQueryParametersException {
 		throw new UnsupportedOperationException("Utilities does not provide Standard Response.");
 	}
-	
+
 	@Override
 	public ResponseValues generateVisualizationForShortURLRequests(
 			Map<String, String> parameters, VitroRequest vitroRequest, Log log,
 			Dataset dataSource) throws MalformedQueryParametersException {
-		throw new UnsupportedOperationException("Utilities Visualization does not provide " 
+		throw new UnsupportedOperationException("Utilities Visualization does not provide "
 					+ "Short URL Response.");
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java
index 4793ec79a1..96298a78bc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java
@@ -6,28 +6,28 @@
 
 /**
  * This interface will make sure that VOs conveying any person's academic output like publications,
- * grants etc implement certain methods which will be used to generalize methods which are just 
- * interested in certain common properties like what was the year in which the activity was 
- * published (or started). 
+ * grants etc implement certain methods which will be used to generalize methods which are just
+ * interested in certain common properties like what was the year in which the activity was
+ * published (or started).
  * @author cdtank
  */
 public class Activity extends Individual {
-	
+
 	private String activityDate;
 	private String activityType;
 
 	public Activity(String activityURI) {
 		super(activityURI);
 	}
-	
+
 	public String getActivityURI() {
 		return this.getIndividualURI();
 	}
-	
+
 	public String getActivityLabel() {
 		return this.getIndividualLabel();
 	}
-	
+
 	public void setActivityLabel(String activityLabel) {
 		this.setIndividualLabel(activityLabel);
 	}
@@ -35,21 +35,21 @@ public void setActivityLabel(String activityLabel) {
 	public String getActivityType() { return this.activityType; }
 
 	public void setActivityType(String activityType) { this.activityType = activityType; }
-	
+
 	/**
-	 * This method will be called to get the final/inferred year for the publication. 
+	 * This method will be called to get the final/inferred year for the publication.
 	 * The 2 choices, in order, are,
-	 * 		1. parsed year from xs:DateTime object saved in core:dateTimeValue 
-	 * 		2. Default Publication Year 
+	 * 		1. parsed year from xs:DateTime object saved in core:dateTimeValue
+	 * 		2. Default Publication Year
 	 */
 	public String getParsedActivityYear() {
-		
+
 		return UtilityFunctions.getValidYearFromCoreDateTimeString(activityDate,
 				VOConstants.DEFAULT_ACTIVITY_YEAR);
 	}
-	
+
 	/**
-	 * This method should be used to get the raw date & not the parsed publication year. 
+	 * This method should be used to get the raw date & not the parsed publication year.
 	 * For the later use getParsedPublicationYear.
 	 */
 	public String getActivityDate() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java
index ebe666bfc8..bc78735272 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java
@@ -1,153 +1,153 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-
-/**
- * 
- * This is stores collaboration information mainly for ego-centric visualizations.
- * 
- * @author cdtank
- *
- */
-public class Collaboration {
-
-	private int collaborationID;
-	private Map<String, Integer> yearToActivityCount;
-	private Set<Activity> activities = new HashSet<Activity>();
-	private Collaborator sourceCollaborator;
-	private Collaborator targetCollaborator;
-
-	public Collaboration(Collaborator sourceCollaborator, 
-						 Collaborator  targetCollaborator, 
-						 Activity seedActivity,
-						 UniqueIDGenerator uniqueIDGenerator) {
-		collaborationID = uniqueIDGenerator.getNextNumericID();
-		this.sourceCollaborator = sourceCollaborator;
-		this.targetCollaborator = targetCollaborator;
-		this.activities.add(seedActivity);
-	}
-
-	public int getCollaborationID() {
-		return collaborationID;
-	}
-	
-	public Collaborator getSourceCollaborator() {
-		return sourceCollaborator;
-	}
-
-	public Collaborator getTargetCollaborator() {
-		return targetCollaborator;
-	}
-	
-	public Set<Activity> getCollaborationActivities() {
-		return activities;
-	}
-	
-	public int getNumOfCollaborations() {
-		return activities.size();
-	}
-
-	public void addActivity(Activity activity) {
-		this.activities.add(activity);
-	}
-	
-	public Map<String, Integer> getYearToActivityCount() {
-		if (yearToActivityCount == null) {
-			yearToActivityCount = UtilityFunctions.getYearToActivityCount(activities);
-		}
-		return yearToActivityCount;
-	}
-	
-	/*
-	 * getEarliest, Latest & Unknown Activity YearCount should only be used after 
-	 * the parsing of the entire sparql is done. Else it will give results based on
-	 * incomplete dataset.
-	 * */
-	@SuppressWarnings("serial")
-	public Map<String, Integer> getEarliestCollaborationYearCount() {
-
-		/*
-		 * We do not want to consider the default Activity year when we are checking 
-		 * for the min or max Activity year. 
-		 * */
-		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
-																	.keySet());
-		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
-		
-		/*
-		 * There can be a case when the only Activity the author has no attached year to it
-		 * so essentially an "Unknown". In that case Collections.max or min will throw an 
-		 * NoSuchElementException.
-		 * 
-		 * If there is no maximum year available then we should imply so by returning a "null".
-		 * */
-		if (yearsToBeConsidered.size() > 0) {
-			final String earliestYear = Collections.min(yearsToBeConsidered);
-			final Integer earliestYearActivityCount = this.getYearToActivityCount()
-															.get(earliestYear);
-			
-			return new HashMap<String, Integer>() { {
-				put(earliestYear, earliestYearActivityCount);
-			} };
-		} else {
-			return null;
-		}
-	}
-
-	@SuppressWarnings("serial")
-	public Map<String, Integer> getLatestCollaborationYearCount() {
-		
-		/*
-		 * We do not want to consider the default Activity year when we are checking 
-		 * for the min or max Activity year. 
-		 * */
-		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
-																	.keySet());
-		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
-		
-		/*
-		 * There can be a case when the only Activity the collaborator has no attached year to it
-		 * so essentially an "Unknown". In that case Collections.max or min will throw an 
-		 * NoSuchElementException.
-		 * 
-		 * If there is no maximum year available then we should imply so by returning a "null".
-		 * */
-		if (yearsToBeConsidered.size() > 0) {
-			final String latestYear = Collections.max(yearsToBeConsidered);
-			final Integer latestYearActivityCount = this.getYearToActivityCount().get(latestYear);
-			
-			return new HashMap<String, Integer>() { {
-				put(latestYear, latestYearActivityCount);
-			} };
-		} else {
-			return null;
-		}
-	}
-	
-	public Integer getUnknownCollaborationYearCount() {
-		
-		Integer unknownYearActivityCount = this.getYearToActivityCount()
-										.get(VOConstants.DEFAULT_ACTIVITY_YEAR);
-		
-		/*
-		 * If there is no unknown year available then we should imply so by returning a "null".
-		 * */
-		if (unknownYearActivityCount != null) {
-			return unknownYearActivityCount;
-		} else {
-			return null;
-		}
-	}
-	
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+
+/**
+ *
+ * This is stores collaboration information mainly for ego-centric visualizations.
+ *
+ * @author cdtank
+ *
+ */
+public class Collaboration {
+
+	private int collaborationID;
+	private Map<String, Integer> yearToActivityCount;
+	private Set<Activity> activities = new HashSet<Activity>();
+	private Collaborator sourceCollaborator;
+	private Collaborator targetCollaborator;
+
+	public Collaboration(Collaborator sourceCollaborator,
+						 Collaborator  targetCollaborator,
+						 Activity seedActivity,
+						 UniqueIDGenerator uniqueIDGenerator) {
+		collaborationID = uniqueIDGenerator.getNextNumericID();
+		this.sourceCollaborator = sourceCollaborator;
+		this.targetCollaborator = targetCollaborator;
+		this.activities.add(seedActivity);
+	}
+
+	public int getCollaborationID() {
+		return collaborationID;
+	}
+
+	public Collaborator getSourceCollaborator() {
+		return sourceCollaborator;
+	}
+
+	public Collaborator getTargetCollaborator() {
+		return targetCollaborator;
+	}
+
+	public Set<Activity> getCollaborationActivities() {
+		return activities;
+	}
+
+	public int getNumOfCollaborations() {
+		return activities.size();
+	}
+
+	public void addActivity(Activity activity) {
+		this.activities.add(activity);
+	}
+
+	public Map<String, Integer> getYearToActivityCount() {
+		if (yearToActivityCount == null) {
+			yearToActivityCount = UtilityFunctions.getYearToActivityCount(activities);
+		}
+		return yearToActivityCount;
+	}
+
+	/*
+	 * getEarliest, Latest & Unknown Activity YearCount should only be used after
+	 * the parsing of the entire sparql is done. Else it will give results based on
+	 * incomplete dataset.
+	 * */
+	@SuppressWarnings("serial")
+	public Map<String, Integer> getEarliestCollaborationYearCount() {
+
+		/*
+		 * We do not want to consider the default Activity year when we are checking
+		 * for the min or max Activity year.
+		 * */
+		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
+																	.keySet());
+		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
+
+		/*
+		 * There can be a case when the only Activity the author has no attached year to it
+		 * so essentially an "Unknown". In that case Collections.max or min will throw an
+		 * NoSuchElementException.
+		 *
+		 * If there is no maximum year available then we should imply so by returning a "null".
+		 * */
+		if (yearsToBeConsidered.size() > 0) {
+			final String earliestYear = Collections.min(yearsToBeConsidered);
+			final Integer earliestYearActivityCount = this.getYearToActivityCount()
+															.get(earliestYear);
+
+			return new HashMap<String, Integer>() { {
+				put(earliestYear, earliestYearActivityCount);
+			} };
+		} else {
+			return null;
+		}
+	}
+
+	@SuppressWarnings("serial")
+	public Map<String, Integer> getLatestCollaborationYearCount() {
+
+		/*
+		 * We do not want to consider the default Activity year when we are checking
+		 * for the min or max Activity year.
+		 * */
+		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
+																	.keySet());
+		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
+
+		/*
+		 * There can be a case when the only Activity the collaborator has no attached year to it
+		 * so essentially an "Unknown". In that case Collections.max or min will throw an
+		 * NoSuchElementException.
+		 *
+		 * If there is no maximum year available then we should imply so by returning a "null".
+		 * */
+		if (yearsToBeConsidered.size() > 0) {
+			final String latestYear = Collections.max(yearsToBeConsidered);
+			final Integer latestYearActivityCount = this.getYearToActivityCount().get(latestYear);
+
+			return new HashMap<String, Integer>() { {
+				put(latestYear, latestYearActivityCount);
+			} };
+		} else {
+			return null;
+		}
+	}
+
+	public Integer getUnknownCollaborationYearCount() {
+
+		Integer unknownYearActivityCount = this.getYearToActivityCount()
+										.get(VOConstants.DEFAULT_ACTIVITY_YEAR);
+
+		/*
+		 * If there is no unknown year available then we should imply so by returning a "null".
+		 * */
+		if (unknownYearActivityCount != null) {
+			return unknownYearActivityCount;
+		} else {
+			return null;
+		}
+	}
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java
index d2c5bc4067..325fd63f0a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java
@@ -1,150 +1,150 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
-
-/**
- * 
- * This stores collbaorator's information involved in ego-centric networks & represents
- * a collaborator's activities.
- * 
- * @author cdtank
- */
-public class Collaborator extends Individual {
-
-	private int collaboratorID;
-	private Map<String, Integer> yearToActivityCount;
-
-	private Set<Activity> activities = new HashSet<Activity>();
-
-	public Collaborator(String collaboratorURI,
-				UniqueIDGenerator uniqueIDGenerator) {
-		super(collaboratorURI);
-		collaboratorID = uniqueIDGenerator.getNextNumericID();
-	}
-
-	public int getCollaboratorID() {
-		return collaboratorID;
-	}
-	
-	public String getCollaboratorURI() {
-		return this.getIndividualURI();
-	}
-
-	public String getCollaboratorName() {
-		return this.getIndividualLabel();
-	}
-	
-	public void setCollaboratorName(String collaboratorName) {
-		this.setIndividualLabel(collaboratorName);
-	}
-	
-	public Set<Activity> getCollaboratorActivities() {
-		return activities;
-	}
-	
-	public int getNumOfActivities() {
-		return activities.size();
-	}
-
-	public void addActivity(Activity activity) {
-		this.activities.add(activity);
-	}
-	
-	public Map<String, Integer> getYearToActivityCount() {
-		if (yearToActivityCount == null) {
-			yearToActivityCount = UtilityFunctions.getYearToActivityCount(activities);
-		}
-		return yearToActivityCount;
-	}
-	
-	/*
-	 * getEarliest, Latest & Unknown Collaborator YearCount should only be used after 
-	 * the parsing of the entire sparql is done. Else it will give results based on
-	 * incomplete dataset.
-	 * */
-	@SuppressWarnings("serial")
-	public Map<String, Integer> getEarliestActivityYearCount() {
-
-		/*
-		 * We do not want to consider the default activity year when we are checking 
-		 * for the min or max activity year. 
-		 * */
-		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
-																	.keySet());
-		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
-		
-		/*
-		 * There can be a case when the only activity the collaborator has no attached year to it
-		 * so essentially an "Unknown". In that case Collections.max or min will throw an 
-		 * NoSuchElementException.
-		 * 
-		 * If there is no maximum year available then we should imply so by returning a "null".
-		 * */
-		if (yearsToBeConsidered.size() > 0) {
-			final String earliestYear = Collections.min(yearsToBeConsidered);
-			final Integer earliestYearActivityCount = this.getYearToActivityCount()
-															.get(earliestYear);
-			
-			return new HashMap<String, Integer>() { {
-				put(earliestYear, earliestYearActivityCount);
-			} };
-		} else {
-			return null;
-		}
-	}
-
-	@SuppressWarnings("serial")
-	public Map<String, Integer> getLatestActivityYearCount() {
-
-		/*
-		 * We do not want to consider the default Activity year when we are checking 
-		 * for the min or max Activity year. 
-		 * */
-		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
-																	.keySet());
-		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
-		
-		/*
-		 * There can be a case when the only Activity the author has no attached year to it
-		 * so essentially an "Unknown". In that case Collections.max or min will throw an 
-		 * NoSuchElementException.
-		 * 
-		 * If there is no maximum year available then we should imply so by returning a "null".
-		 * */
-		if (yearsToBeConsidered.size() > 0) {
-			final String latestYear = Collections.max(yearsToBeConsidered);
-			final Integer latestYearActivityCount = this.getYearToActivityCount().get(latestYear);
-			
-			return new HashMap<String, Integer>() { {
-				put(latestYear, latestYearActivityCount);
-			} };
-		} else {
-			return null;
-		}
-	}
-	
-	public Integer getUnknownActivityYearCount() {
-		
-		Integer unknownYearActivityCount = this.getYearToActivityCount()
-											.get(VOConstants.DEFAULT_ACTIVITY_YEAR);
-		
-		/*
-		 * If there is no unknown year available then we should imply so by returning a "null".
-		 * */
-		if (unknownYearActivityCount != null) {
-			return unknownYearActivityCount;
-		} else {
-			return null;
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator;
+import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
+
+/**
+ *
+ * This stores collbaorator's information involved in ego-centric networks & represents
+ * a collaborator's activities.
+ *
+ * @author cdtank
+ */
+public class Collaborator extends Individual {
+
+	private int collaboratorID;
+	private Map<String, Integer> yearToActivityCount;
+
+	private Set<Activity> activities = new HashSet<Activity>();
+
+	public Collaborator(String collaboratorURI,
+				UniqueIDGenerator uniqueIDGenerator) {
+		super(collaboratorURI);
+		collaboratorID = uniqueIDGenerator.getNextNumericID();
+	}
+
+	public int getCollaboratorID() {
+		return collaboratorID;
+	}
+
+	public String getCollaboratorURI() {
+		return this.getIndividualURI();
+	}
+
+	public String getCollaboratorName() {
+		return this.getIndividualLabel();
+	}
+
+	public void setCollaboratorName(String collaboratorName) {
+		this.setIndividualLabel(collaboratorName);
+	}
+
+	public Set<Activity> getCollaboratorActivities() {
+		return activities;
+	}
+
+	public int getNumOfActivities() {
+		return activities.size();
+	}
+
+	public void addActivity(Activity activity) {
+		this.activities.add(activity);
+	}
+
+	public Map<String, Integer> getYearToActivityCount() {
+		if (yearToActivityCount == null) {
+			yearToActivityCount = UtilityFunctions.getYearToActivityCount(activities);
+		}
+		return yearToActivityCount;
+	}
+
+	/*
+	 * getEarliest, Latest & Unknown Collaborator YearCount should only be used after
+	 * the parsing of the entire sparql is done. Else it will give results based on
+	 * incomplete dataset.
+	 * */
+	@SuppressWarnings("serial")
+	public Map<String, Integer> getEarliestActivityYearCount() {
+
+		/*
+		 * We do not want to consider the default activity year when we are checking
+		 * for the min or max activity year.
+		 * */
+		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
+																	.keySet());
+		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
+
+		/*
+		 * There can be a case when the only activity the collaborator has no attached year to it
+		 * so essentially an "Unknown". In that case Collections.max or min will throw an
+		 * NoSuchElementException.
+		 *
+		 * If there is no maximum year available then we should imply so by returning a "null".
+		 * */
+		if (yearsToBeConsidered.size() > 0) {
+			final String earliestYear = Collections.min(yearsToBeConsidered);
+			final Integer earliestYearActivityCount = this.getYearToActivityCount()
+															.get(earliestYear);
+
+			return new HashMap<String, Integer>() { {
+				put(earliestYear, earliestYearActivityCount);
+			} };
+		} else {
+			return null;
+		}
+	}
+
+	@SuppressWarnings("serial")
+	public Map<String, Integer> getLatestActivityYearCount() {
+
+		/*
+		 * We do not want to consider the default Activity year when we are checking
+		 * for the min or max Activity year.
+		 * */
+		Set<String> yearsToBeConsidered = new HashSet<String>(this.getYearToActivityCount()
+																	.keySet());
+		yearsToBeConsidered.remove(VOConstants.DEFAULT_ACTIVITY_YEAR);
+
+		/*
+		 * There can be a case when the only Activity the author has no attached year to it
+		 * so essentially an "Unknown". In that case Collections.max or min will throw an
+		 * NoSuchElementException.
+		 *
+		 * If there is no maximum year available then we should imply so by returning a "null".
+		 * */
+		if (yearsToBeConsidered.size() > 0) {
+			final String latestYear = Collections.max(yearsToBeConsidered);
+			final Integer latestYearActivityCount = this.getYearToActivityCount().get(latestYear);
+
+			return new HashMap<String, Integer>() { {
+				put(latestYear, latestYearActivityCount);
+			} };
+		} else {
+			return null;
+		}
+	}
+
+	public Integer getUnknownActivityYearCount() {
+
+		Integer unknownYearActivityCount = this.getYearToActivityCount()
+											.get(VOConstants.DEFAULT_ACTIVITY_YEAR);
+
+		/*
+		 * If there is no unknown year available then we should imply so by returning a "null".
+		 * */
+		if (unknownYearActivityCount != null) {
+			return unknownYearActivityCount;
+		} else {
+			return null;
+		}
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java
index 5dfcbf1696..cab6a2beed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java
@@ -5,7 +5,7 @@
 
 @SuppressWarnings("deprecation")
 public class ConstructedModel {
-	
+
 	private String uri;
 	private String individualLabel;
 	private String type;
@@ -16,7 +16,7 @@ public ConstructedModel(String type, String uri) {
 		this.humanReadableType = ModelConstructorUtilities.modelTypeToHumanReadableName.get(type);
 		this.uri = uri == null ? "" : uri;
 	}
-	
+
 	public String getUri() {
 		return uri;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java
index da4e5c3bb8..fb48d38dbc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java
@@ -11,38 +11,38 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.IllegalConstructedModelIdentifierException;
 
 public class ConstructedModelTracker {
-	
+
 	private static Map<String, Model> modelIdentifierToConstructedModel = new HashMap<String, Model>();
-	
+
 	public static void trackModel(String identifier, Model model) {
 		modelIdentifierToConstructedModel.put(identifier, model);
 	}
-	
+
 	public static Model getModel(String identifier) {
 		return modelIdentifierToConstructedModel.get(identifier);
 	}
-	
+
 	public static Model removeModel(String uri, String modelType) {
 		return modelIdentifierToConstructedModel.remove(generateModelIdentifier(uri, modelType));
 	}
-	
+
 	public static String generateModelIdentifier(String uri, String modelType) {
-		
+
 		if (uri == null) {
 			uri = "";
 		}
 		return modelType +  "$" + uri;
 	}
-	
+
 	public static Map<String, Model> getAllModels() {
 		return modelIdentifierToConstructedModel;
 	}
-	
-	public static ConstructedModel parseModelIdentifier(String modelIdentifier) 
+
+	public static ConstructedModel parseModelIdentifier(String modelIdentifier)
 			throws IllegalConstructedModelIdentifierException {
-		
+
 		String[] parts = StringUtils.split(modelIdentifier, '$');
-		
+
 		if (parts.length == 0) {
 			throw new IllegalConstructedModelIdentifierException(modelIdentifier + " provided.");
 		} else if (parts.length == 1) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java
index a3ec63aa79..3ad97bbd34 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java
@@ -7,29 +7,29 @@
 
 /**
  * original @author bkoniden (Deepak Konidena)
- * modified by @author cdtank (Chintan Tank) 
+ * modified by @author cdtank (Chintan Tank)
  */
 public class Entity extends Individual {
-	
+
 	private Set<Individual> parents = new LinkedHashSet<Individual>();
 	private Set<SubEntity> children = new LinkedHashSet<SubEntity>();
-	
+
 	public Entity(String entityURI, String entityLabel) {
 		super(entityURI, entityLabel);
 	}
-	
+
 	public Entity(String entityURI) {
 		super(entityURI);
 	}
-	
+
 	public String getEntityURI() {
 		return this.getIndividualURI();
 	}
-	
+
 	public String getEntityLabel() {
 		return this.getIndividualLabel();
 	}
-	
+
 	public void setEntityLabel(String label) {
 		this.setIndividualLabel(label);
 	}
@@ -37,7 +37,7 @@ public void setEntityLabel(String label) {
 	public Set<SubEntity> getSubEntities() {
 		return children;
 	}
-	
+
 	public Set<Individual> getParents() {
 		return parents;
 	}
@@ -45,13 +45,13 @@ public Set<Individual> getParents() {
 	public void addSubEntity(SubEntity subEntity) {
 		this.children.add(subEntity);
 	}
-	
+
 	public void addSubEntitities(Collection<SubEntity> subEntities) {
 		this.children.addAll(subEntities);
 	}
-	
+
 	public void addParents(Collection<Individual> parents) {
 		this.parents.addAll(parents);
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java
index fde0df8321..de8f4a99fd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java
@@ -1,41 +1,41 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Right now this is just acting as a hashmap but in future we would want to provide
- * more detailed info other than just what properties had what values. E.g. we
- * could parse properties (& its values) to look for what namespaces are used. 
- * 
- * @author cdtank
- */
-@SuppressWarnings("serial")
-public class GenericQueryMap extends HashMap<String, Set<String>> {
-
-	public GenericQueryMap() {
-		super();
-	}
-	
-	public void addEntry(String property, String value) {
-		
-		Set<String> values;
-		
-		if (this.containsKey(property)) {
-			
-			values = this.get(property);
-			values.add(value);
-			
-		} else {
-			
-			values = new HashSet<String>();
-			values.add(value);
-			this.put(property, values);
-			
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Right now this is just acting as a hashmap but in future we would want to provide
+ * more detailed info other than just what properties had what values. E.g. we
+ * could parse properties (& its values) to look for what namespaces are used.
+ *
+ * @author cdtank
+ */
+@SuppressWarnings("serial")
+public class GenericQueryMap extends HashMap<String, Set<String>> {
+
+	public GenericQueryMap() {
+		super();
+	}
+
+	public void addEntry(String property, String value) {
+
+		Set<String> values;
+
+		if (this.containsKey(property)) {
+
+			values = this.get(property);
+			values.add(value);
+
+		} else {
+
+			values = new HashSet<String>();
+			values.add(value);
+			this.put(property, values);
+
+		}
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java
index af8cada7f5..8bd40c89ce 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java
@@ -1,32 +1,32 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
-
-public class Individual {
-	
-	private String individualLabel;
-	private String individualURI;
-	
-	public Individual(String individualURI, String individualLabel) {
-		this.individualURI = individualURI;
-		this.individualLabel = individualLabel;
-	}
-	
-	public Individual(String individualURI) {
-		this(individualURI, "");
-	}
-	
-	public String getIndividualLabel() {
-		return individualLabel;
-	}
-	
-	public void setIndividualLabel(String individualLabel) {
-		this.individualLabel = individualLabel;
-	}
-
-	public String getIndividualURI() {
-		return individualURI;
-	}
-	
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
+
+public class Individual {
+
+	private String individualLabel;
+	private String individualURI;
+
+	public Individual(String individualURI, String individualLabel) {
+		this.individualURI = individualURI;
+		this.individualLabel = individualLabel;
+	}
+
+	public Individual(String individualURI) {
+		this(individualURI, "");
+	}
+
+	public String getIndividualLabel() {
+		return individualLabel;
+	}
+
+	public void setIndividualLabel(String individualLabel) {
+		this.individualLabel = individualLabel;
+	}
+
+	public String getIndividualURI() {
+		return individualURI;
+	}
+
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
index 3e9fee18a4..5b0a4e9135 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
@@ -4,7 +4,7 @@
 public class MapOfScienceActivity extends Activity {
 
 	private String publishedInJournal;
-	
+
 	public MapOfScienceActivity(String activityURI) {
 		super(activityURI);
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java
index 37685b9214..324f8945a8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java
@@ -1,167 +1,167 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
-
-import java.util.List;
-import java.util.Map;
-
-public class SparklineData {
-	
-	private Integer earliestYearConsidered;
-	private Integer earliestRenderedPublicationYear;
-	private Integer latestRenderedPublicationYear;
-	private Integer earliestRenderedGrantYear;
-	private Integer latestRenderedGrantYear;
-	
-	private Integer renderedSparks;
-	private Integer unknownYearPublications;
-	private Integer unknownYearGrants;
-	
-	private Integer totalCollaborationshipCount;
-	
-	private Map<String, Integer> yearToActivityCount;
-	
-	private String downloadDataLink = "";
-	private String fullTimelineNetworkLink = "";
-	
-	private String visContainerDivID = "pub_count_vis_container";
-	
-	private boolean isShortVisMode = true;
-	
-	private List<YearToEntityCountDataElement> yearToEntityCountDataTable;
-	
-	private int numOfYearsToBeRendered;
-
-	public void setTotalCollaborationshipCount(
-			Integer totalCollaborationshipCount) {
-		this.totalCollaborationshipCount = totalCollaborationshipCount;
-	}
-
-	public Integer getTotalCollaborationshipCount() {
-		return totalCollaborationshipCount;
-	}
-
-	public Integer getEarliestRenderedGrantYear() {
-		return earliestRenderedGrantYear;
-	}
-
-	public void setEarliestRenderedGrantYear(Integer earliestRenderedGrantYear) {
-		this.earliestRenderedGrantYear = earliestRenderedGrantYear;
-	}
-
-	public Integer getLatestRenderedGrantYear() {
-		return latestRenderedGrantYear;
-	}
-
-	public void setLatestRenderedGrantYear(Integer latestRenderedGrantYear) {
-		this.latestRenderedGrantYear = latestRenderedGrantYear;
-	}
-
-	public Integer getUnknownYearGrants() {
-		return unknownYearGrants;
-	}
-
-	public void setUnknownYearGrants(Integer unknownYearGrants) {
-		this.unknownYearGrants = unknownYearGrants;
-	}
-
-	public void setNumOfYearsToBeRendered(int numOfYearsToBeRendered) {
-		this.numOfYearsToBeRendered = numOfYearsToBeRendered;
-	}
-
-	public int getNumOfYearsToBeRendered() {
-		return numOfYearsToBeRendered;
-	}
-
-	public void setYearToEntityCountDataTable(
-			List<YearToEntityCountDataElement> yearToEntityCountDataTable) {
-		this.yearToEntityCountDataTable = yearToEntityCountDataTable;
-	}
-
-	public List<YearToEntityCountDataElement> getYearToEntityCountDataTable() {
-		return yearToEntityCountDataTable;
-	}
-
-	public void setYearToActivityCount(Map<String, Integer> yearToActivityCount) {
-		this.yearToActivityCount = yearToActivityCount;
-	}
-
-	public Map<String, Integer> getYearToActivityCount() {
-		return yearToActivityCount;
-	}
-
-	public void setEarliestYearConsidered(Integer earliestYearConsidered) {
-		this.earliestYearConsidered = earliestYearConsidered;
-	}
-
-	public Integer getEarliestYearConsidered() {
-		return earliestYearConsidered;
-	}
-
-	public Integer getEarliestRenderedPublicationYear() {
-		return earliestRenderedPublicationYear;
-	}
-	
-	public void setEarliestRenderedPublicationYear(
-			Integer earliestRenderedPublicationYear) {
-		this.earliestRenderedPublicationYear = earliestRenderedPublicationYear;
-	}
-	
-	public Integer getLatestRenderedPublicationYear() {
-		return latestRenderedPublicationYear;
-	}
-	
-	public void setLatestRenderedPublicationYear(
-			Integer latestRenderedPublicationYear) {
-		this.latestRenderedPublicationYear = latestRenderedPublicationYear;
-	}
-	
-	public void setUnknownYearPublications(Integer unknownYearPublications) {
-		this.unknownYearPublications = unknownYearPublications;
-	}
-
-	public Integer getUnknownYearPublications() {
-		return unknownYearPublications;
-	}
-
-	public void setRenderedSparks(Integer renderedSparks) {
-		this.renderedSparks = renderedSparks;
-	}
-
-	public Integer getRenderedSparks() {
-		return renderedSparks;
-	}
-
-	public String getDownloadDataLink() {
-		return downloadDataLink;
-	}
-	
-	public void setDownloadDataLink(String downloadDataLink) {
-		this.downloadDataLink = downloadDataLink;
-	}
-	
-	public String getFullTimelineNetworkLink() {
-		return fullTimelineNetworkLink;
-	}
-	
-	public void setFullTimelineNetworkLink(String fullTimelineNetworkLink) {
-		this.fullTimelineNetworkLink = fullTimelineNetworkLink;
-	}
-	
-	public void setVisContainerDivID(String visContainerDivID) {
-		this.visContainerDivID = visContainerDivID;
-	}
-
-	public String getVisContainerDivID() {
-		return visContainerDivID;
-	}
-
-	public void setShortVisMode(boolean isShortVisMode) {
-		this.isShortVisMode = isShortVisMode;
-	}
-
-	public boolean isShortVisMode() {
-		return isShortVisMode;
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
+
+import java.util.List;
+import java.util.Map;
+
+public class SparklineData {
+
+	private Integer earliestYearConsidered;
+	private Integer earliestRenderedPublicationYear;
+	private Integer latestRenderedPublicationYear;
+	private Integer earliestRenderedGrantYear;
+	private Integer latestRenderedGrantYear;
+
+	private Integer renderedSparks;
+	private Integer unknownYearPublications;
+	private Integer unknownYearGrants;
+
+	private Integer totalCollaborationshipCount;
+
+	private Map<String, Integer> yearToActivityCount;
+
+	private String downloadDataLink = "";
+	private String fullTimelineNetworkLink = "";
+
+	private String visContainerDivID = "pub_count_vis_container";
+
+	private boolean isShortVisMode = true;
+
+	private List<YearToEntityCountDataElement> yearToEntityCountDataTable;
+
+	private int numOfYearsToBeRendered;
+
+	public void setTotalCollaborationshipCount(
+			Integer totalCollaborationshipCount) {
+		this.totalCollaborationshipCount = totalCollaborationshipCount;
+	}
+
+	public Integer getTotalCollaborationshipCount() {
+		return totalCollaborationshipCount;
+	}
+
+	public Integer getEarliestRenderedGrantYear() {
+		return earliestRenderedGrantYear;
+	}
+
+	public void setEarliestRenderedGrantYear(Integer earliestRenderedGrantYear) {
+		this.earliestRenderedGrantYear = earliestRenderedGrantYear;
+	}
+
+	public Integer getLatestRenderedGrantYear() {
+		return latestRenderedGrantYear;
+	}
+
+	public void setLatestRenderedGrantYear(Integer latestRenderedGrantYear) {
+		this.latestRenderedGrantYear = latestRenderedGrantYear;
+	}
+
+	public Integer getUnknownYearGrants() {
+		return unknownYearGrants;
+	}
+
+	public void setUnknownYearGrants(Integer unknownYearGrants) {
+		this.unknownYearGrants = unknownYearGrants;
+	}
+
+	public void setNumOfYearsToBeRendered(int numOfYearsToBeRendered) {
+		this.numOfYearsToBeRendered = numOfYearsToBeRendered;
+	}
+
+	public int getNumOfYearsToBeRendered() {
+		return numOfYearsToBeRendered;
+	}
+
+	public void setYearToEntityCountDataTable(
+			List<YearToEntityCountDataElement> yearToEntityCountDataTable) {
+		this.yearToEntityCountDataTable = yearToEntityCountDataTable;
+	}
+
+	public List<YearToEntityCountDataElement> getYearToEntityCountDataTable() {
+		return yearToEntityCountDataTable;
+	}
+
+	public void setYearToActivityCount(Map<String, Integer> yearToActivityCount) {
+		this.yearToActivityCount = yearToActivityCount;
+	}
+
+	public Map<String, Integer> getYearToActivityCount() {
+		return yearToActivityCount;
+	}
+
+	public void setEarliestYearConsidered(Integer earliestYearConsidered) {
+		this.earliestYearConsidered = earliestYearConsidered;
+	}
+
+	public Integer getEarliestYearConsidered() {
+		return earliestYearConsidered;
+	}
+
+	public Integer getEarliestRenderedPublicationYear() {
+		return earliestRenderedPublicationYear;
+	}
+
+	public void setEarliestRenderedPublicationYear(
+			Integer earliestRenderedPublicationYear) {
+		this.earliestRenderedPublicationYear = earliestRenderedPublicationYear;
+	}
+
+	public Integer getLatestRenderedPublicationYear() {
+		return latestRenderedPublicationYear;
+	}
+
+	public void setLatestRenderedPublicationYear(
+			Integer latestRenderedPublicationYear) {
+		this.latestRenderedPublicationYear = latestRenderedPublicationYear;
+	}
+
+	public void setUnknownYearPublications(Integer unknownYearPublications) {
+		this.unknownYearPublications = unknownYearPublications;
+	}
+
+	public Integer getUnknownYearPublications() {
+		return unknownYearPublications;
+	}
+
+	public void setRenderedSparks(Integer renderedSparks) {
+		this.renderedSparks = renderedSparks;
+	}
+
+	public Integer getRenderedSparks() {
+		return renderedSparks;
+	}
+
+	public String getDownloadDataLink() {
+		return downloadDataLink;
+	}
+
+	public void setDownloadDataLink(String downloadDataLink) {
+		this.downloadDataLink = downloadDataLink;
+	}
+
+	public String getFullTimelineNetworkLink() {
+		return fullTimelineNetworkLink;
+	}
+
+	public void setFullTimelineNetworkLink(String fullTimelineNetworkLink) {
+		this.fullTimelineNetworkLink = fullTimelineNetworkLink;
+	}
+
+	public void setVisContainerDivID(String visContainerDivID) {
+		this.visContainerDivID = visContainerDivID;
+	}
+
+	public String getVisContainerDivID() {
+		return visContainerDivID;
+	}
+
+	public void setShortVisMode(boolean isShortVisMode) {
+		this.isShortVisMode = isShortVisMode;
+	}
+
+	public boolean isShortVisMode() {
+		return isShortVisMode;
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java
index c2bdbbbcdc..d658312b92 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java
@@ -10,7 +10,7 @@
 /**
  * @author bkoniden (Deepak Konidena)
  * modified by @author cdtank (Chintan Tank)
- * last modified at Mar 21, 2011 2:57:20 PM 
+ * last modified at Mar 21, 2011 2:57:20 PM
  */
 public class SubEntity extends Individual {
 
@@ -18,32 +18,32 @@ public class SubEntity extends Individual {
 	private Set<String> entityTypes = new HashSet<String>();
 	private VOConstants.EntityClassType entityClass;
 	private String lastCachedAtDateTime = null;
-	
+
 	public SubEntity(String individualURI) {
 		super(individualURI);
 	}
-	
+
 	public SubEntity(String individualURI, String individualLabel) {
 		super(individualURI, individualLabel);
 	}
-	
+
 	@Override
 	public String toString() {
 		return this.getIndividualLabel();
 	}
-	
+
 	public void addActivity(Activity activity) {
 		this.activities.add(activity);
 	}
-	
+
 	public void addActivities(Collection<Activity> activities) {
 		this.activities.addAll(activities);
 	}
-	
+
 	public Set<Activity> getActivities() {
 		return activities;
 	}
-	
+
 	public void addEntityTypeLabel(String typeLabel) {
 		this.entityTypes.add(typeLabel);
 	}
@@ -51,7 +51,7 @@ public void addEntityTypeLabel(String typeLabel) {
 	public Set<String> getEntityTypeLabels() {
 		return entityTypes;
 	}
-	
+
 	public void setEntityClass(VOConstants.EntityClassType entityClass) {
 		this.entityClass = entityClass;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java
index eb361aebf9..d89f82fb3c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java
@@ -3,7 +3,7 @@
 
 /**
  * This object is used to store information about the yearToEntityCount Map in the format
- * easily expressed to Google Visualization's DataTableAPI. 
+ * easily expressed to Google Visualization's DataTableAPI.
  * @author cdtank
  *
  */
@@ -12,7 +12,7 @@ public class YearToEntityCountDataElement {
 	private int yearToEntityCounter;
 	private String year;
 	private int currentEntitiesCount;
-	
+
 	public YearToEntityCountDataElement(int yearToEntityCounter,
 			String year, int currentEntitiesCount) {
 		this.yearToEntityCounter = yearToEntityCounter;
@@ -31,5 +31,5 @@ public String getYear() {
 	public int getCurrentEntitiesCount() {
 		return currentEntitiesCount;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java
index 0ae885bf23..25650eb6ca 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java
@@ -9,7 +9,7 @@
 import java.util.Set;
 
 /**
- * JsonObject is used for creating data in JSON format, 
+ * JsonObject is used for creating data in JSON format,
  * by just using the fields that are required to be included.
  * @author bkoniden
  * Deepak Konidena
@@ -33,7 +33,7 @@ public class JsonObject {
 
 	@JsonProperty
 	private List<String> organizationType = new ArrayList<String>();
-	
+
 	public List<String> getOrganizationTypes() {
 		return organizationType;
 	}
@@ -41,7 +41,7 @@ public List<String> getOrganizationTypes() {
 	public void setOrganizationTypes(List<String> organizationType) {
 		this.organizationType = organizationType;
 	}
-	
+
 	public void setOrganizationTypes(Set<String> givenOrganizationType) {
 		this.organizationType.addAll(givenOrganizationType);
 	}
@@ -77,7 +77,7 @@ public List<List<Integer>> getYearToActivityCount() {
 	public JsonObject(String label) {
 		this.label = label;
 	}
-	
+
 	public void setYearToActivityCount(List<List<Integer>> yearToPublicationCount) {
 		this.data = yearToPublicationCount;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java
index 4904e19b34..5e8a20ec13 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java
@@ -41,7 +41,7 @@ public class MapOfScience {
 	public MapOfScience(String uri) {
 		this.uri = uri;
 	}
-	
+
 	public void setType(String type) {
 		this.type = type;
 	}
@@ -117,7 +117,7 @@ private class SubEntityInfo {
 
 		@JsonProperty
 		private int pubs;
-		
+
 		public SubEntityInfo(String uri, String label, String type, int pubs) {
 			this.uri = uri;
 			this.label = label;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java
index 84ef1aee8c..dbf8276764 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java
@@ -19,12 +19,12 @@ public class SubjectEntityJSON {
 
 	@JsonProperty
 	private Map<String, String> parentURIToLabel = new HashMap<String, String>();
-	
+
 	public SubjectEntityJSON(String subjectEntityURI, String label,
 			Set<Individual> parentOrganizations) {
 		this.subjectEntityURI = subjectEntityURI;
 		this.subjectEntityLabel = label;
-		
+
 		this.setParentURIToLabel(parentOrganizations);
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
index e0b5edfefc..3865527ae2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
@@ -24,9 +24,9 @@
 
 
 /**
- * This query runner is used to execute a sparql query that will fetch all the 
+ * This query runner is used to execute a sparql query that will fetch all the
  * properties  available for the provided individual URI.
- * 
+ *
  * @author cdtank
  */
 public class AllPropertiesQueryRunner implements QueryRunner<GenericQueryMap> {
@@ -47,22 +47,22 @@ public AllPropertiesQueryRunner(String individualURI,
 		this.filterRule = filterRule;
 		this.rdfService = rdfService;
 		this.log = log;
-		
+
 	}
 
 	private String generateGenericSparqlQuery(String queryURI, String filterRule) {
 //		Resource uri1 = ResourceFactory.createResource(queryURI);
 		String filterClause;
-		
+
 		if (StringUtils.isNotBlank(filterRule)) {
 			filterClause = "FILTER ( " + filterRule + " ) . ";
 		} else {
-			filterClause = "";			
+			filterClause = "";
 		}
 
 		String sparqlQuery = QueryConstants.getSparqlPrefixQuery()
 							+ "SELECT "
-							+ "		(str(?predicate) as ?" + QueryFieldLabels.PREDICATE + ") " 
+							+ "		(str(?predicate) as ?" + QueryFieldLabels.PREDICATE + ") "
 							+ "		(str(?object) as ?" + QueryFieldLabels.OBJECT + ") "
 							+ "WHERE { {"
 							+ "<" + queryURI + "> ?predicate ?object.  }"
@@ -71,12 +71,12 @@ private String generateGenericSparqlQuery(String queryURI, String filterRule) {
 							+ "?vTitle ?predicate ?object . }"
 							+ filterClause
 							+ "}";
-            	
+
         log.debug("sparqlQuery = " + sparqlQuery);
-        
+
 		return sparqlQuery;
 	}
-	
+
 	public GenericQueryMap getQueryResult()
 			throws MalformedQueryParametersException {
 		if (StringUtils.isNotBlank(this.individualURI)) {
@@ -91,7 +91,7 @@ public GenericQueryMap getQueryResult()
                 throw new MalformedQueryParametersException(
                 			"URI provided for an individual is malformed.");
             }
-            
+
         } else {
             throw new MalformedQueryParametersException("URI parameter is either null or empty.");
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java
index 53f838112f..494baee896 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java
@@ -9,7 +9,7 @@
 public interface CachedModelConstructor {
 
 	Model getConstructedModel() throws MalformedQueryParametersException;
-	
-	String getModelType(); 
-	
+
+	String getModelType();
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java
index 276823a41e..7b7cf18f2f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java
@@ -24,9 +24,9 @@
 
 
 /**
- * This query runner is used to run a generic sparql query based on the "select", 
- * "where" & "filter" rules provided to it.  
- * 
+ * This query runner is used to run a generic sparql query based on the "select",
+ * "where" & "filter" rules provided to it.
+ *
  * @author cdtank
  */
 public class GenericQueryRunner implements QueryRunner<ResultSet> {
@@ -37,7 +37,7 @@ public class GenericQueryRunner implements QueryRunner<ResultSet> {
 	private Dataset dataset;
 
 	private Map<String, String> fieldLabelToOutputFieldLabel;
-	
+
 	private Log log = LogFactory.getLog(GenericQueryRunner.class.getName());
 
 	private String groupOrderClause;
@@ -45,9 +45,9 @@ public class GenericQueryRunner implements QueryRunner<ResultSet> {
 	private String aggregationRules;
 
 	public GenericQueryRunner(Map<String, String> fieldLabelToOutputFieldLabel,
-							   String aggregationRules, 
+							   String aggregationRules,
 							   String whereClause,
-							   String groupOrderClause, 
+							   String groupOrderClause,
 							   Dataset dataset) {
 
 		this.fieldLabelToOutputFieldLabel = fieldLabelToOutputFieldLabel;
@@ -70,31 +70,31 @@ private String generateGenericSparqlQuery() {
 
 		StringBuilder sparqlQuery = new StringBuilder();
 		sparqlQuery.append(QueryConstants.getSparqlPrefixQuery());
-		
+
 		sparqlQuery.append("SELECT\n");
-		
-		for (Map.Entry<String, String> currentfieldLabelToOutputFieldLabel 
+
+		for (Map.Entry<String, String> currentfieldLabelToOutputFieldLabel
 				: this.fieldLabelToOutputFieldLabel.entrySet()) {
-			
+
 			sparqlQuery.append("\t(str(?").append(currentfieldLabelToOutputFieldLabel.getKey()).append(") as ?").append(currentfieldLabelToOutputFieldLabel.getValue()).append(")\n");
-			
+
 		}
-		
+
 		sparqlQuery.append("\n").append(this.aggregationRules).append("\n");
-		
+
 		sparqlQuery.append("WHERE {\n");
-		
+
 		sparqlQuery.append(this.whereClause);
-		
+
 		sparqlQuery.append("}\n");
-		
+
 		sparqlQuery.append(this.groupOrderClause);
-		
+
 		log.debug("sparqlQuery = " + sparqlQuery.toString());
-		
+
 		return sparqlQuery.toString();
 	}
-	
+
 	public ResultSet getQueryResult()
 			throws MalformedQueryParametersException {
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java
index c2ed662d37..23373979a6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java
@@ -21,9 +21,9 @@
 
 
 /**
- * This query runner is used to run a generic sparql query based on the "select", 
- * "where" & "filter" rules provided to it.  
- * 
+ * This query runner is used to run a generic sparql query based on the "select",
+ * "where" & "filter" rules provided to it.
+ *
  * @author cdtank
  */
 public class GenericQueryRunnerOnModel implements QueryRunner<ResultSet> {
@@ -34,7 +34,7 @@ public class GenericQueryRunnerOnModel implements QueryRunner<ResultSet> {
 	private Model model;
 
 	private Map<String, String> fieldLabelToOutputFieldLabel;
-	
+
 	private Log log = LogFactory.getLog(GenericQueryRunnerOnModel.class.getName());
 
 	private String groupOrderClause;
@@ -42,9 +42,9 @@ public class GenericQueryRunnerOnModel implements QueryRunner<ResultSet> {
 	private String aggregationRules;
 
 	public GenericQueryRunnerOnModel(Map<String, String> fieldLabelToOutputFieldLabel,
-							   String aggregationRules, 
+							   String aggregationRules,
 							   String whereClause,
-							   String groupOrderClause, 
+							   String groupOrderClause,
 							   Model model) {
 
 		this.fieldLabelToOutputFieldLabel = fieldLabelToOutputFieldLabel;
@@ -67,30 +67,30 @@ private String generateGenericSparqlQuery() {
 
 		StringBuilder sparqlQuery = new StringBuilder();
 		sparqlQuery.append(QueryConstants.getSparqlPrefixQuery());
-		
+
 		sparqlQuery.append("SELECT\n");
-		
-		for (Map.Entry<String, String> currentfieldLabelToOutputFieldLabel 
+
+		for (Map.Entry<String, String> currentfieldLabelToOutputFieldLabel
 				: this.fieldLabelToOutputFieldLabel.entrySet()) {
-			
+
 			sparqlQuery.append("\t(str(?").append(currentfieldLabelToOutputFieldLabel.getKey()).append(") as ?").append(currentfieldLabelToOutputFieldLabel.getValue()).append(")\n");
-			
+
 		}
-		
+
 		sparqlQuery.append("\n").append(this.aggregationRules).append("\n");
-		
+
 		sparqlQuery.append("WHERE {\n");
-		
+
 		sparqlQuery.append(this.whereClause);
-		
+
 		sparqlQuery.append("}\n");
-		
+
 		sparqlQuery.append(this.groupOrderClause);
-		
+
 		log.debug("sparqlQuery = " + sparqlQuery.toString());
 		return sparqlQuery.toString();
 	}
-	
+
 	public ResultSet getQueryResult()
 			throws MalformedQueryParametersException {
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java
index 269baaa9b9..3cae94a126 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java
@@ -8,6 +8,6 @@
 
 public interface ModelConstructor {
 
-	Model getConstructedModel() throws MalformedQueryParametersException; 
-	
+	Model getConstructedModel() throws MalformedQueryParametersException;
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java
index 4ca009cacf..f1b52003b0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java
@@ -28,14 +28,14 @@
 
 public class PDFDocument {
 	public PDFDocument(String authorName,
-					   Map<String, Integer> yearToPublicationCount, 
+					   Map<String, Integer> yearToPublicationCount,
 					   Document document,
 					   PdfWriter pdfWriter) {
-		
+
 //        setPreferredSize(new Dimension(600,400));
-		
+
 		try {
-			
+
 		document.addTitle("PDF Pipeline iText Prototype");
 		document.addAuthor(authorName);
 		document.addSubject("This example tests text, color, image, transparency & table functionality.");
@@ -43,55 +43,55 @@ public PDFDocument(String authorName,
 		document.addCreator("Standalone PDF Renderer using iText");
 
 		Paragraph header = new Paragraph();
-		
+
 		Font pageHeaderStyle = FontFactory.getFont(FontFactory.TIMES_ROMAN, 15, Font.BOLDITALIC | Font.UNDERLINE);
 		Font featureHeaderStyle = FontFactory.getFont(FontFactory.TIMES_ROMAN, 10, BaseColor.RED);
-		
-		header.add(new Chunk("PDF Pipeline Prototype v2 using iText\n", 
+
+		header.add(new Chunk("PDF Pipeline Prototype v2 using iText\n",
 							 pageHeaderStyle));
-		
+
 		header.setSpacingAfter(15f);
-		
-		
+
+
 			document.add(header);
-		
-		
+
+
 		Paragraph content = new Paragraph();
-		
-		content.add(new Chunk("Publication Count - Author Name - " + authorName, 
+
+		content.add(new Chunk("Publication Count - Author Name - " + authorName,
 							 featureHeaderStyle));
-		
+
 		content.setSpacingAfter(15f);
-		
+
 		document.add(content);
 		// step4
-		
+
 		PdfPTable publicationCount = createTable(yearToPublicationCount);
-		
+
 		document.add(publicationCount);
-		
+
 		content = new Paragraph();
-		
-		content.add(new Chunk("Transparency of Shapes", 
+
+		content.add(new Chunk("Transparency of Shapes",
 				 featureHeaderStyle));
 
 		content.setSpacingAfter(15f);
-		
+
 		document.add(content);
-		
+
 		createTransparencyShapes(document, pdfWriter);
-		
-		
+
+
         createImage(document, pdfWriter, featureHeaderStyle);
-		
+
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-						
+
     }
-	
-	
+
+
 	private void createImage(Document document, PdfWriter writer,
 			Font featureHeaderStyle) throws BadElementException,
 			MalformedURLException, IOException, DocumentException {
@@ -103,17 +103,17 @@ private void createImage(Document document, PdfWriter writer,
 		imageSprite.setAlignment(Image.UNDERLYING);
 
 		document.add(imageSprite);
-		
+
 		PdfContentByte cb = writer.getDirectContent();
 		ColumnText ct = new ColumnText(cb);
 		Chunk imageHeader = new Chunk("Images",
 									  featureHeaderStyle);
 		ct.addText(imageHeader);
 		ct.setAlignment(Element.ALIGN_LEFT);
-		ct.setSimpleColumn(imageSpriteX, imageSpriteY - imageSprite.getScaledHeight(), 
+		ct.setSimpleColumn(imageSpriteX, imageSpriteY - imageSprite.getScaledHeight(),
 				   imageSpriteX + imageSprite.getScaledWidth(), imageSpriteY + imageSprite.getScaledHeight() + 20);
 		ct.go();
-		
+
 		ct = new ColumnText(cb);
 		Chunk imageFooter = new Chunk("Footer to be set for a figure. Similar to 'image cpation'.",
 									  FontFactory.getFont(FontFactory.TIMES_ROMAN, 8));
@@ -126,7 +126,7 @@ private void createImage(Document document, PdfWriter writer,
 	private void createTransparencyShapes(Document document,
 			PdfWriter writer) throws Exception {
 		PdfContentByte cb = writer.getDirectContent();
-		
+
 		pictureBackdrop(document.leftMargin(), 350, cb);
 		cb.saveState();
 		PdfGState gs1 = new PdfGState();
@@ -134,10 +134,10 @@ private void createTransparencyShapes(Document document,
 		cb.setGState(gs1);
 		pictureCircles(document.leftMargin(), 350, cb);
 		cb.restoreState();
-		
+
         cb.resetRGBColorFill();
 	}
-	
+
     /**
      * Prints a square and fills half of it with a gray rectangle.
      * @param x X coordinate
@@ -163,7 +163,7 @@ public void pictureBackdrop(float x, float y, PdfContentByte cb) throws Exceptio
      * @throws Exception
      */
     public void pictureCircles(float x, float y, PdfContentByte cb) throws Exception {
-    	
+
 		cb.saveState();
 		PdfGState gs1 = new PdfGState();
 		gs1.setFillOpacity(1.0f);
@@ -182,58 +182,58 @@ public void pictureCircles(float x, float y, PdfContentByte cb) throws Exception
     }
 
 	private PdfPTable createTable(Map<String, Integer> yearToPublicationCount) {
-		
+
 		Font normalContentStyle = FontFactory.getFont(FontFactory.TIMES_ROMAN, 11);
 		Font summaryContentStyle = FontFactory.getFont(FontFactory.TIMES_ROMAN, 11, Font.BOLDITALIC);
 		BaseColor summaryBackgroundColor = new BaseColor(0xEE, 0xEE, 0xEE);
 		BaseColor headerBackgroundColor = new BaseColor(0xC3, 0xD9, 0xFF);
 		BaseColor bodyBackgroundColor = BaseColor.WHITE;
-		
+
 		PdfPTable table = new PdfPTable(2);
 		table.setWidthPercentage(36.0f);
-		
+
 		table.setHorizontalAlignment(Element.ALIGN_LEFT);
 		table.getDefaultCell().setBorderWidth(0.0f);
 		table.setHeaderRows(2);
-		
+
 		PdfPCell cell;
 		cell = new PdfPCell(new Phrase("Publications per year", normalContentStyle));
 		setTableCaptionStyle(summaryBackgroundColor, cell);
 		table.addCell(cell);
-		
+
 		cell = new PdfPCell(new Phrase("Year", normalContentStyle));
 		setTableHeaderStyle(headerBackgroundColor, cell);
 		table.addCell(cell);
-		
+
 		cell.setPhrase(new Phrase("Publications", normalContentStyle));
 		table.addCell(cell);
-		
-		
-		
+
+
+
 		setTableBodyStyle(bodyBackgroundColor, cell);
 		int totalPublications = 0;
-		
+
 		for (Entry<String, Integer> currentEntry : yearToPublicationCount.entrySet()) {
-			
+
 			cell.setPhrase(new Phrase(currentEntry.getKey(), normalContentStyle));
 			table.addCell(cell);
-			
+
 			cell.setPhrase(new Phrase(currentEntry.getValue().toString(), normalContentStyle));
 			table.addCell(cell);
-			
+
 			totalPublications += currentEntry.getValue();
 		}
-		
+
 		setTableFooterStyle(summaryBackgroundColor, cell);
 		cell.setPhrase(new Phrase("Total", summaryContentStyle));
 		table.addCell(cell);
-		
+
 		cell.setPhrase(new Phrase(String.valueOf(totalPublications), summaryContentStyle));
 		table.addCell(cell);
-		
+
 		return table;
 	}
-	
+
 	private void setTableFooterStyle(BaseColor footerBackgroundColor,
 			  PdfPCell cell) {
 		cell.setBorderWidth(0.0f);
@@ -266,7 +266,7 @@ private void setTableHeaderStyle(BaseColor headerBackgroundColor,
 		cell.setPaddingBottom(5f);
 		cell.setPaddingLeft(10f);
 	}
-	
+
 	private void setTableCaptionStyle(BaseColor summaryBackgroundColor,
 			PdfPCell cell) {
 		cell.setBorderWidth(0.0f);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java
index 614479b3e5..36cfe1dc10 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java
@@ -1,11 +1,11 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
-
-import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
-
-public interface QueryRunner<QueryResult> {
-	
-	QueryResult getQueryResult() throws MalformedQueryParametersException; 
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
+
+import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
+
+public interface QueryRunner<QueryResult> {
+
+	QueryResult getQueryResult() throws MalformedQueryParametersException;
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java
index 0f4b93e21a..76159a7559 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java
@@ -1,16 +1,16 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
-
-public class UniqueIDGenerator {
-	
-	private int nextNumericID = 1;
-
-	public int getNextNumericID() {
-		int nextNumericID = this.nextNumericID;
-		this.nextNumericID++;
-
-		return nextNumericID;
-	}
-
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
+
+public class UniqueIDGenerator {
+
+	private int nextNumericID = 1;
+
+	public int getNextNumericID() {
+		int nextNumericID = this.nextNumericID;
+		this.nextNumericID++;
+
+		return nextNumericID;
+	}
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java
index 7afa6110e2..b5b0d0615f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java
@@ -38,7 +38,7 @@
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap;
 
 public class UtilityFunctions {
-	
+
 	public static Map<String, Integer> getYearToActivityCount(
 			Set<Activity> activities) {
 
@@ -56,7 +56,7 @@ public static Map<String, Integer> getYearToActivityCount(
     		 * that particular year.
     		 * */
     		String activityYear = currentActivity.getParsedActivityYear();
-    		
+
 			if (yearToActivityCount.containsKey(activityYear)) {
     			yearToActivityCount.put(activityYear,
     									   yearToActivityCount
@@ -70,122 +70,122 @@ public static Map<String, Integer> getYearToActivityCount(
 
 		return yearToActivityCount;
 	}
-	
+
 	public static Map<String, Integer> getYearToActivityCount(
 			Collection<Activity> activities) {
 		return getYearToActivityCount(new HashSet<Activity>(activities));
 	}
-	
+
 	/**
 	 * This method is used to return a mapping between activity year & all the collaborators
-	 * that published with ego in that year. 
+	 * that published with ego in that year.
 	 * @param collaborationData Collaboration data
 	 */
 	public static Map<String, Set<Collaborator>> getActivityYearToCollaborators(
 										CollaborationData collaborationData) {
 
-		Map<String, Set<Collaborator>> yearToCollaborators = new TreeMap<String, 
+		Map<String, Set<Collaborator>> yearToCollaborators = new TreeMap<String,
 																		 Set<Collaborator>>();
-		
+
 		Collaborator egoCollaborator = collaborationData.getEgoCollaborator();
-		
+
 		for (Collaborator currNode : collaborationData.getCollaborators()) {
-					
+
 				/*
 				 * We have already printed the Ego Node info.
 				 * */
 				if (currNode != egoCollaborator) {
-					
+
 					for (String year : currNode.getYearToActivityCount().keySet()) {
-						
+
 						Set<Collaborator> collaboratorNodes;
-						
+
 						if (yearToCollaborators.containsKey(year)) {
-							
+
 							collaboratorNodes = yearToCollaborators.get(year);
 							collaboratorNodes.add(currNode);
-							
+
 						} else {
-							
+
 							collaboratorNodes = new HashSet<Collaborator>();
 							collaboratorNodes.add(currNode);
 							yearToCollaborators.put(year, collaboratorNodes);
 						}
-						
+
 					}
-					
+
 				}
 		}
 		return yearToCollaborators;
 	}
-	
+
 	/**
-	 * Currently the approach for slugifying filenames is naive. In future if there is need, 
+	 * Currently the approach for slugifying filenames is naive. In future if there is need,
 	 * we can write more sophisticated method.
 	 * @param textToBeSlugified Text to process
 	 */
 	public static String slugify(String textToBeSlugified) {
 		String textBlockSeparator = "-";
 		return StringUtils.removeEnd(StringUtils.substring(textToBeSlugified.toLowerCase().trim()
-											.replaceAll("[^a-zA-Z0-9-]+", textBlockSeparator), 
-											0, 
+											.replaceAll("[^a-zA-Z0-9-]+", textBlockSeparator),
+											0,
 											VisConstants.MAX_NAME_TEXT_LENGTH),
 									 textBlockSeparator);
 	}
-	
-	
-    public static ResponseValues handleMalformedParameters(String errorPageTitle, 
-    													   String errorMessage, 
+
+
+    public static ResponseValues handleMalformedParameters(String errorPageTitle,
+    													   String errorMessage,
     													   VitroRequest vitroRequest) {
 
         Map<String, Object> body = new HashMap<String, Object>();
         body.put("error", errorMessage);
         body.put("title", errorPageTitle);
-        
+
         return new TemplateResponseValues(VisualizationFrameworkConstants.ERROR_TEMPLATE, body);
     }
-    
+
     public static void handleMalformedParameters(String errorMessage,
     											 HttpServletResponse response,
 												 Log log)
 		throws IOException {
-		
+
 		GenericQueryMap errorDataResponse = new GenericQueryMap();
 		errorDataResponse.addEntry("error", errorMessage);
-		
+
 		ObjectMapper mapper = new ObjectMapper();
 
     	response.setContentType("application/octet-stream");
     	mapper.writeValue(response.getWriter(), errorDataResponse);
 	}
-    
+
 	public static DateTime getValidParsedDateTimeObject(String unparsedDateTime) {
-		
+
 		for (DateTimeFormatter currentFormatter : VOConstants.POSSIBLE_DATE_TIME_FORMATTERS) {
-			
+
 			try {
-				
+
 				DateTime dateTime = currentFormatter.parseDateTime(unparsedDateTime);
 				return dateTime;
-				
+
 			} catch (Exception e2) {
 				/*
-				 * The current date-time formatter did not pass the muster. 
+				 * The current date-time formatter did not pass the muster.
 				 * */
 			}
 		}
-		
+
 		/*
-		 * This means that none of the date time formatters worked. 
+		 * This means that none of the date time formatters worked.
 		 * */
 		return null;
 	}
-	
+
 	/**
-	 * This method will be called to get the inferred end year for the entity. 
+	 * This method will be called to get the inferred end year for the entity.
 	 * The 2 choices, in order, are,
-	 * 		1. parsed year from core:DateTime object saved in core:dateTimeValue 
-	 * 		2. Default Entity Year 
+	 * 		1. parsed year from core:DateTime object saved in core:dateTimeValue
+	 * 		2. Default Entity Year
 	 */
 	public static String getValidYearFromCoreDateTimeString(String inputDate,
 															String defaultYearInCaseOfError) {
@@ -201,25 +201,25 @@ public static String getValidYearFromCoreDateTimeString(String inputDate,
 
 			if (validParsedDateTimeObject != null) {
 				return String.valueOf(validParsedDateTimeObject.getYear());
-			} 
-		} 
-		
+			}
+		}
+
 		return parsedInputYear;
 	}
-	
+
 	public static String getCSVDownloadURL(String individualURI, String visType, String visMode) {
-		
+
 		ParamMap csvDownloadURLParams = null;
-		
+
 		if (StringUtils.isBlank(visMode)) {
-			
+
 			csvDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
 					 individualURI,
 					 VisualizationFrameworkConstants.VIS_TYPE_KEY,
 					 visType);
-			
+
 		} else {
-			
+
 			csvDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
 					 individualURI,
 					 VisualizationFrameworkConstants.VIS_TYPE_KEY,
@@ -228,20 +228,20 @@ public static String getCSVDownloadURL(String individualURI, String visType, Str
 					 visMode);
 
 		}
-		
+
 		String csvDownloadLink = UrlBuilder.getUrl(
 										VisualizationFrameworkConstants
 												.DATA_VISUALIZATION_SERVICE_URL_PREFIX,
 										csvDownloadURLParams);
-		
+
 		return csvDownloadLink != null ? csvDownloadLink : "" ;
 
 	}
-	
-	public static String getCollaboratorshipNetworkLink(String individualURI, 
-														String visType, 
+
+	public static String getCollaboratorshipNetworkLink(String individualURI,
+														String visType,
 														String visMode) {
-		
+
 		ParamMap collaboratorshipNetworkURLParams = new ParamMap(
 					VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
 					individualURI,
@@ -253,61 +253,61 @@ public static String getCollaboratorshipNetworkLink(String individualURI,
 		String collaboratorshipNetworkURL = UrlBuilder.getUrl(
 					VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX,
 					collaboratorshipNetworkURLParams);
-		
+
 		return collaboratorshipNetworkURL != null ? collaboratorshipNetworkURL : "" ;
 	}
-	
-	public static boolean isEntityAPerson(VitroRequest vreq, String individualURI) 
+
+	public static boolean isEntityAPerson(VitroRequest vreq, String individualURI)
 		throws MalformedQueryParametersException {
 		Individual individualByURI = vreq.getWebappDaoFactory()
 						.getIndividualDao()
 						.getIndividualByURI(individualURI);
-		
+
 		if (individualByURI != null) {
 
 			return individualByURI
-						.isVClass("http://xmlns.com/foaf/0.1/Person");	
+						.isVClass("http://xmlns.com/foaf/0.1/Person");
 		} else {
 			throw new MalformedQueryParametersException("Individual with " + individualURI + " not found in the system.");
 		}
-		
+
 	}
-	
+
 
 	/**
-	 * 
-	 * This method will test whether the current uri is based off of default namespace. If so, 
-	 * go ahead & provide local name. 
+	 *
+	 * This method will test whether the current uri is based off of default namespace. If so,
+	 * go ahead & provide local name.
 	 * @param givenURI URI
 	 * @param vitroRequest Vitro Request
 	 */
 	public static String getIndividualLocalName(String givenURI, VitroRequest vitroRequest) {
-		
+
 		if (UrlBuilder.isUriInDefaultNamespace(givenURI, vitroRequest)) {
-			
+
 			try {
-				
+
 				Individual individual = vitroRequest.getWebappDaoFactory().getIndividualDao()
 												.getIndividualByURI(givenURI);
-				
+
 				return individual.getLocalName();
-				
+
 			} catch (Exception e) {
-				
+
 			}
 		}
-		
+
 		return "";
 	}
-	
+
 	public static String getIndividualLabelFromDAO(VitroRequest vitroRequest,
 												   String entityURI) {
-		
+
 		IndividualDao iDao = vitroRequest.getWebappDaoFactory().getIndividualDao();
         Individual ind = iDao.getIndividualByURI(entityURI);
-        
-        String individualLabel = "Unknown Individual"; 
-        
+
+        String individualLabel = "Unknown Individual";
+
         if (ind != null) {
         	individualLabel = ind.getName();
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
index fc95f991a9..ba28dac3ff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
@@ -1,48 +1,48 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
-
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.commons.logging.Log;
-
-import org.apache.jena.query.Dataset;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
-
-/**
- * This interface is being implemented by all the visualization request handlers like
- * PersonLevelRequestHandler, PersonPublicationCountRequestHandler, UtilitiesRequestHandler
- * etc. All the future visualizations <b>must</b> implement this because the ability of 
- * a visualization to be served to the users is dependent on it. We have implemented 
- * dependency injection mechanism & one of the conditions that is used to enable a visualization 
- * handler is its implementation of VisualizationRequestHandler.
- * 
- * @author cdtank
- */
-public interface VisualizationRequestHandler {
-	
-	AuthorizationRequest getRequiredPrivileges();
-
-	ResponseValues generateStandardVisualization(VitroRequest vitroRequest,
-							   Log log, 
-							   Dataset dataSource) throws MalformedQueryParametersException;
-	
-	ResponseValues generateVisualizationForShortURLRequests(
-						Map<String, String> parameters,
-						VitroRequest vitroRequest,
-						Log log,
-						Dataset dataSource) throws MalformedQueryParametersException;
-	
-	Object generateAjaxVisualization(VitroRequest vitroRequest,
-								     Log log, 
-								     Dataset dataSource) throws MalformedQueryParametersException, JsonProcessingException;
-	
-	Map<String, String> generateDataVisualization(VitroRequest vitroRequest,
-								   	 Log log, 
-								   	 Dataset dataset) throws MalformedQueryParametersException, JsonProcessingException;
-	
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.commons.logging.Log;
+
+import org.apache.jena.query.Dataset;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
+
+/**
+ * This interface is being implemented by all the visualization request handlers like
+ * PersonLevelRequestHandler, PersonPublicationCountRequestHandler, UtilitiesRequestHandler
+ * etc. All the future visualizations <b>must</b> implement this because the ability of
+ * a visualization to be served to the users is dependent on it. We have implemented
+ * dependency injection mechanism & one of the conditions that is used to enable a visualization
+ * handler is its implementation of VisualizationRequestHandler.
+ *
+ * @author cdtank
+ */
+public interface VisualizationRequestHandler {
+
+	AuthorizationRequest getRequiredPrivileges();
+
+	ResponseValues generateStandardVisualization(VitroRequest vitroRequest,
+							   Log log,
+							   Dataset dataSource) throws MalformedQueryParametersException;
+
+	ResponseValues generateVisualizationForShortURLRequests(
+						Map<String, String> parameters,
+						VitroRequest vitroRequest,
+						Log log,
+						Dataset dataSource) throws MalformedQueryParametersException;
+
+	Object generateAjaxVisualization(VitroRequest vitroRequest,
+								     Log log,
+								     Dataset dataSource) throws MalformedQueryParametersException, JsonProcessingException;
+
+	Map<String, String> generateDataVisualization(VitroRequest vitroRequest,
+								   	 Log log,
+								   	 Dataset dataset) throws MalformedQueryParametersException, JsonProcessingException;
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java
index baa08be682..b1ac2579fa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java
@@ -15,7 +15,7 @@
 public class VIVOIndividualTemplateModel extends IndividualTemplateModel {
 
     private static final Log log = LogFactory.getLog(VIVOIndividualTemplateModel.class);
-    
+
     private static final String FOAF = "http://xmlns.com/foaf/0.1/";
     private static final String PERSON_CLASS = FOAF + "Person";
     private static final String AWARD_CLASS = "http://vivoweb.org/ontology/core#Award";
@@ -26,9 +26,9 @@ public class VIVOIndividualTemplateModel extends IndividualTemplateModel {
     private static final String ORGANIZATION_CLASS = FOAF + "Organization";
     private static final String EVENT_CLASS = "http://purl.org/NET/c4dm/event.owl#Event";
     private static final String INFO_CONTENT_ENTITY_CLASS = "http://purl.obolibrary.org/obo/IAO_0000030";
-    private static final String BASE_VISUALIZATION_URL = 
+    private static final String BASE_VISUALIZATION_URL =
         UrlBuilder.getUrl(Route.VISUALIZATION_SHORT.path());
-    
+
     VIVOIndividualTemplateModel(Individual individual, VitroRequest vreq) {
         super(individual, vreq);
     }
@@ -38,18 +38,18 @@ private String getVisUrl(String visPath) {
         boolean isUsingDefaultNameSpace = UrlBuilder.isUriInDefaultNamespace(
                                                 getUri(),
                                                 vreq);
-        
-        if (isUsingDefaultNameSpace) {          
-            visUrl = visPath + getLocalName();           
-        } else {            
+
+        if (isUsingDefaultNameSpace) {
+            visUrl = visPath + getLocalName();
+        } else {
             visUrl = UrlBuilder.addParams(
-                    visPath, 
-                    new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, getUri())); 
+                    visPath,
+                    new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, getUri()));
         }
-        
+
         return visUrl;
     }
-    
+
     /* Template methods (for efficiency, not pre-computed) */
     public boolean conceptSubclass() {
         return isVClass(AWARD_CLASS) || isVClass(DEGREE_CLASS) || isVClass(CONTACT_CLASS) || isVClass(CREDENTIAL_CLASS) || isVClass(DTP_CLASS);
@@ -58,40 +58,40 @@ public boolean conceptSubclass() {
     public boolean person() {
         return isVClass(PERSON_CLASS);
     }
-    
+
     public boolean organization() {
-        return isVClass(ORGANIZATION_CLASS);        
+        return isVClass(ORGANIZATION_CLASS);
     }
-    
+
     public boolean event() {
-        return isVClass(EVENT_CLASS);        
+        return isVClass(EVENT_CLASS);
     }
 
     public boolean infoContentEntity() {
-        return isVClass(INFO_CONTENT_ENTITY_CLASS);        
+        return isVClass(INFO_CONTENT_ENTITY_CLASS);
     }
 
-    public String coAuthorVisUrl() {   	
-        String url = BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL + "/";    	
+    public String coAuthorVisUrl() {
+        String url = BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL + "/";
     	return getVisUrl(url);
     }
 
-    public String coInvestigatorVisUrl() {    	
-    	String url = 
-    	    BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.COINVESTIGATOR_VIS_SHORT_URL + "/";    	
+    public String coInvestigatorVisUrl() {
+    	String url =
+    	    BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.COINVESTIGATOR_VIS_SHORT_URL + "/";
     	return getVisUrl(url);
     }
 
-    public String temporalGraphUrl() {  
-        String url = 
-            BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.PUBLICATION_TEMPORAL_VIS_SHORT_URL + "/";    	
+    public String temporalGraphUrl() {
+        String url =
+            BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.PUBLICATION_TEMPORAL_VIS_SHORT_URL + "/";
     	return getVisUrl(url);
     }
 
     public String mapOfScienceUrl() {
-    	String url = 
-    	    BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.MAP_OF_SCIENCE_VIS_SHORT_URL + "/";    	
+    	String url =
+    	    BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.MAP_OF_SCIENCE_VIS_SHORT_URL + "/";
     	return getVisUrl(url);
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java
index 61d76ea4f4..9ab3c61275 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java
@@ -27,7 +27,7 @@ public class VIVOListedIndividual extends ListedIndividual {
             + "} "  ;
 
     private final String title;
-    
+
     VIVOListedIndividual(Individual individual, VitroRequest vreq) {
         super(individual, vreq);
         title = findPreferredTitle();
@@ -53,9 +53,9 @@ private String findPreferredTitle() {
     }
 
     /* Template properties */
-    
+
     public String getPreferredTitle() {
         return title;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
index 3c20552ec7..e2dca1a392 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
@@ -31,16 +31,16 @@ public class VIVOIndividualSearchResult extends IndividualSearchResult {
             + "               ?vTitle vcard:title ?title . \n"
             + "    } \n"
             + "} "  ;
-    
+
     private String email = "";
     private String title = "";
-       
+
     public VIVOIndividualSearchResult(Individual individual, VitroRequest vreq) {
     	super(individual, vreq);
     	log.debug("Called Individual Search Result");
     	findVcardInfo();
     }
-    
+
     private void findVcardInfo() {
         String queryStr = QueryUtils.subUriForQueryVar(VCARD_DATA_QUERY, "subject", individual.getURI());
         log.debug("queryStr = " + queryStr);
@@ -64,11 +64,11 @@ private void findVcardInfo() {
 
 
     /* Access methods for templates */
-    
+
     public String getPreferredTitle() {
     	return title;
     }
-    
+
     public String getEmail() {
     	return email;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java
index abea20e04a..ee091d7479 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java
@@ -28,7 +28,7 @@ public AdvisingRelationshipChecker(AbstractPropertyStatementAction action) {
 	 * A self-editor is authorized to add, edit, or delete a statement if the
 	 * subject or object refers to an Advising Relationship, and if the
 	 * self-editor:
-	 * 
+	 *
 	 * 1) is an Advisor in that Relationship
 	 */
 	public PolicyDecision isAuthorized(List<String> userUris) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java
index c5706d2c59..1510ced02f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java
@@ -26,7 +26,7 @@ public CourseChecker(AbstractPropertyStatementAction action) {
 	/**
 	 * A self-editor is authorized to add, edit, or delete a statement if the
 	 * subject or object refers to a Course, and if the self-editor:
-	 * 
+	 *
 	 * 1) is a Teacher of that Course
 	 */
 	public PolicyDecision isAuthorized(List<String> userUris) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java
index ac77145b0b..28d0d48ff1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java
@@ -29,9 +29,9 @@ public GrantChecker(AbstractPropertyStatementAction action) {
 	/**
 	 * A self-editor is authorized to add, edit, or delete a statement if the
 	 * subject or object refers to a Grant, and if the self-editor:
-	 * 
+	 *
 	 * 1) is a Principal Investigator (PI) of that Grant, or
-	 * 
+	 *
 	 * 2) is a co-Principal Investigator (co-PI) of that Grant
 	 */
 	public PolicyDecision isAuthorized(List<String> userUris) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java
index bf5f6037ee..1b7dfca7fd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java
@@ -29,11 +29,11 @@ public InfoContentEntityChecker(AbstractPropertyStatementAction action) {
 	 * A self-editor is authorized to add, edit, or delete a statement if the
 	 * subject or object refers to an Info Content Entity, and if the
 	 * self-editor:
-	 * 
+	 *
 	 * 1) is an Author of that Info Content Entity,
-	 * 
+	 *
 	 * 2) is an Editor of that Info Content Entity, or
-	 * 
+	 *
 	 * 3) is Featured in that Info Content Entity.
 	 */
 	public PolicyDecision isAuthorized(List<String> userUris) {
@@ -72,7 +72,7 @@ private List<String> getUrisOfFeatured(String resourceUri) {
 	private List<String> getUrisOfAuthors(String resourceUri) {
 		List<String> allRelatedUris = getObjectsThroughLinkingNode(resourceUri,
 				URI_RELATED_BY, URI_AUTHORSHIP_TYPE, URI_RELATES);
-		// The authorship relates to the authors and to the resource itself. 
+		// The authorship relates to the authors and to the resource itself.
 		allRelatedUris.remove(resourceUri);
 		return allRelatedUris;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java
index 5305b45509..b3471d322e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java
@@ -28,7 +28,7 @@ public PresentationChecker(AbstractPropertyStatementAction action) {
 	/**
 	 * A self-editor is authorized to add, edit, or delete a statement if the
 	 * subject or object refers to a Presentation, and if the self-editor:
-	 * 
+	 *
 	 * 1) is a Presenter of that Presentation
 	 */
 	public PolicyDecision isAuthorized(List<String> userUris) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java
index 02eb8c0928..2f9e7ea37b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java
@@ -31,7 +31,7 @@ public ProjectOrServiceChecker(AbstractPropertyStatementAction action) {
 	 * A self-editor is authorized to add, edit, or delete a statement if the
 	 * subject or object refers to a Project or a Service, and if the
 	 * self-editor:
-	 * 
+	 *
 	 * 1) is a Clinical Agent of that Project or Service
 	 */
 	public PolicyDecision isAuthorized(List<String> userUris) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java
index 825ae1649c..a1c12a0c0d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java
@@ -1,143 +1,143 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vivo.auth.policy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.specialrelationships.AbstractRelationshipPolicy;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractPropertyStatementAction;
-
-/**
- * Permit self-editors to edit the properties of classes with which they share a
- * special relationship. So for example:
- * 
- * A self-editor may edit properties of an InformationResource for which he is
- * an author, an editor, or in which he is featured.
- * 
- * A self-editor may edit properties of a Project in which he plays a clinical
- * role.
- * 
- * Etc.
- * 
- * NOTE: properties or resources which are restricted by namespace or by access
- * setting will still not be editable, even if this special relationship
- * applies.
- * 
- * NOTE: This could be further generalized by building a list of authorizing
- * relationships, where each relationship may specify a type of object, a
- * relating property (or chain of properties), and a text message describing the
- * relationship (to be used in the decision).
- */
-public class SelfEditorRelationshipPolicy extends AbstractRelationshipPolicy
-		implements PolicyIface {
-	private static final Log log = LogFactory
-			.getLog(SelfEditorRelationshipPolicy.class);
-
-	public SelfEditorRelationshipPolicy(ServletContext ctx) {
-		super(ctx);
-	}
-
-	@Override
-	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
-			RequestedAction whatToAuth) {
-		if (whatToAuth == null) {
-			return inconclusiveDecision("whatToAuth was null");
-		}
-
-		if (!(whatToAuth instanceof AbstractPropertyStatementAction)) {
-			return inconclusiveDecision("Does not authorize "
-					+ whatToAuth.getClass().getSimpleName() + " actions");
-		}
-		AbstractPropertyStatementAction action = (AbstractPropertyStatementAction) whatToAuth;
-
-		List<String> userUris = new ArrayList<String>(
-				HasAssociatedIndividual.getIndividualUris(whoToAuth));
-		if (userUris.isEmpty()) {
-			return inconclusiveDecision("Not self-editing.");
-		}
-
-		if (!canModifyPredicate(action.getPredicate())) {
-			return cantModifyPredicate(action.getPredicate().getURI());
-		}
-
-		for (String resourceUri : action.getResourceUris()) {
-			if (!canModifyResource(resourceUri)) {
-				return cantModifyResource(resourceUri);
-			}
-		}
-
-		return checkRelationships(userUris, action);
-	}
-
-	private PolicyDecision checkRelationships(List<String> userUris,
-			AbstractPropertyStatementAction action) {
-
-		PolicyDecision decision = new InfoContentEntityChecker(action)
-				.isAuthorized(userUris);
-		if (decision == null) {
-			decision = new GrantChecker(action).isAuthorized(userUris);
-		}
-		if (decision == null) {
-			decision = new ProjectOrServiceChecker(action)
-					.isAuthorized(userUris);
-		}
-		if (decision == null) {
-			decision = new PresentationChecker(action).isAuthorized(userUris);
-		}
-		if (decision == null) {
-			decision = new CourseChecker(action).isAuthorized(userUris);
-		}
-		if (decision == null) {
-			decision = new AdvisingRelationshipChecker(action).isAuthorized(userUris);
-		}
-		if (decision == null) {
-			decision = userNotAuthorizedToStatement();
-		}
-		return decision;
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName()
-				+ ": information resources, grants, projects, etc. - "
-				+ hashCode();
-	}
-
-	// ----------------------------------------------------------------------
-	// helper classes
-	// ----------------------------------------------------------------------
-
-	/**
-	 * When the system starts up, install the policy. This class must be a
-	 * listener in web.xml
-	 * 
-	 * The CommonIdentifierBundleFactory already creates the IDs we need.
-	 */
-	public static class Setup implements ServletContextListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			ServletContext ctx = sce.getServletContext();
-
-			ServletPolicyList.addPolicy(ctx, new SelfEditorRelationshipPolicy(
-					ctx));
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) { /* nothing */
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vivo.auth.policy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.specialrelationships.AbstractRelationshipPolicy;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractPropertyStatementAction;
+
+/**
+ * Permit self-editors to edit the properties of classes with which they share a
+ * special relationship. So for example:
+ *
+ * A self-editor may edit properties of an InformationResource for which he is
+ * an author, an editor, or in which he is featured.
+ *
+ * A self-editor may edit properties of a Project in which he plays a clinical
+ * role.
+ *
+ * Etc.
+ *
+ * NOTE: properties or resources which are restricted by namespace or by access
+ * setting will still not be editable, even if this special relationship
+ * applies.
+ *
+ * NOTE: This could be further generalized by building a list of authorizing
+ * relationships, where each relationship may specify a type of object, a
+ * relating property (or chain of properties), and a text message describing the
+ * relationship (to be used in the decision).
+ */
+public class SelfEditorRelationshipPolicy extends AbstractRelationshipPolicy
+		implements PolicyIface {
+	private static final Log log = LogFactory
+			.getLog(SelfEditorRelationshipPolicy.class);
+
+	public SelfEditorRelationshipPolicy(ServletContext ctx) {
+		super(ctx);
+	}
+
+	@Override
+	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+			RequestedAction whatToAuth) {
+		if (whatToAuth == null) {
+			return inconclusiveDecision("whatToAuth was null");
+		}
+
+		if (!(whatToAuth instanceof AbstractPropertyStatementAction)) {
+			return inconclusiveDecision("Does not authorize "
+					+ whatToAuth.getClass().getSimpleName() + " actions");
+		}
+		AbstractPropertyStatementAction action = (AbstractPropertyStatementAction) whatToAuth;
+
+		List<String> userUris = new ArrayList<String>(
+				HasAssociatedIndividual.getIndividualUris(whoToAuth));
+		if (userUris.isEmpty()) {
+			return inconclusiveDecision("Not self-editing.");
+		}
+
+		if (!canModifyPredicate(action.getPredicate())) {
+			return cantModifyPredicate(action.getPredicate().getURI());
+		}
+
+		for (String resourceUri : action.getResourceUris()) {
+			if (!canModifyResource(resourceUri)) {
+				return cantModifyResource(resourceUri);
+			}
+		}
+
+		return checkRelationships(userUris, action);
+	}
+
+	private PolicyDecision checkRelationships(List<String> userUris,
+			AbstractPropertyStatementAction action) {
+
+		PolicyDecision decision = new InfoContentEntityChecker(action)
+				.isAuthorized(userUris);
+		if (decision == null) {
+			decision = new GrantChecker(action).isAuthorized(userUris);
+		}
+		if (decision == null) {
+			decision = new ProjectOrServiceChecker(action)
+					.isAuthorized(userUris);
+		}
+		if (decision == null) {
+			decision = new PresentationChecker(action).isAuthorized(userUris);
+		}
+		if (decision == null) {
+			decision = new CourseChecker(action).isAuthorized(userUris);
+		}
+		if (decision == null) {
+			decision = new AdvisingRelationshipChecker(action).isAuthorized(userUris);
+		}
+		if (decision == null) {
+			decision = userNotAuthorizedToStatement();
+		}
+		return decision;
+	}
+
+	@Override
+	public String toString() {
+		return this.getClass().getSimpleName()
+				+ ": information resources, grants, projects, etc. - "
+				+ hashCode();
+	}
+
+	// ----------------------------------------------------------------------
+	// helper classes
+	// ----------------------------------------------------------------------
+
+	/**
+	 * When the system starts up, install the policy. This class must be a
+	 * listener in web.xml
+	 *
+	 * The CommonIdentifierBundleFactory already creates the IDs we need.
+	 */
+	public static class Setup implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			ServletContext ctx = sce.getServletContext();
+
+			ServletPolicyList.addPolicy(ctx, new SelfEditorRelationshipPolicy(
+					ctx));
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) { /* nothing */
+		}
+	}
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java
index 5b47e234a4..32f5164614 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java
@@ -25,10 +25,10 @@
 
 /**
  * Setup for the ORCID interface.
- * 
+ *
  * Note that the property for CLIENT_SECRET is "orcid.clientPassword". Since it
  * ends in "password", it will not be displayed on the ShowConfiguration page.
- * 
+ *
  * The CALLBACK_PATH is hardcoded. It is relative to the WEBAPP_BASE_URL, so it
  * won't change.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java
index e930e50ce4..4362fd38e6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java
@@ -31,13 +31,13 @@
 /**
  * This data getter should be assigned to the template that renders the list
  * view for ORCID IDs.
- * 
+ *
  * Find out whether the user is authorized to confirm the ORCID IDs on this
  * page. Find the list of ORCID IDs, and whether each has already been
  * confirmed.
- * 
+ *
  * The information is stored in the values map like this:
- * 
+ *
  * <pre>
  *    orcidInfo = map {
  *        authorizedToConfirm: boolean
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java
index 6ce25b0bca..0f8ea8046d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java
@@ -21,7 +21,7 @@
 /**
  * We offered the confirmation screen, and they decided to go ahead. Get
  * authorization to authenticate them.
- * 
+ *
  * We can't assume that they haven't been here before, so they might already
  * have authorized, or denied authorization.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java
index 48d1dcaf1a..9d661fa704 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java
@@ -21,7 +21,7 @@
 /**
  * We offered to add external IDs and they decided to go ahead. Get
  * authorization.
- * 
+ *
  * We can't assume that they haven't been here before, so they might already
  * have authorized, or denied authorization.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java
index 9368dda4a9..5a29aafdef 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java
@@ -19,14 +19,14 @@
 
 /**
  * Handle the callbacks during the OAuth dance.
- * 
+ *
  * This is not like other handlers. It is created and invoked from doGet(), not
  * from processRequest().
  */
 public class OrcidCallbackHandler {
 	private static final Log log = LogFactory
 			.getLog(OrcidCallbackHandler.class);
-	
+
 	private final HttpServletRequest req;
 	private final HttpServletResponse resp;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java
index b834d6c2b1..f59234adf4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java
@@ -34,8 +34,8 @@
 class OrcidConfirmationState {
 	private static final Log log = LogFactory
 			.getLog(OrcidConfirmationState.class);
-	
-	
+
+
 	// ----------------------------------------------------------------------
 	// The factory
 	// ----------------------------------------------------------------------
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java
index 7a07689f1a..056d46cef6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java
@@ -67,10 +67,10 @@ private void initializeState() {
 			throw new IllegalStateException(
 					"No 'individualUri' parameter on request.");
 		}
-	
+
 		String profilePage = UrlBuilder.getIndividualProfileUrl(uri, vreq);
 		state.reset(uri, profilePage);
-		
+
 		individual = findIndividual();
 		locateExistingOrcids();
 		state.setExistingOrcids(existingOrcids);
@@ -90,7 +90,7 @@ private void locateExistingOrcids() {
 		for (ObjectPropertyStatement ops : opss) {
 			existingOrcids.add(ops.getObjectURI());
 		}
-		
+
 	}
 
 	private void initializeAuthorizationCache() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java
index 4a93377f21..ed6e6f4eab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java
@@ -26,9 +26,9 @@
 
 /**
  * New workflow:
- * 
+ *
  * <pre>
- *    Default: clear status for both readProfile and addExternalIDs 
+ *    Default: clear status for both readProfile and addExternalIDs
  *      show intro screen orcidOffer.ftl
  *    	The click "do it", goes to /getProfileAuth
  *      Or "return to profile"
@@ -36,7 +36,7 @@
  *      Else, do the dance, ending with /readProfile callback
  *      Denied? show orcidDenied.ftl
  *      Failed? show orcidFailed.ftl
- *    /readProfile: read the profile, store in status 
+ *    /readProfile: read the profile, store in status
  *    	figure external ID options, show orcidOfferIds.ftl
  *      If they click "do it", goes /authExternalIds
  *      If they click "nah", return to profile
diff --git a/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java b/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java
index 8048d3d7f5..b724929233 100644
--- a/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java
+++ b/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java
@@ -6,12 +6,12 @@
 import edu.cornell.mannlib.vitro.webapp.reasoner.plugin.SimpleBridgingRule;
 
 public class DCCreatorForDocuments extends SimpleBridgingRule implements ReasonerPlugin {
-	
+
 	private final static String DCTERMS = "http://purl.org/dc/terms/";
 	private final static String VIVOCORE = "http://vivoweb.org/ontology/core#";
-	
+
 	public DCCreatorForDocuments() {
-		super(VIVOCORE + "informationResourceInAuthorship", 
+		super(VIVOCORE + "informationResourceInAuthorship",
 			  VIVOCORE + "linkedAuthor",
 			  DCTERMS + "creator");
 	}
diff --git a/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java b/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java
index f2036c5873..93d7c30c1c 100644
--- a/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java
+++ b/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java
@@ -10,9 +10,9 @@
 public class DCTitleForDocuments extends SimplePropertyAndTypeRule implements ReasonerPlugin {
 
 	public DCTitleForDocuments() {
-		super(RDFS.label.getURI(), 
-		      "http://purl.org/ontology/bibo/Document", 
+		super(RDFS.label.getURI(),
+		      "http://purl.org/ontology/bibo/Document",
 		      "http://purl.org/dc/terms/title");
 	}
-			   
+
 }
diff --git a/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java b/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java
index ac49cd5372..aec7992854 100644
--- a/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java
+++ b/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java
@@ -17,16 +17,16 @@
 
 
 public class ModelUtils {
-	
+
 	private static final Log log = LogFactory.getLog(ModelUtils.class.getName());
-		
+
     private static final String processPropertyURI = "http://purl.obolibrary.org/obo/BFO_0000054";
     private static final String processPropertyInverseURI = "http://purl.obolibrary.org/obo/BFO_0000055";
     private static final String nonProcessPropertyURI = "http://vivoweb.org/ontology/core#roleContributesTo";
 	private static final String nonProcessPropertyInverseURI = "http://vivoweb.org/ontology/core#contributingRole";
     private static final String grantPropertyURI = "http://vivoweb.org/ontology/core#relatedBy";
 	private static final String grantPropertyInverseURI = "http://vivoweb.org/ontology/core#relates";
-	
+
 	private static Set<String> processClass = new HashSet<String>();
 	static {
 		processClass.add("http://vivoweb.org/ontology/core#Project");
@@ -49,29 +49,29 @@ public class ModelUtils {
 	 * a warning if so.
 	 */
 	public static ObjectProperty getPropertyForRoleInClass(String classURI, WebappDaoFactory wadf) {
-		
+
 		if (classURI == null) {
 			log.error("input classURI is null");
 			return null;
 		}
-		
+
 		if (wadf == null) {
 			log.error("input WebappDaoFactory is null");
 			return null;
 		}
-		
+
 		VClassDao vcd = wadf.getVClassDao();
 		List<String> superClassURIs = vcd.getSuperClassURIs(classURI, false);
 		superClassURIs.add(classURI);
 		Iterator<String> iter = superClassURIs.iterator();
-		
+
 		ObjectProperty op = new ObjectProperty();
 		boolean isBFOProcess = false;
 		boolean isGrantClass = false;
 
 	    while (iter.hasNext()) {
 	    	String superClassURI = iter.next();
-	    	
+
 	    	if (processClass.contains(superClassURI)) {
 	    		isBFOProcess = true;
 	    		break;
@@ -81,23 +81,23 @@ public static ObjectProperty getPropertyForRoleInClass(String classURI, WebappDa
 	    		break;
 	    	}
 	    }
-		
+
 	    if (isBFOProcess) {
 			op.setURI(processPropertyURI);
-			op.setURIInverse(processPropertyInverseURI);    	
-	    } 
+			op.setURIInverse(processPropertyInverseURI);
+	    }
 	    else if (isGrantClass){
 			op.setURI(grantPropertyURI);
-			op.setURIInverse(grantPropertyInverseURI);    	
+			op.setURIInverse(grantPropertyInverseURI);
 	    }
 	    else {
 			op.setURI(nonProcessPropertyURI);
-			op.setURIInverse(nonProcessPropertyInverseURI);    		    	
+			op.setURIInverse(nonProcessPropertyInverseURI);
 	    }
-	    
+
 		return op;
-	}	
-	
+	}
+
 	//Return list of all possible predicates
 	public static List<String> getPossiblePropertiesForRole() {
 		List<String> properties = new ArrayList<String>();
@@ -106,7 +106,7 @@ public static List<String> getPossiblePropertiesForRole() {
 		properties.add(grantPropertyURI);
 		return properties;
 	}
-	
+
 	public static List<String> getPossibleInversePropertiesForRole() {
 		List<String> properties = new ArrayList<String>();
 		properties.add(processPropertyInverseURI);
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java
index 44ed7f8c15..042a9552c6 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java
@@ -92,7 +92,7 @@ public class LabelsAcrossContextNodesTest extends AbstractTestClass {
 	/**
 	 * Create these relationships (where "r/r" denotes "relatedBy/relates"
 	 * combination.
-	 * 
+	 *
 	 * <pre>
 	 * Person1 r/r Position1 r/r Organization1
 	 * Person1 r/r AdvisingRelationship1 r/r Person2
@@ -138,12 +138,12 @@ public void populateModel() {
 	/*
 	 * If there is a type restriction and the individual does not meet it, no
 	 * change.
-	 * 
+	 *
 	 * If contextNodeClasses are not specified, get labels from all context
 	 * nodes. note that a partner without a label should just be a no-op.
-	 * 
+	 *
 	 * If contextNodeClasses are specified, accept some and ignore others.
-	 * 
+	 *
 	 * Confirm that the expected data is written to the text fields.
 	 */
 
@@ -202,11 +202,11 @@ public void noContextNodes_noResultsNoProblem() {
 	/**
 	 * <pre>
 	 * If neither a label nor a relates, ignore it.
-	 * 
+	 *
 	 * If label, test if no partners, if some partners, if some partners restricted by type.
 	 *   test with both contextNodeClasses and not.
 	 * Test with typeRestrictions or without.
-	 * 
+	 *
 	 * If relates, and fails contextNodeClasses, ignore it.
 	 * Test with contextNodeClasses and without.
 	 * Find partners, both with typeRestrictions and without.
@@ -292,7 +292,7 @@ public void relatedBy_inclusiveTypeRestriction_returnsPartner() {
 		exerciseUriFinder(stmt(URI_POSITION1, CORE_RELATED_BY, URI_PERSON1));
 		assertExpectedUris(URI_ORGANIZATION1);
 	}
-	
+
 	@Test
 	public void relatedBy_exclusiveTypeRestriction_returnsNothing() {
 		setTypeRestrictions(CORE_ADVISING_RELATIONSHIP);
@@ -300,7 +300,7 @@ public void relatedBy_exclusiveTypeRestriction_returnsNothing() {
 		exerciseUriFinder(stmt(URI_POSITION1, CORE_RELATED_BY, URI_PERSON1));
 		assertExpectedUris();
 	}
-	
+
 	@Test
 	public void relatedBy_inclusiveContextType_returnsPartner() {
 		setTypeRestrictions();
@@ -308,7 +308,7 @@ public void relatedBy_inclusiveContextType_returnsPartner() {
 		exerciseUriFinder(stmt(URI_POSITION1, CORE_RELATED_BY, URI_PERSON1));
 		assertExpectedUris(URI_ORGANIZATION1);
 	}
-	
+
 	@Test
 	public void relatedBy_exclusiveContextType_returnsNothing() {
 		setTypeRestrictions();
@@ -316,7 +316,7 @@ public void relatedBy_exclusiveContextType_returnsNothing() {
 		exerciseUriFinder(stmt(URI_POSITION1, CORE_RELATED_BY, URI_PERSON1));
 		assertExpectedUris();
 	}
-	
+
 	// ----------------------------------------------------------------------
 	// Helper methods
 	// ----------------------------------------------------------------------
diff --git a/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java b/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java
index ba437f61bb..4c4f11446c 100644
--- a/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java
@@ -1,448 +1,448 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vivo.auth.policy;
-
-import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.AUTHORIZED;
-import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.INCONCLUSIVE;
-import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_LITERAL;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub;
-import stubs.javax.servlet.ServletContextStub;
-
-import org.apache.jena.ontology.OntModel;
-import org.apache.jena.ontology.OntModelSpec;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Statement;
-import org.apache.jena.rdf.model.StmtIterator;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.ServerStatus;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.resource.AddResource;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-
-/**
- * Check the relationships in the SelfEditorRelationshipPolicy.
- * 
- * This only checks the relationships that deal with InfoContentEntitys. Testing
- * the others seems too redundant. If we generalize this to use configurable
- * relationships, then we'll be able to make more general tests as well.
- */
-public class SelfEditorRelationshipPolicyTest extends AbstractTestClass {
-	private static final Log log = LogFactory
-			.getLog(SelfEditorRelationshipPolicyTest.class);
-
-	/** Can edit properties or resources in this namespace. */
-	private static final String NS_PERMITTED = "http://vivo.mydomain.edu/individual/";
-
-	/** Can't edit properties or resources in this namespace. */
-	private static final String NS_RESTRICTED = VitroVocabulary.vitroURI;
-
-	/** The resource type is not checked by the admin restrictor. */
-	private static final String RESOURCE_TYPE = NS_RESTRICTED + "funkyType";
-
-	private static final String URI_PERMITTED_RESOURCE = NS_PERMITTED
-			+ "permittedResource";
-	private static final String URI_RESTRICTED_RESOURCE = NS_RESTRICTED
-			+ "restrictedResource";
-
-	private static final String URI_PERMITTED_PREDICATE = NS_PERMITTED
-			+ "permittedPredicate";
-	private static final Property PERMITTED_PREDICATE = new Property(
-			URI_PERMITTED_PREDICATE);
-	private static final String URI_RESTRICTED_PREDICATE = NS_RESTRICTED
-			+ "restrictedPredicate";
-	private static final Property RESTRICTED_PREDICATE = new Property(
-			URI_RESTRICTED_PREDICATE);
-
-	/**
-	 * Where the model statements are stored for this test.
-	 */
-	private static final String N3_DATA_FILENAME = "SelfEditorRelationship"
-			+ "PolicyTest.n3";
-
-	/**
-	 * These URIs must match the data in the N3 file.
-	 */
-	private static final String URI_BOZO = NS_PERMITTED + "bozo";
-	private static final String URI_JOE = NS_PERMITTED + "joe";
-	private static final String URI_NOBODY_WROTE_IT = NS_PERMITTED
-			+ "nobodyWroteIt";
-	private static final String URI_BOZO_WROTE_IT = NS_PERMITTED
-			+ "bozoWroteIt";
-	private static final String URI_BOZO_EDITED_IT = NS_PERMITTED
-			+ "bozoEditedIt";
-	private static final String URI_BOZO_FEATURED_IN_IT = NS_PERMITTED
-			+ "bozoFeaturedInIt";
-	private static final String URI_JOE_WROTE_IT = NS_PERMITTED + "joeWroteIt";
-	private static final String URI_JOE_EDITED_IT = NS_PERMITTED
-			+ "joeEditedIt";
-	private static final String URI_JOE_FEATURED_IN_IT = NS_PERMITTED
-			+ "joeFeaturedInIt";
-
-	private static OntModel ontModel;
-
-	@BeforeClass
-	public static void setupModel() throws IOException {
-		InputStream stream = SelfEditorRelationshipPolicyTest.class
-				.getResourceAsStream(N3_DATA_FILENAME);
-		Model model = ModelFactory.createDefaultModel();
-		model.read(stream, null, "N3");
-		stream.close();
-
-		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
-				model);
-		ontModel.prepare();
-		dumpModel();
-	}
-
-	private SelfEditorRelationshipPolicy policy;
-	private RequestedAction action;
-
-	@Before
-	public void setupPolicy() {
-		ServletContextStub ctx = new ServletContextStub();
-		PropertyRestrictionBeanStub.getInstance(new String[] { NS_RESTRICTED });
-
-		policy = new SelfEditorRelationshipPolicy(ctx);
-	}
-
-	private IdentifierBundle idNobody;
-	private IdentifierBundle idBozo;
-	private IdentifierBundle idJoe;
-	private IdentifierBundle idBozoAndJoe;
-
-	@Before
-	public void setupIdBundles() {
-		idNobody = new ArrayIdentifierBundle();
-
-		idBozo = new ArrayIdentifierBundle();
-		idBozo.add(makeSelfEditingId(URI_BOZO));
-
-		idJoe = new ArrayIdentifierBundle();
-		idJoe.add(makeSelfEditingId(URI_JOE));
-
-		idBozoAndJoe = new ArrayIdentifierBundle();
-		idBozoAndJoe.add(makeSelfEditingId(URI_BOZO));
-		idBozoAndJoe.add(makeSelfEditingId(URI_JOE));
-	}
-
-	@Before
-	public void setLogging() {
-		// setLoggerLevel(this.getClass(), Level.DEBUG);
-	}
-
-	// ----------------------------------------------------------------------
-	// boilerplate tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void whoIsNull() {
-		action = new AddResource(RESOURCE_TYPE, URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(null, action));
-	}
-
-	@Test
-	public void whatIsNull() {
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, null));
-	}
-
-	@Test
-	public void notSelfEditing() {
-		action = new AddResource(RESOURCE_TYPE, URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
-	}
-
-	@Test
-	public void requestedActionOutOfScope() {
-		action = new ServerStatus();
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsRestricted() {
-		action = new AddDataPropertyStatement(ontModel,
-				URI_RESTRICTED_RESOURCE, URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void dataPropPredicateIsRestricted() {
-		action = new AddDataPropertyStatement(ontModel, URI_JOE_EDITED_IT,
-				URI_RESTRICTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsRestricted() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_RESTRICTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropPredicateIsRestricted() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, RESTRICTED_PREDICATE, URI_JOE_EDITED_IT);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsRestricted() {
-		action = new AddObjectPropertyStatement(ontModel, URI_JOE_EDITED_IT,
-				PERMITTED_PREDICATE, URI_RESTRICTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	// ----------------------------------------------------------------------
-	// InfoContentEntity tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void dataPropSubjectIsIceButNobodyIsSelfEditing() {
-		action = new AddDataPropertyStatement(ontModel, URI_JOE_WROTE_IT,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsIceButNoAuthorsOrEditorsOrFeatured() {
-		action = new AddDataPropertyStatement(ontModel, URI_NOBODY_WROTE_IT,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsIceButWrongAuthor() {
-		action = new AddDataPropertyStatement(ontModel, URI_BOZO_WROTE_IT,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsIceButWrongEditor() {
-		action = new AddDataPropertyStatement(ontModel, URI_BOZO_EDITED_IT,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsIceButWrongFeatured() {
-		action = new AddDataPropertyStatement(ontModel,
-				URI_BOZO_FEATURED_IN_IT, URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsIceWithSelfEditingAuthor() {
-		action = new AddDataPropertyStatement(ontModel, URI_JOE_WROTE_IT,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsIceWithSelfEditingEditor() {
-		action = new AddDataPropertyStatement(ontModel, URI_JOE_EDITED_IT,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void dataPropSubjectIsIceWithSelfEditingFeatured() {
-		action = new AddDataPropertyStatement(ontModel, URI_JOE_FEATURED_IN_IT,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceButNobodyIsSelfEditing() {
-		action = new AddObjectPropertyStatement(ontModel, URI_JOE_EDITED_IT,
-				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceButNoAuthorsOrEditorsOrFeatured() {
-		action = new AddObjectPropertyStatement(ontModel, URI_NOBODY_WROTE_IT,
-				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceButWrongAuthor() {
-		action = new AddObjectPropertyStatement(ontModel, URI_BOZO_WROTE_IT,
-				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceButWrongEditor() {
-		action = new AddObjectPropertyStatement(ontModel, URI_BOZO_EDITED_IT,
-				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceButWrongFeatured() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_BOZO_FEATURED_IN_IT, PERMITTED_PREDICATE,
-				URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceWithSelfEditingAuthor() {
-		action = new AddObjectPropertyStatement(ontModel, URI_JOE_WROTE_IT,
-				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceWithSelfEditingEditor() {
-		action = new AddObjectPropertyStatement(ontModel, URI_JOE_EDITED_IT,
-				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropSubjectIsIceWithSelfEditingFeatured() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_JOE_FEATURED_IN_IT, PERMITTED_PREDICATE,
-				URI_PERMITTED_RESOURCE);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIcebutNobodyIsSelfEditing() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIceButNoAuthorsOrEditors() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
-				URI_NOBODY_WROTE_IT);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIceButWrongAuthor() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_BOZO_WROTE_IT);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIceButWrongEditor() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_BOZO_EDITED_IT);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIceButWrongFeatured() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
-				URI_BOZO_FEATURED_IN_IT);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIceWithSelfEditingAuthor() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_WROTE_IT);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIceWithSelfEditingEditor() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	@Test
-	public void objectPropObjectIsIceWithSelfEditingFeatured() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
-				URI_JOE_FEATURED_IN_IT);
-		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
-		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
-	}
-
-	// ----------------------------------------------------------------------
-	// Other tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void dataPropSubjectIsNotIce() {
-		action = new AddDataPropertyStatement(ontModel, URI_PERMITTED_RESOURCE,
-				URI_PERMITTED_PREDICATE, SOME_LITERAL);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	@Test
-	public void objectPropNeitherSubjectOrObjectIsIce() {
-		action = new AddObjectPropertyStatement(ontModel,
-				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
-				URI_PERMITTED_RESOURCE);
-		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
-	}
-
-	// ----------------------------------------------------------------------
-	// helper methods
-	// ----------------------------------------------------------------------
-
-	private HasProfile makeSelfEditingId(String uri) {
-		return new HasProfile(uri);
-	}
-
-	private void assertDecision(Authorization expected, PolicyDecision decision) {
-		log.debug("Decision is: " + decision);
-		assertNotNull("decision exists", decision);
-		assertEquals("authorization", expected, decision.getAuthorized());
-	}
-
-	private static void dumpModel() {
-		if (log.isDebugEnabled()) {
-			StmtIterator stmtIt = ontModel.listStatements();
-			while (stmtIt.hasNext()) {
-				Statement stmt = stmtIt.next();
-				log.debug("stmt: " + stmt);
-			}
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vivo.auth.policy;
+
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.AUTHORIZED;
+import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.INCONCLUSIVE;
+import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_LITERAL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub;
+import stubs.javax.servlet.ServletContextStub;
+
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.admin.ServerStatus;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.resource.AddResource;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+/**
+ * Check the relationships in the SelfEditorRelationshipPolicy.
+ *
+ * This only checks the relationships that deal with InfoContentEntitys. Testing
+ * the others seems too redundant. If we generalize this to use configurable
+ * relationships, then we'll be able to make more general tests as well.
+ */
+public class SelfEditorRelationshipPolicyTest extends AbstractTestClass {
+	private static final Log log = LogFactory
+			.getLog(SelfEditorRelationshipPolicyTest.class);
+
+	/** Can edit properties or resources in this namespace. */
+	private static final String NS_PERMITTED = "http://vivo.mydomain.edu/individual/";
+
+	/** Can't edit properties or resources in this namespace. */
+	private static final String NS_RESTRICTED = VitroVocabulary.vitroURI;
+
+	/** The resource type is not checked by the admin restrictor. */
+	private static final String RESOURCE_TYPE = NS_RESTRICTED + "funkyType";
+
+	private static final String URI_PERMITTED_RESOURCE = NS_PERMITTED
+			+ "permittedResource";
+	private static final String URI_RESTRICTED_RESOURCE = NS_RESTRICTED
+			+ "restrictedResource";
+
+	private static final String URI_PERMITTED_PREDICATE = NS_PERMITTED
+			+ "permittedPredicate";
+	private static final Property PERMITTED_PREDICATE = new Property(
+			URI_PERMITTED_PREDICATE);
+	private static final String URI_RESTRICTED_PREDICATE = NS_RESTRICTED
+			+ "restrictedPredicate";
+	private static final Property RESTRICTED_PREDICATE = new Property(
+			URI_RESTRICTED_PREDICATE);
+
+	/**
+	 * Where the model statements are stored for this test.
+	 */
+	private static final String N3_DATA_FILENAME = "SelfEditorRelationship"
+			+ "PolicyTest.n3";
+
+	/**
+	 * These URIs must match the data in the N3 file.
+	 */
+	private static final String URI_BOZO = NS_PERMITTED + "bozo";
+	private static final String URI_JOE = NS_PERMITTED + "joe";
+	private static final String URI_NOBODY_WROTE_IT = NS_PERMITTED
+			+ "nobodyWroteIt";
+	private static final String URI_BOZO_WROTE_IT = NS_PERMITTED
+			+ "bozoWroteIt";
+	private static final String URI_BOZO_EDITED_IT = NS_PERMITTED
+			+ "bozoEditedIt";
+	private static final String URI_BOZO_FEATURED_IN_IT = NS_PERMITTED
+			+ "bozoFeaturedInIt";
+	private static final String URI_JOE_WROTE_IT = NS_PERMITTED + "joeWroteIt";
+	private static final String URI_JOE_EDITED_IT = NS_PERMITTED
+			+ "joeEditedIt";
+	private static final String URI_JOE_FEATURED_IN_IT = NS_PERMITTED
+			+ "joeFeaturedInIt";
+
+	private static OntModel ontModel;
+
+	@BeforeClass
+	public static void setupModel() throws IOException {
+		InputStream stream = SelfEditorRelationshipPolicyTest.class
+				.getResourceAsStream(N3_DATA_FILENAME);
+		Model model = ModelFactory.createDefaultModel();
+		model.read(stream, null, "N3");
+		stream.close();
+
+		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+				model);
+		ontModel.prepare();
+		dumpModel();
+	}
+
+	private SelfEditorRelationshipPolicy policy;
+	private RequestedAction action;
+
+	@Before
+	public void setupPolicy() {
+		ServletContextStub ctx = new ServletContextStub();
+		PropertyRestrictionBeanStub.getInstance(new String[] { NS_RESTRICTED });
+
+		policy = new SelfEditorRelationshipPolicy(ctx);
+	}
+
+	private IdentifierBundle idNobody;
+	private IdentifierBundle idBozo;
+	private IdentifierBundle idJoe;
+	private IdentifierBundle idBozoAndJoe;
+
+	@Before
+	public void setupIdBundles() {
+		idNobody = new ArrayIdentifierBundle();
+
+		idBozo = new ArrayIdentifierBundle();
+		idBozo.add(makeSelfEditingId(URI_BOZO));
+
+		idJoe = new ArrayIdentifierBundle();
+		idJoe.add(makeSelfEditingId(URI_JOE));
+
+		idBozoAndJoe = new ArrayIdentifierBundle();
+		idBozoAndJoe.add(makeSelfEditingId(URI_BOZO));
+		idBozoAndJoe.add(makeSelfEditingId(URI_JOE));
+	}
+
+	@Before
+	public void setLogging() {
+		// setLoggerLevel(this.getClass(), Level.DEBUG);
+	}
+
+	// ----------------------------------------------------------------------
+	// boilerplate tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void whoIsNull() {
+		action = new AddResource(RESOURCE_TYPE, URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(null, action));
+	}
+
+	@Test
+	public void whatIsNull() {
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, null));
+	}
+
+	@Test
+	public void notSelfEditing() {
+		action = new AddResource(RESOURCE_TYPE, URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
+	}
+
+	@Test
+	public void requestedActionOutOfScope() {
+		action = new ServerStatus();
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsRestricted() {
+		action = new AddDataPropertyStatement(ontModel,
+				URI_RESTRICTED_RESOURCE, URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void dataPropPredicateIsRestricted() {
+		action = new AddDataPropertyStatement(ontModel, URI_JOE_EDITED_IT,
+				URI_RESTRICTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsRestricted() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_RESTRICTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropPredicateIsRestricted() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, RESTRICTED_PREDICATE, URI_JOE_EDITED_IT);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsRestricted() {
+		action = new AddObjectPropertyStatement(ontModel, URI_JOE_EDITED_IT,
+				PERMITTED_PREDICATE, URI_RESTRICTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	// ----------------------------------------------------------------------
+	// InfoContentEntity tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void dataPropSubjectIsIceButNobodyIsSelfEditing() {
+		action = new AddDataPropertyStatement(ontModel, URI_JOE_WROTE_IT,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsIceButNoAuthorsOrEditorsOrFeatured() {
+		action = new AddDataPropertyStatement(ontModel, URI_NOBODY_WROTE_IT,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsIceButWrongAuthor() {
+		action = new AddDataPropertyStatement(ontModel, URI_BOZO_WROTE_IT,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsIceButWrongEditor() {
+		action = new AddDataPropertyStatement(ontModel, URI_BOZO_EDITED_IT,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsIceButWrongFeatured() {
+		action = new AddDataPropertyStatement(ontModel,
+				URI_BOZO_FEATURED_IN_IT, URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsIceWithSelfEditingAuthor() {
+		action = new AddDataPropertyStatement(ontModel, URI_JOE_WROTE_IT,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsIceWithSelfEditingEditor() {
+		action = new AddDataPropertyStatement(ontModel, URI_JOE_EDITED_IT,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void dataPropSubjectIsIceWithSelfEditingFeatured() {
+		action = new AddDataPropertyStatement(ontModel, URI_JOE_FEATURED_IN_IT,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceButNobodyIsSelfEditing() {
+		action = new AddObjectPropertyStatement(ontModel, URI_JOE_EDITED_IT,
+				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceButNoAuthorsOrEditorsOrFeatured() {
+		action = new AddObjectPropertyStatement(ontModel, URI_NOBODY_WROTE_IT,
+				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceButWrongAuthor() {
+		action = new AddObjectPropertyStatement(ontModel, URI_BOZO_WROTE_IT,
+				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceButWrongEditor() {
+		action = new AddObjectPropertyStatement(ontModel, URI_BOZO_EDITED_IT,
+				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceButWrongFeatured() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_BOZO_FEATURED_IN_IT, PERMITTED_PREDICATE,
+				URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceWithSelfEditingAuthor() {
+		action = new AddObjectPropertyStatement(ontModel, URI_JOE_WROTE_IT,
+				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceWithSelfEditingEditor() {
+		action = new AddObjectPropertyStatement(ontModel, URI_JOE_EDITED_IT,
+				PERMITTED_PREDICATE, URI_PERMITTED_RESOURCE);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropSubjectIsIceWithSelfEditingFeatured() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_JOE_FEATURED_IN_IT, PERMITTED_PREDICATE,
+				URI_PERMITTED_RESOURCE);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIcebutNobodyIsSelfEditing() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIceButNoAuthorsOrEditors() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
+				URI_NOBODY_WROTE_IT);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIceButWrongAuthor() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_BOZO_WROTE_IT);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIceButWrongEditor() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_BOZO_EDITED_IT);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIceButWrongFeatured() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
+				URI_BOZO_FEATURED_IN_IT);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIceWithSelfEditingAuthor() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_WROTE_IT);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIceWithSelfEditingEditor() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	@Test
+	public void objectPropObjectIsIceWithSelfEditingFeatured() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
+				URI_JOE_FEATURED_IN_IT);
+		assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action));
+		assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action));
+	}
+
+	// ----------------------------------------------------------------------
+	// Other tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void dataPropSubjectIsNotIce() {
+		action = new AddDataPropertyStatement(ontModel, URI_PERMITTED_RESOURCE,
+				URI_PERMITTED_PREDICATE, SOME_LITERAL);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	@Test
+	public void objectPropNeitherSubjectOrObjectIsIce() {
+		action = new AddObjectPropertyStatement(ontModel,
+				URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE,
+				URI_PERMITTED_RESOURCE);
+		assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action));
+	}
+
+	// ----------------------------------------------------------------------
+	// helper methods
+	// ----------------------------------------------------------------------
+
+	private HasProfile makeSelfEditingId(String uri) {
+		return new HasProfile(uri);
+	}
+
+	private void assertDecision(Authorization expected, PolicyDecision decision) {
+		log.debug("Decision is: " + decision);
+		assertNotNull("decision exists", decision);
+		assertEquals("authorization", expected, decision.getAuthorized());
+	}
+
+	private static void dumpModel() {
+		if (log.isDebugEnabled()) {
+			StmtIterator stmtIt = ontModel.listStatements();
+			while (stmtIt.hasNext()) {
+				Statement stmt = stmtIt.next();
+				log.debug("stmt: " + stmt);
+			}
+		}
+	}
+}
diff --git a/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3
index c2c53caa0c..198bb775e7 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3
@@ -1,165 +1,165 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
-
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix bib: <http://purl.org/ontology/bibo/> .
-@prefix core: <http://vivoweb.org/ontology/core#> .
-@prefix obo: <http://purl.obolibrary.org/obo/> .
-@prefix mydomain: <http://vivo.mydomain.edu/individual/> .
-
-
-### This file contains data for SelfEditorRelationshipPolicyTest.java.
-
-#
-# Bozo
-#
-mydomain:bozo
-	a foaf:Agent ;
-	a foaf:Person ;
-	a owl:Thing ;
-	a core:EmeritusProfessor ;
-	rdfs:label "Person, Bozo" ;
-	foaf:firstName "Bozo" ;
-	foaf:lastName "Person" ;
-	core:relatedBy mydomain:authorshipBozo ;
-	core:relatedBy mydomain:editorshipBozo ;
-	.
-
-#
-# Joe
-#
-mydomain:joe
-	a foaf:Agent ;
-	a foaf:Person ;
-	a owl:Thing ;
-	a core:EmeritusProfessor ;
-	rdfs:label "Person, Joe" ;
-	foaf:firstName "Joe" ;
-	foaf:lastName "Person" ;
-	core:relatedBy mydomain:authorshipJoe ;
-	core:relatedBy mydomain:editorshipJoe ;
-	.
-
-#
-# info content entity with no author or editor
-#
-mydomain:nobodyWroteIt
-	a core:BlogPosting ;
-	a obo:IAO_0000030 ;
-	a bib:Article ;
-	a bib:Document ;
-	a owl:Thing ;
-	rdfs:label "No author or editor" ;
-	.
-
-#
-# info content entity with Bozo as author
-#
-mydomain:bozoWroteIt
-	a core:BlogPosting ;
-	a obo:IAO_0000030 ;
-	a bib:Article ;
-	a bib:Document ;
-	a owl:Thing ;
-	rdfs:label "Bozo is author" ;
-	core:relatedBy mydomain:authorshipBozo ;
-	.
-
-mydomain:authorshipBozo
-	a core:Authorship ;
-	a core:Relationship ;
-	a owl:Thing ;
-	core:relates mydomain:bozoWroteIt ;
-	core:relates mydomain:bozo ;
-	.
-
-#
-# info content entity with Bozo as editor 
-#
-mydomain:bozoEditedIt
-	a core:BlogPosting ;
-	a obo:IAO_0000030 ;
-	a bib:Article ;
-	a bib:Document ;
-	a owl:Thing ;
-	rdfs:label "Bozo is editor" ;
-	core:relatedBy mydomain:editorshipBozo ;
-	.
-
-mydomain:editorshipBozo
-	a core:Editorship ;
-	a core:Relationship ;
-	a owl:Thing ;
-	core:relates mydomain:bozoEditedIt ;
-	core:relates mydomain:bozo ;
-	.
-
-#
-# info content entity with Bozo featured 
-#
-mydomain:bozoFeaturedInIt
-	a core:BlogPosting ;
-	a obo:IAO_0000030 ;
-	a bib:Article ;
-	a bib:Document ;
-	a owl:Thing ;
-	rdfs:label "Bozo is featured" ;
-	core:features mydomain:bozo ;
-	.
-
-#
-# info content entity with Joe as author
-#
-mydomain:joeWroteIt
-	a core:BlogPosting ;
-	a obo:IAO_0000030 ;
-	a bib:Article ;
-	a bib:Document ;
-	a owl:Thing ;
-	rdfs:label "Joe is author" ;
-	core:relatedBy mydomain:authorshipJoe ;
-	.
-
-mydomain:authorshipJoe
-	a core:Authorship ;
-	a core:Relationship ;
-	a owl:Thing ;
-	core:relates mydomain:joeWroteIt ;
-	core:relates mydomain:joe ;
-	.
-
-#
-# info content entity with Joe as editor 
-#
-mydomain:joeEditedIt
-	a core:BlogPosting ;
-	a obo:IAO_0000030 ;
-	a bib:Article ;
-	a bib:Document ;
-	a owl:Thing ;
-	rdfs:label "Joe is editor" ;
-	core:relatedBy mydomain:editorshipJoe ;
-	.
-
-mydomain:editorshipJoe
-	a core:Editorship ;
-	a core:Relationship ;
-	a owl:Thing ;
-	core:relates mydomain:joeEditedIt ;
-	core:relates mydomain:joe ;
-	.
-
-#
-# info content entity with Joe featured 
-#
-mydomain:joeFeaturedInIt
-	a core:BlogPosting ;
-	a obo:IAO_0000030 ;
-	a bib:Article ;
-	a bib:Document ;
-	a owl:Thing ;
-	rdfs:label "Joe is featured" ;
-	core:features mydomain:joe ;
-	.
+# $This file is distributed under the terms of the license in LICENSE$
+
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix bib: <http://purl.org/ontology/bibo/> .
+@prefix core: <http://vivoweb.org/ontology/core#> .
+@prefix obo: <http://purl.obolibrary.org/obo/> .
+@prefix mydomain: <http://vivo.mydomain.edu/individual/> .
+
+
+### This file contains data for SelfEditorRelationshipPolicyTest.java.
+
+#
+# Bozo
+#
+mydomain:bozo
+	a foaf:Agent ;
+	a foaf:Person ;
+	a owl:Thing ;
+	a core:EmeritusProfessor ;
+	rdfs:label "Person, Bozo" ;
+	foaf:firstName "Bozo" ;
+	foaf:lastName "Person" ;
+	core:relatedBy mydomain:authorshipBozo ;
+	core:relatedBy mydomain:editorshipBozo ;
+	.
+
+#
+# Joe
+#
+mydomain:joe
+	a foaf:Agent ;
+	a foaf:Person ;
+	a owl:Thing ;
+	a core:EmeritusProfessor ;
+	rdfs:label "Person, Joe" ;
+	foaf:firstName "Joe" ;
+	foaf:lastName "Person" ;
+	core:relatedBy mydomain:authorshipJoe ;
+	core:relatedBy mydomain:editorshipJoe ;
+	.
+
+#
+# info content entity with no author or editor
+#
+mydomain:nobodyWroteIt
+	a core:BlogPosting ;
+	a obo:IAO_0000030 ;
+	a bib:Article ;
+	a bib:Document ;
+	a owl:Thing ;
+	rdfs:label "No author or editor" ;
+	.
+
+#
+# info content entity with Bozo as author
+#
+mydomain:bozoWroteIt
+	a core:BlogPosting ;
+	a obo:IAO_0000030 ;
+	a bib:Article ;
+	a bib:Document ;
+	a owl:Thing ;
+	rdfs:label "Bozo is author" ;
+	core:relatedBy mydomain:authorshipBozo ;
+	.
+
+mydomain:authorshipBozo
+	a core:Authorship ;
+	a core:Relationship ;
+	a owl:Thing ;
+	core:relates mydomain:bozoWroteIt ;
+	core:relates mydomain:bozo ;
+	.
+
+#
+# info content entity with Bozo as editor
+#
+mydomain:bozoEditedIt
+	a core:BlogPosting ;
+	a obo:IAO_0000030 ;
+	a bib:Article ;
+	a bib:Document ;
+	a owl:Thing ;
+	rdfs:label "Bozo is editor" ;
+	core:relatedBy mydomain:editorshipBozo ;
+	.
+
+mydomain:editorshipBozo
+	a core:Editorship ;
+	a core:Relationship ;
+	a owl:Thing ;
+	core:relates mydomain:bozoEditedIt ;
+	core:relates mydomain:bozo ;
+	.
+
+#
+# info content entity with Bozo featured
+#
+mydomain:bozoFeaturedInIt
+	a core:BlogPosting ;
+	a obo:IAO_0000030 ;
+	a bib:Article ;
+	a bib:Document ;
+	a owl:Thing ;
+	rdfs:label "Bozo is featured" ;
+	core:features mydomain:bozo ;
+	.
+
+#
+# info content entity with Joe as author
+#
+mydomain:joeWroteIt
+	a core:BlogPosting ;
+	a obo:IAO_0000030 ;
+	a bib:Article ;
+	a bib:Document ;
+	a owl:Thing ;
+	rdfs:label "Joe is author" ;
+	core:relatedBy mydomain:authorshipJoe ;
+	.
+
+mydomain:authorshipJoe
+	a core:Authorship ;
+	a core:Relationship ;
+	a owl:Thing ;
+	core:relates mydomain:joeWroteIt ;
+	core:relates mydomain:joe ;
+	.
+
+#
+# info content entity with Joe as editor
+#
+mydomain:joeEditedIt
+	a core:BlogPosting ;
+	a obo:IAO_0000030 ;
+	a bib:Article ;
+	a bib:Document ;
+	a owl:Thing ;
+	rdfs:label "Joe is editor" ;
+	core:relatedBy mydomain:editorshipJoe ;
+	.
+
+mydomain:editorshipJoe
+	a core:Editorship ;
+	a core:Relationship ;
+	a owl:Thing ;
+	core:relates mydomain:joeEditedIt ;
+	core:relates mydomain:joe ;
+	.
+
+#
+# info content entity with Joe featured
+#
+mydomain:joeFeaturedInIt
+	a core:BlogPosting ;
+	a obo:IAO_0000030 ;
+	a bib:Article ;
+	a bib:Document ;
+	a owl:Thing ;
+	rdfs:label "Joe is featured" ;
+	core:features mydomain:joe ;
+	.
diff --git a/api/src/test/resources/log4j.properties b/api/src/test/resources/log4j.properties
index 689d1db803..efa92dd05f 100644
--- a/api/src/test/resources/log4j.properties
+++ b/api/src/test/resources/log4j.properties
@@ -1,10 +1,10 @@
-#
-# A simple Log4J configuration for unit tests. 
-#
-# It's not very important, because the tests themselves will override this 
-# configuration in AbstractTestClass.initializeLogging().
-#
-log4j.rootLogger=WARN, AllAppender
-log4j.appender.AllAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.AllAppender.layout.ConversionPattern=%p %t %c - %m%n
+#
+# A simple Log4J configuration for unit tests.
+#
+# It's not very important, because the tests themselves will override this
+# configuration in AbstractTestClass.initializeLogging().
+#
+log4j.rootLogger=WARN, AllAppender
+log4j.appender.AllAppender=org.apache.log4j.ConsoleAppender
+log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.AllAppender.layout.ConversionPattern=%p %t %c - %m%n
diff --git a/home/src/main/resources/config/example.applicationSetup.n3 b/home/src/main/resources/config/example.applicationSetup.n3
index 0d079ad5d3..d5622c2fa3 100644
--- a/home/src/main/resources/config/example.applicationSetup.n3
+++ b/home/src/main/resources/config/example.applicationSetup.n3
@@ -3,7 +3,7 @@
 # This file specifies the structure of the Vitro application: which modules
 # are used, and what parameters they require.
 #
-# Most Vitro installations will not need to modify this file. 
+# Most Vitro installations will not need to modify this file.
 #
 # For most installations, only the settings in the runtime.properties file will
 # be changed.
@@ -15,11 +15,11 @@
 
 # ----------------------------
 #
-# Describe the application by its implementing class and by references to the 
+# Describe the application by its implementing class and by references to the
 # modules it uses.
-# 
+#
 
-:application 
+:application
     a   vitroWebapp:application.ApplicationImpl ,
         vitroWebapp:modules.Application ;
     :hasSearchEngine              :instrumentedSearchEngineWrapper ;
@@ -32,7 +32,7 @@
 
 # ----------------------------
 #
-# Image processor module: 
+# Image processor module:
 #
 
 :iioImageProcessor
@@ -41,25 +41,25 @@
 
 # ----------------------------
 #
-# File storage module: 
+# File storage module:
 #    The PairTree-inspired implementation is the only standard option.
 #    It requires no parameters.
 #
 
-:ptiFileStorage 
+:ptiFileStorage
     a   vitroWebapp:filestorage.impl.FileStorageImplWrapper ,
         vitroWebapp:modules.fileStorage.FileStorage .
-               
+
 # ----------------------------
 #
-# Search engine module: 
+# Search engine module:
 #    The Solr-based implementation is the only standard option, but it can be
-#    wrapped in an "instrumented" wrapper, which provides additional logging 
+#    wrapped in an "instrumented" wrapper, which provides additional logging
 #    and more rigorous life-cycle checking.
 #
 
-:instrumentedSearchEngineWrapper 
-    a   vitroWebapp:searchengine.InstrumentedSearchEngineWrapper , 
+:instrumentedSearchEngineWrapper
+    a   vitroWebapp:searchengine.InstrumentedSearchEngineWrapper ,
         vitroWebapp:modules.searchEngine.SearchEngine ;
     :wraps :solrSearchEngine .
 
@@ -69,8 +69,8 @@
 
 # ----------------------------
 #
-# Search indexer module: 
-#    There is only one standard implementation. You must specify the number of 
+# Search indexer module:
+#    There is only one standard implementation. You must specify the number of
 #    worker threads in the thread pool.
 #
 
@@ -78,14 +78,14 @@
     a   vitroWebapp:searchindex.SearchIndexerImpl ,
         vitroWebapp:modules.searchIndexer.SearchIndexer ;
     :threadPoolSize "10" .
-    
+
 # ----------------------------
 #
 # Content triples source module: holds data contents
 #    The SDB-based implementation is the default option. It reads its parameters
 #    from the runtime.properties file, for backward compatibility.
 #
-#    Other implementations are based on a local TDB instance, a "standard" SPARQL 
+#    Other implementations are based on a local TDB instance, a "standard" SPARQL
 #    endpoint, or a Virtuoso endpoint, with parameters as shown.
 #
 
@@ -104,7 +104,7 @@
 #        vitroWebapp:modules.tripleSource.ContentTripleSource ;
 #    # The URI of the SPARQL endpoint for your triple-store.
 #    :hasEndpointURI "PUT_YOUR_SPARQL_ENDPOINT_URI_HERE" ;
-#    # The URI to use for SPARQL UPDATE calls against your triple-store. 
+#    # The URI to use for SPARQL UPDATE calls against your triple-store.
 #    :hasUpdateEndpointURI "PUT_THE UPDATE_URI_HERE" .
 
 #:virtuosoContentTripleSource
@@ -127,10 +127,10 @@
 :tdbConfigurationTripleSource
     a   vitroWebapp:triplesource.impl.tdb.ConfigurationTripleSourceTDB ,
         vitroWebapp:modules.tripleSource.ConfigurationTripleSource .
-        
+
 # ----------------------------
 #
-# TBox reasoner module: 
+# TBox reasoner module:
 #    The JFact-based implementation is the only standard option.
 #    It requires no parameters.
 #
diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties
index f665b0fc92..03561d6633 100644
--- a/home/src/main/resources/config/example.runtime.properties
+++ b/home/src/main/resources/config/example.runtime.properties
@@ -4,13 +4,13 @@
 #
 # This file is provided as example.runtime.properties.
 #
-# Save a copy of this file as runtime.properties in your VIVO home directory, 
+# Save a copy of this file as runtime.properties in your VIVO home directory,
 # and edit the properties as needed for your installation.
 #
 # For more information on specific properties, see the configuration reference
 # or installation options section of the technical documentation for the
 # version of VIVO you are running:
-# https://wiki.duraspace.org/display/VIVO/VIVO+Technical+Documentation 
+# https://wiki.duraspace.org/display/VIVO/VIVO+Technical+Documentation
 #
 # -----------------------------------------------------------------------------
 
@@ -19,13 +19,13 @@
 # BASIC PROPERTIES
 # -----------------------------------------------------------------------------
 
-  # 
-  # This namespace will be used when generating URIs for objects created in the 
-  # editor. In order to serve linked data, the default namespace must be composed 
-  # as follows (optional elements in parentheses): 
+  #
+  # This namespace will be used when generating URIs for objects created in the
+  # editor. In order to serve linked data, the default namespace must be composed
+  # as follows (optional elements in parentheses):
   #
   # scheme + server_name (+ port) (+ servlet_context) + "/individual/"
-  # 
+  #
   # For example, Cornell's default namespace is:
   #
   # http://vivo.cornell.edu/individual/
@@ -33,9 +33,9 @@
 Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
 
   #
-  # The email address of the root user for the VIVO application. The password 
-  # for this user is initially set to "rootPassword", but you will be asked to 
-  # change the password the first time you log in. 
+  # The email address of the root user for the VIVO application. The password
+  # for this user is initially set to "rootPassword", but you will be asked to
+  # change the password the first time you log in.
   #
 rootUser.emailAddress = vivo_root@mydomain.edu
 
@@ -57,8 +57,8 @@ argon2.memory = 1024
 argon2.time = 1000
 
   #
-  # The basic parameters for a database connection. Change the end of the 
-  # URL to reflect your database name (if it is not "vitrodb"). Change the username 
+  # The basic parameters for a database connection. Change the end of the
+  # URL to reflect your database name (if it is not "vitrodb"). Change the username
   # and password to match the authorized database user you created.
   #
 VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb
@@ -66,14 +66,14 @@ VitroConnection.DataSource.username = vitrodbUsername
 VitroConnection.DataSource.password = vitrodbPassword
 
   #
-  # Email parameters which VIVO can use to send mail. If these are left empty, 
+  # Email parameters which VIVO can use to send mail. If these are left empty,
   # the "Contact Us" form will be disabled and users will not be notified of
   # changes to their accounts.
   #
 email.smtpHost = smtp.mydomain.edu
 email.replyTo = vivoAdmin@mydomain.edu
 
-  # 
+  #
   # URL of Solr context used in local VIVO search. This will usually consist of:
   #     scheme + server_name + port + vivo_webapp_name + "solr"
   # In the standard installation, the Solr context will be on the same server as VIVO,
@@ -90,7 +90,7 @@ vitro.local.solr.url = http://localhost:8080/vivosolr
 # -----------------------------------------------------------------------------
 
   #
-  # How is a logged-in user associated with a particular Individual? One way is 
+  # How is a logged-in user associated with a particular Individual? One way is
   # for the Individual to have a property whose value is the username of the user.
   # This value should be the URI for that property.
   #
@@ -103,11 +103,11 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId
 
   #
   # If an external authentication system like Shibboleth or CUWebAuth is to be
-  # used, this property says which HTTP header will contain the user ID from 
-  # the authentication system. If such a system is not to be used, leave this 
-  # commented out. Consult the installation instructions for more details. 
+  # used, this property says which HTTP header will contain the user ID from
+  # the authentication system. If such a system is not to be used, leave this
+  # commented out. Consult the installation instructions for more details.
   #
-#externalAuth.netIdHeaderName = remote_userID 
+#externalAuth.netIdHeaderName = remote_userID
 
 
 # -----------------------------------------------------------------------------
@@ -133,16 +133,16 @@ VitroConnection.DataSource.pool.maxIdle = 10
 # -----------------------------------------------------------------------------
 
   #
-  # Parameters to change in order to use VIVO with a database other than 
+  # Parameters to change in order to use VIVO with a database other than
   # MySQL.
   #
 VitroConnection.DataSource.dbtype = MySQL
 VitroConnection.DataSource.driver = com.mysql.jdbc.Driver
 VitroConnection.DataSource.validationQuery = SELECT 1
 
-  # Note: the above parameters allow you to change the relational database that 
-  # is used as the back end for Jena SDB. If you want to use a triple store 
-  # other than SDB, you will need to edit applicationSetup.n3. See the 
+  # Note: the above parameters allow you to change the relational database that
+  # is used as the back end for Jena SDB. If you want to use a triple store
+  # other than SDB, you will need to edit applicationSetup.n3. See the
   # installation instructions for more details.
 
 
@@ -155,19 +155,19 @@ VitroConnection.DataSource.validationQuery = SELECT 1
   # The base URL of the ORNG Shindig server. Usually, this is the same host and port
   # number as VIVO itself, with a context path of "shindigorng".
   #
-#OpenSocial.shindigURL = http://localhost:8080/shindigorng 
+#OpenSocial.shindigURL = http://localhost:8080/shindigorng
 
   #
   # For OpenSocial integration
   # The host name and port number of the service that provides security tokens for VIVO and
   # Shindig to share. For now, the host name must be the actual host, not "localhost" or "127.0.0.1"
-  # The port number must be 8777 
+  # The port number must be 8777
   #
 #OpenSocial.tokenService = myhost.mydomain.edu:8777
 
   #
   # For OpenSocial integration
-  # The path to the key file that will be used when generating security tokens for VIVO and 
+  # The path to the key file that will be used when generating security tokens for VIVO and
   # shindig to share.
   #
 #OpenSocial.tokenKeyFile = /usr/local/vivo/data/shindig/openssl/securitytokenkey.txt
@@ -184,26 +184,26 @@ VitroConnection.DataSource.validationQuery = SELECT 1
 # -----------------------------------------------------------------------------
 
   #
-  # Show only the most appropriate data values based on the Accept-Language 
+  # Show only the most appropriate data values based on the Accept-Language
   # header supplied by the browser.  Default is false if not set.
   #
 # RDFService.languageFilter = false
 
   #
-  # Force VIVO to use a specific language or Locale instead of those 
-  # specified by the browser. This affects RDF data retrieved from the model, 
+  # Force VIVO to use a specific language or Locale instead of those
+  # specified by the browser. This affects RDF data retrieved from the model,
   # if RDFService.languageFilter is true. This also affects the text of pages
-  # that have been modified to support multiple languages. 
+  # that have been modified to support multiple languages.
   #
 # languages.forceLocale = en_US
 
   #
   # A list of supported languages or Locales that the user may choose to
   # use instead of the one specified by the browser. Selection images must
-  # be available in the i18n/images directory of the theme. This affects 
-  # RDF data retrieved from the model, if RDFService.languageFilter is true.  
-  # This also affects the text of pages that have been modified to support 
-  # multiple languages. 
+  # be available in the i18n/images directory of the theme. This affects
+  # RDF data retrieved from the model, if RDFService.languageFilter is true.
+  # This also affects the text of pages that have been modified to support
+  # multiple languages.
   #
   # This should not be used with languages.forceLocale, which will override it.
   #
@@ -216,7 +216,7 @@ VitroConnection.DataSource.validationQuery = SELECT 1
 
 # orcid.clientId = 0000-0000-0000-000X
 # orcid.clientPassword = 00000000-0000-0000-0000-000000000000
-  
+
    #
    # The orcid.webappBaseUrl must end in a front slash (/)
    # if it includes a path past the domain and (if required) port.
@@ -297,28 +297,28 @@ VitroConnection.DataSource.validationQuery = SELECT 1
     # Options: tiny, small, medium, large
 #resource.plum-print.size=medium
 
-  #  
-  # When the following flag is set to enabled, the VIVO home page displays a 
-  # global map highlighting the geographical focus of foaf:person individuals. 
+  #
+  # When the following flag is set to enabled, the VIVO home page displays a
+  # global map highlighting the geographical focus of foaf:person individuals.
   #
 #homePage.geoFocusMaps=enabled
 
 
-  #  
-  # VIVO supports the simultaneous use of a full foaf:Person profile page view 
-  # and a "quick" page view that emphasizes the individual's webpage presence. 
+  #
+  # VIVO supports the simultaneous use of a full foaf:Person profile page view
+  # and a "quick" page view that emphasizes the individual's webpage presence.
   # Implementing this feature requires an installation to develop a web service
-  # that captures images of web pages or to use an existing service outside of VIVO. 
+  # that captures images of web pages or to use an existing service outside of VIVO.
   #
 #multiViews.profilePageTypes=enabled
 
 
   #
-  # Tell VIVO to generate HTTP headers on its responses to facilitate caching the 
-  # profile pages that it creates. 
+  # Tell VIVO to generate HTTP headers on its responses to facilitate caching the
+  # profile pages that it creates.
   #
   # Developers will likely want to leave caching disabled, since a change to a
-  # Freemarker template or to a Java class would not cause the page to be 
+  # Freemarker template or to a Java class would not cause the page to be
   # considered stale.
   #
 http.createCacheHeaders = true
@@ -345,12 +345,12 @@ http.createCacheHeaders = true
   #
 # visualization.topLevelOrg = http://vivo.mydomain.edu/individual/topLevelOrgURI
 
-  #  
+  #
   # The temporal graph visualization can require extensive machine resources.
   # This can have a particularly noticeable impact on memory usage if
   # - The organization tree is deep,
   # - The number of grants and publications is large.
-  # VIVO 1.3 release mitigates this problem by the way of a caching mechanism & 
+  # VIVO 1.3 release mitigates this problem by the way of a caching mechanism &
   # hence we can safely set this to be enabled by default.
   #
 visualization.temporal = enabled
@@ -366,7 +366,7 @@ proxy.eligibleTypeList = http://xmlns.com/foaf/0.1/Person, http://xmlns.com/foaf
   # The format for this property is id, name; id1, name1; id2, name2 etc.
   # For more information, see Service Metadata from this page:
   # https://github.com/OpenRefine/OpenRefine/wiki/Reconciliation-Service-Api
-  # 
+  #
 Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Role; \
     http://vivoweb.org/ontology/core#AcademicDegree, core:Academic Degree; \
     http://purl.org/NET/c4dm/event.owl#Event, event:Event; \
diff --git a/home/src/main/resources/rdf/abox/filegraph/academicDegree.rdf b/home/src/main/resources/rdf/abox/filegraph/academicDegree.rdf
index b36d4c4ee4..1ef1265751 100644
--- a/home/src/main/resources/rdf/abox/filegraph/academicDegree.rdf
+++ b/home/src/main/resources/rdf/abox/filegraph/academicDegree.rdf
@@ -15,7 +15,7 @@
     xmlns:scires="http://vivoweb.org/ontology/scientific-research#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:swrl="http://www.w3.org/2003/11/swrl#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
   <rdf:Description rdf:about="http://vivoweb.org/ontology/degree/academicDegree3">
     <core:abbreviation>A.M.T.</core:abbreviation>
     <rdf:type rdf:resource="http://vivoweb.org/ontology/core#AcademicDegree"/>
@@ -640,7 +640,7 @@
     <core:abbreviation>M.Ch.E.</core:abbreviation>
     <rdfs:label xml:lang="en-US">M.Ch.E. Master of Chemical Engineering</rdfs:label>
     <rdf:type rdf:resource="http://vivoweb.org/ontology/core#AcademicDegree"/>
-  </rdf:Description> 
+  </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/degree/academicDegree107">
     <core:abbreviation>Th.B.</core:abbreviation>
     <rdfs:label xml:lang="en-US">Th.B. Bachelor of Theology</rdfs:label>
@@ -772,5 +772,5 @@
     <rdfs:label xml:lang="en-US">H.S.C. Higher School Certificate</rdfs:label>
     <rdf:type rdf:resource="http://vivoweb.org/ontology/core#AcademicDegree"/>
   </rdf:Description>
-  
+
 </rdf:RDF>
diff --git a/home/src/main/resources/rdf/abox/filegraph/us-states.rdf b/home/src/main/resources/rdf/abox/filegraph/us-states.rdf
index 49f7f1bea5..2e86921300 100644
--- a/home/src/main/resources/rdf/abox/filegraph/us-states.rdf
+++ b/home/src/main/resources/rdf/abox/filegraph/us-states.rdf
@@ -348,4 +348,4 @@
       <obo:BFO_0000051 rdf:resource="http://dbpedia.org/resource/Wisconsin"/>
       <obo:BFO_0000051 rdf:resource="http://dbpedia.org/resource/Wyoming"/>
    </rdf:Description>
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
diff --git a/home/src/main/resources/rdf/abox/filegraph/validation.n3 b/home/src/main/resources/rdf/abox/filegraph/validation.n3
index 4e4d08c917..24b4cc75bf 100644
--- a/home/src/main/resources/rdf/abox/filegraph/validation.n3
+++ b/home/src/main/resources/rdf/abox/filegraph/validation.n3
@@ -1,2 +1,2 @@
-<http://orcid.org/1234-1231-1231-3333> 
+<http://orcid.org/1234-1231-1231-3333>
      <http://vivoweb.org/ontology/core#validatedOrcidId> <http://vivo.mydomain.edu/individual/n4571> .
diff --git a/home/src/main/resources/rdf/applicationMetadata/firsttime/classgroups.rdf b/home/src/main/resources/rdf/applicationMetadata/firsttime/classgroups.rdf
index ea7e2480b5..976b218f75 100644
--- a/home/src/main/resources/rdf/applicationMetadata/firsttime/classgroups.rdf
+++ b/home/src/main/resources/rdf/applicationMetadata/firsttime/classgroups.rdf
@@ -15,7 +15,7 @@
     xmlns:scires="http://vivoweb.org/ontology/scientific-research#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:swrl="http://www.w3.org/2003/11/swrl#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
   <rdf:Description rdf:about="http://vivoweb.org/ontology#vitroClassGrouppublications">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
     <rdfs:label xml:lang="en-US">research</rdfs:label>
diff --git a/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf b/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
index c2c92da6e0..5e716aad98 100644
--- a/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
+++ b/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
@@ -3,7 +3,7 @@
     xmlns:owl="http://www.w3.org/2002/07/owl#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:j.0="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
     <rdf:Description>
         <rdf:type rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Portal"/>
         <rdfs:label xml:lang="en-US">VIVO</rdfs:label>
diff --git a/home/src/main/resources/rdf/applicationMetadata/firsttime/propertygroups.rdf b/home/src/main/resources/rdf/applicationMetadata/firsttime/propertygroups.rdf
index f977ce2ae6..797cc4f213 100644
--- a/home/src/main/resources/rdf/applicationMetadata/firsttime/propertygroups.rdf
+++ b/home/src/main/resources/rdf/applicationMetadata/firsttime/propertygroups.rdf
@@ -11,7 +11,7 @@
     xmlns:j.6="http://www.w3.org/2003/06/sw-vocab-status/ns#"
     xmlns:owl="http://www.w3.org/2002/07/owl#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
   <rdf:Description rdf:about="http://vivoweb.org/ontology#vitroPropertyGroupaffiliation">
     <vitro:modTime rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2009-12-28T09:47:01</vitro:modTime>
     <rdfs:label xml:lang="en-US">affiliation</rdfs:label>
diff --git a/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3
index d536d38980..be3db7257a 100644
--- a/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3
+++ b/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@@ -7,8 +7,8 @@
 @prefix core: <http://vivoweb.org/ontology/core#> .
 @prefix vivoweb: <http://vivoweb.org/ontology#> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
- 
-# academic departments datagetter 
+
+# academic departments datagetter
 
 <freemarker:lib-home-page.ftl> display:hasDataGetter display:academicDeptsDataGetter .
 
@@ -23,8 +23,8 @@ display:academicDeptsDataGetter
     WHERE
     {
           ?theURI a vivo:AcademicDepartment .
-          ?theURI rdfs:label ?label 
+          ?theURI rdfs:label ?label
     }
-    
+
     """ .
 
diff --git a/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3 b/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3
index fea3c67353..3062d28f09 100644
--- a/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3
+++ b/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3
@@ -1,12 +1,12 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 #
 # Associate the LocaleSelectionDataGetter with the languageSelector.ftl Freemarker template.
 #
 
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
- 
+
 <freemarker:languageSelector.ftl> display:hasDataGetter display:localeSelectorDataGetter .
- 
+
 display:localeSelectorDataGetter
     a <java:edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionDataGetter> .
diff --git a/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3 b/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3
index 2f76ba9640..917d2372e9 100644
--- a/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3
+++ b/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3
@@ -1,5 +1,5 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
-	
+# $This file is distributed under the terms of the license in LICENSE$
+
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -7,12 +7,12 @@
 
 ## The example below demonstrates how you can associate particular ModelChangePreprocessors
 ## with the application as a whole.  These preprocessors will be run with
-## every edit/addition in N3EditUtils.preprocessModels(changes, configuration, vreq);	
+## every edit/addition in N3EditUtils.preprocessModels(changes, configuration, vreq);
 
-## Defines the preprocessor class 
+## Defines the preprocessor class
 ## Can extend this to define what the constructor arguments should be if required, and then N3EditUtils.java should be modified
 ## to know it can pull out parameters based on what is defined in the display  model
 
 # Testing to see if this will be read in BECAUSE this has changed and should be read in
-# <java:edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.TestModelChangePreprocessor>   
-# a <java:edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ModelChangePreprocessor>  .  
+# <java:edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.TestModelChangePreprocessor>
+# a <java:edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ModelChangePreprocessor>  .
diff --git a/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3
index 53939167ed..46e0ef3174 100644
--- a/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3
+++ b/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3
@@ -1,10 +1,10 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
 
-# 
-# datagetter to fetch ORCID info for the person. 
+#
+# datagetter to fetch ORCID info for the person.
 #
 
 <freemarker:individual-orcidInterface.ftl> display:hasDataGetter display:orcidIdDataGetter .
diff --git a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
index 90d360bdeb..c29361c8b6 100644
--- a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
+++ b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
@@ -1,10 +1,10 @@
 @prefix : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#> .
-@prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> . 
+@prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix searchIndex: <java:edu.cornell.mannlib.vitro.webapp.searchindex#> .
 
 
 #
-# Specify the SearchIndexExcluders, DocumentModifiers and IndexingUriFinders for VIVO. 
+# Specify the SearchIndexExcluders, DocumentModifiers and IndexingUriFinders for VIVO.
 # These are in addition to the ones specified for VIVO.
 #
 
@@ -28,7 +28,7 @@
     :hasOutgoingProperty "http://vivoweb.org/ontology/core#relates" .
 
 # Some roles look like this:  bearerOf ==> role ==> roleContributesTo
-#                            inheresIn <== role <== contributingRole        
+#                            inheresIn <== role <== contributingRole
 :extension_forContextNodes_role_contributes_1
     a   searchIndex:indexing.IndexingUriFinder ,
         searchIndex:documentBuilding.DocumentModifier ,
@@ -36,7 +36,7 @@
     rdfs:label "Labels across bearerOf/contributesTo" ;
     :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ;
     :hasOutgoingProperty "http://vivoweb.org/ontology/core#roleContributesTo" .
-        
+
 :extension_forContextNodes_role_contributes_2
     a   searchIndex:indexing.IndexingUriFinder ,
         searchIndex:documentBuilding.DocumentModifier ,
@@ -44,9 +44,9 @@
     rdfs:label "Labels across contributor/inheresIn" ;
     :hasIncomingProperty "http://vivoweb.org/ontology/core#contributingRole" ;
     :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" .
-        
+
 # Other roles look like this:  bearerOf ==> role ==> realizedIn
-#                             inheresIn <== role <== realizes        
+#                             inheresIn <== role <== realizes
 :extension_forContextNodes_role_realizedIn_1
     a   searchIndex:indexing.IndexingUriFinder ,
         searchIndex:documentBuilding.DocumentModifier ,
@@ -54,7 +54,7 @@
     rdfs:label "Labels across bearerOf/realizedIn" ;
     :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ;
     :hasOutgoingProperty "http://purl.obolibrary.org/obo/BFO_0000054" .
-        
+
 :extension_forContextNodes_role_realizedIn_2
     a   searchIndex:indexing.IndexingUriFinder ,
         searchIndex:documentBuilding.DocumentModifier ,
@@ -62,7 +62,7 @@
     rdfs:label "Labels across realizes/inheresIn" ;
     :hasIncomingProperty "http://purl.obolibrary.org/obo/BFO_0000055" ;
     :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" .
-        
+
 # Roles on grants look like this:  bearerOf ==> role ==> relatedBy
 #                                 inheresIn <== role <== relates
 :extension_forContextNodes_roles_on_grants_1
@@ -72,7 +72,7 @@
     rdfs:label "Labels across bearerOf/relates" ;
     :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ;
     :hasOutgoingProperty "http://vivoweb.org/ontology/core#relatedBy" .
-        
+
 :extension_forContextNodes_roles_on_grants_2
     a   searchIndex:indexing.IndexingUriFinder ,
         searchIndex:documentBuilding.DocumentModifier ,
@@ -80,7 +80,7 @@
     rdfs:label "Labels across contributor/relatedBy" ;
     :hasIncomingProperty "http://vivoweb.org/ontology/core#relates" ;
     :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" .
-        
+
 
 # ------------------------------------
 
@@ -127,7 +127,7 @@
     :hasSelectQuery """
         PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
         PREFIX obo: <http://purl.obolibrary.org/obo/>
-		SELECT ?title 
+		SELECT ?title
 		WHERE {
 			?uri obo:ARG_2000028 ?card .
 			?card a vcard:Individual .
@@ -135,7 +135,7 @@
 			?titleHolder vcard:title ?title .
 		}
         """ .
-    
+
 :vivodocumentModifier_EmailAddress
     a   searchIndex:documentBuilding.SelectQueryDocumentModifier ,
         searchIndex:documentBuilding.DocumentModifier ;
@@ -143,7 +143,7 @@
     :hasSelectQuery """
         PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
         PREFIX obo: <http://purl.obolibrary.org/obo/>
-		SELECT ?email 
+		SELECT ?email
 		WHERE {
 			?uri obo:ARG_2000028 ?card .
 			?card a vcard:Individual .
diff --git a/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3
index ab2419a00b..9499da5143 100644
--- a/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3
+++ b/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@@ -7,7 +7,7 @@
 @prefix core: <http://vivoweb.org/ontology/core#> .
 @prefix vivoweb: <http://vivoweb.org/ontology#> .
 
- 
+
 #### n3 for research areas ####
 
 ## associate the classes with the datagetter ##
@@ -20,7 +20,7 @@
 display:getDepartmentDataGetter
     a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
     display:saveToVar "departmentsResults";
-    display:query 
+    display:query
         """
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX vivo: <http://vivoweb.org/ontology/core#>
@@ -33,12 +33,12 @@ display:getDepartmentDataGetter
             ?posn  vivo:relates ?dept .
             ?dept a foaf:Organization .
             ?dept rdfs:label ?departmentLabel
-            OPTIONAL { ?posn vivo:dateTimeInterval ?dti 
+            OPTIONAL { ?posn vivo:dateTimeInterval ?dti
                      OPTIONAL { ?dti vivo:end ?end .
                                 ?end vivo:dateTime ?endDate
                      }
             }
-            FILTER ( !bound(?endDate) ||                        
+            FILTER ( !bound(?endDate) ||
                       substr(str(?endDate), 1, 4) >= substr(str(now()), 1, 4) )
         }
         ORDER BY ?deptLabel
@@ -47,11 +47,11 @@ display:getDepartmentDataGetter
 		display:getVocabServiceDataGetter
 		    a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
 		    display:saveToVar "vocabularyService";
-		    display:query 
+		    display:query
 		        """
 		        PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 		        PREFIX vivo: <http://vivoweb.org/ontology/core#>
-		        SELECT DISTINCT (str(?vocabularySourceName) AS ?vocabService) 
+		        SELECT DISTINCT (str(?vocabularySourceName) AS ?vocabService)
 		        WHERE {
 		            ?individualURI rdfs:isDefinedBy ?vocabularySource .
 		            ?vocabularySource rdfs:label ?vocabularySourceName .
@@ -74,10 +74,10 @@ display:getDepartmentDataGetter
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX vivo: <http://vivoweb.org/ontology/core#>
         PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-        SELECT DISTINCT (str (?prsnLabel) AS ?personLabel) 
-                        ?person 
-                        (Str(?researchAreaLabel) AS ?raLabel) 
-                        (str(?departmentLabel) AS ?orgLabel) 
+        SELECT DISTINCT (str (?prsnLabel) AS ?personLabel)
+                        ?person
+                        (Str(?researchAreaLabel) AS ?raLabel)
+                        (str(?departmentLabel) AS ?orgLabel)
                         ?ra
                         ?org
         WHERE {
diff --git a/home/src/main/resources/rdf/display/everytime/vivoListViewConfig.rdf b/home/src/main/resources/rdf/display/everytime/vivoListViewConfig.rdf
index 68cfd95794..18323aec53 100644
--- a/home/src/main/resources/rdf/display/everytime/vivoListViewConfig.rdf
+++ b/home/src/main/resources/rdf/display/everytime/vivoListViewConfig.rdf
@@ -53,23 +53,23 @@
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#end">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
     </rdf:Description>
-    
+
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#webpage">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-webpage.xml</display:listViewConfigFile>
-    </rdf:Description>    
-  
+    </rdf:Description>
+
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasAssociatedConcept">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasAssociatedConcept.xml</display:listViewConfigFile>
     </rdf:Description>
-    
+
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasSubjectArea">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasAssociatedConcept.xml</display:listViewConfigFile>
     </rdf:Description>
-    
+
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasResearchArea">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasAssociatedConcept.xml</display:listViewConfigFile>
     </rdf:Description>
- 
+
    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#publisherOf">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-publisherOf.xml</display:listViewConfigFile>
     </rdf:Description>
@@ -119,9 +119,9 @@
     <!--
      ******************************************************************
      data property custom list views
-     ****************************************************************** 
+     ******************************************************************
     -->
-        
+
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#scopusId">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-scopusId.xml</display:listViewConfigFile>
     </rdf:Description>
@@ -129,5 +129,5 @@
     <rdf:Description rdf:about="http://purl.org/ontology/bibo/doi">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-doi.xml</display:listViewConfigFile>
     </rdf:Description>
-        
+
 </rdf:RDF>
diff --git a/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3
index 33dc66e010..f46eed5820 100644
--- a/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3
+++ b/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@@ -7,7 +7,7 @@
 @prefix core: <http://vivoweb.org/ontology/core#> .
 @prefix vivoweb: <http://vivoweb.org/ontology#> .
 
- 
+
 #### n3 for research areas ####
 
 ## associate the classes with the datagetter ##
@@ -19,14 +19,14 @@
 <http://vivoweb.org/ontology/core#Laboratory> display:hasDataGetter display:getResearchAreaDataGetter .
 <http://vivoweb.org/ontology/core#Library> display:hasDataGetter display:getResearchAreaDataGetter .
 <http://vivoweb.org/ontology/core#ResearchOrganization> display:hasDataGetter display:getResearchAreaDataGetter .
- 
- 
+
+
 ## define the datagetter ##
 
 display:getResearchAreaDataGetter
     a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
     display:saveToVar "researchAreaResults";
-    display:query 
+    display:query
         """
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX vivo: <http://vivoweb.org/ontology/core#>
@@ -39,12 +39,12 @@ display:getResearchAreaDataGetter
             ?person a foaf:Person .
             ?person vivo:hasResearchArea ?ra .
             ?ra rdfs:label ?researchAreaLabel
-            OPTIONAL { ?posn vivo:dateTimeInterval ?dti 
+            OPTIONAL { ?posn vivo:dateTimeInterval ?dti
                      OPTIONAL { ?dti vivo:end ?end .
                                 ?end vivo:dateTime ?endDate
                      }
             }
-            FILTER ( !bound(?endDate) ||                        
+            FILTER ( !bound(?endDate) ||
                       substr(str(?endDate), 1, 4) >= substr(str(now()), 1, 4) )
         }
         ORDER BY ?raLabel
@@ -66,10 +66,10 @@ display:getResearchAreaDataGetter
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX vivo: <http://vivoweb.org/ontology/core#>
         PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-        SELECT DISTINCT (str (?prsnLabel) AS ?personLabel) 
-                        ?person 
-                        (str(?researchAreaLabel) AS ?raLabel) 
-                        (str(?organizationLabel) AS ?orgLabel) 
+        SELECT DISTINCT (str (?prsnLabel) AS ?personLabel)
+                        ?person
+                        (str(?researchAreaLabel) AS ?raLabel)
+                        (str(?organizationLabel) AS ?orgLabel)
                         ?ra
                         ?org
         WHERE {
@@ -104,10 +104,10 @@ display:getResearchAreaDataGetter
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX vivo: <http://vivoweb.org/ontology/core#>
         PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-        SELECT DISTINCT (str (?prsnLabel) AS ?personLabel) 
-                        ?person 
-                        (Str(?researchAreaLabel) AS ?raLabel) 
-                        (str(?organizationLabel) AS ?orgLabel) 
+        SELECT DISTINCT (str (?prsnLabel) AS ?personLabel)
+                        ?person
+                        (Str(?researchAreaLabel) AS ?raLabel)
+                        (str(?organizationLabel) AS ?orgLabel)
                         ?ra
         WHERE {
             ?orgURI vivo:relatedBy ?posn .
@@ -138,7 +138,7 @@ display:getResearchAreaDataGetter
 display:getGrantsDataGetter
     a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
     display:saveToVar "getGrantResults";
-    display:query 
+    display:query
         """
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX vivo: <http://vivoweb.org/ontology/core#>
diff --git a/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3 b/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3
index aaf16516ac..50bcf03021 100644
--- a/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3
+++ b/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@@ -8,28 +8,28 @@
 @prefix vivoweb: <http://vivoweb.org/ontology#> .
 @prefix afn:  <http://jena.apache.org/ARQ/function#> .
 
- 
+
 #### Check to see if the person being viewed has a first and last name. ####
 #### If so, the page will display the QR code icon link.                ####
 
 ## associate the classes with the datagetter (COUNT(?vIndividual) AS ?theCount)##
 
 <http://xmlns.com/foaf/0.1/Person> display:hasDataGetter display:checkNamesForQrCodeDG .
- 
- 
+
+
 ## define the datagetter ##
 
 display:checkNamesForQrCodeDG
     a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
     display:saveToVar "checkNamesResult";
-    display:query 
+    display:query
         """
-        PREFIX obo: <http://purl.obolibrary.org/obo/> 
+        PREFIX obo: <http://purl.obolibrary.org/obo/>
         PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
         SELECT DISTINCT ?vIndividual
         WHERE {
             ?individualURI obo:ARG_2000028 ?vIndividual .
-            ?vIndividual vcard:hasName ?vName . 
+            ?vIndividual vcard:hasName ?vName .
             ?vName vcard:givenName ?firstName .
             ?vName vcard:familyName ?lastName .
         }
diff --git a/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3 b/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3
index 2061d7efdb..37c6895f09 100644
--- a/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3
+++ b/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix vitroDisplay: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@@ -11,17 +11,17 @@
 
 # See vitroSearchProhibited.n3 for more information about files in this directory.
 
- vitroDisplay:SearchIndex 
-	rdf:type owl:Thing ; 
+ vitroDisplay:SearchIndex
+	rdf:type owl:Thing ;
 	vitroDisplay:excludeClass obo:BFO_0000023  ;
 	vitroDisplay:excludeClass core:AdvisingRelationship ;
 	vitroDisplay:excludeClass core:Editorship ;
 	vitroDisplay:excludeClass core:Authorship ;
-	vitroDisplay:excludeClass core:Position ; 
+	vitroDisplay:excludeClass core:Position ;
 	vitroDisplay:excludeClass core:AwardReceipt ;
 	vitroDisplay:excludeClass core:AwardedDegree ;
 	vitroDisplay:excludeClass core:ResearchActivity ;
-	vitroDisplay:excludeClass core:EducationalProcess ;	
+	vitroDisplay:excludeClass core:EducationalProcess ;
 	vitroDisplay:excludeClass bibo:DocumentStatus ;
 	vitroDisplay:excludeClass core:DateTimeValue ;
     vitroDisplay:excludeClass core:DateTimeValuePrecision ;
diff --git a/home/src/main/resources/rdf/display/firsttime/PropertyConfig.n3 b/home/src/main/resources/rdf/display/firsttime/PropertyConfig.n3
index 0e5d044910..6297d5a4f0 100644
--- a/home/src/main/resources/rdf/display/firsttime/PropertyConfig.n3
+++ b/home/src/main/resources/rdf/display/firsttime/PropertyConfig.n3
@@ -8,7 +8,7 @@
 @prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
 @prefix role:  <http://vitro.mannlib.cornell.edu/ns/vitro/role#> .
 @prefix local: <http://vitro.mannlib.cornell.edu/ns/vitro/siteConfig/> .
-@prefix vivo: <http://vivoweb.org/ontology/core#> . 
+@prefix vivo: <http://vivoweb.org/ontology/core#> .
 @prefix obo: <http://purl.obolibrary.org/obo/> .
 
 @base <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration> .
@@ -67,7 +67,7 @@ local:authorInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ;
-    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> . 
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> .
 
 local:orgInAuthorshipContext a :ConfigContext ;
     :hasConfiguration local:orgInAuthorshipConfig ;
@@ -85,7 +85,7 @@ local:orgInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ;
-    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> . 
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> .
 
 #### role contexts and configurations ###
 
@@ -94,7 +94,7 @@ local:hasServiceProviderRoleContext a :ConfigContext ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
     :qualifiedByDomain   <http://xmlns.com/foaf/0.1/Person> ;
     :qualifiedBy      <http://purl.obolibrary.org/obo/ERO_0000012> .
-    
+
 local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
    :listViewConfigFile "listViewConfig-roleContributesTo.xml"^^xsd:string ;
    rdfs:label "hasServiceProviderRole"@en-US;
@@ -105,7 +105,7 @@ local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
    vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
    vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
-  
+
 local:hasClinicalRoleContext a :ConfigContext ;
     :hasConfiguration local:hasClinicalRoleConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@@ -478,7 +478,7 @@ local:orgHasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> .
-    
+
 ### awards and educational training ###
 
 local:awardOrHonorContext a :ConfigContext ;
@@ -744,11 +744,11 @@ local:orgAdministersGrantConfig a :ObjectPropertyDisplayConfig ;
     vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationAdministersGrantGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupresearch> .
-    
+
 ### collaborator properties ###
 
 # formerly defined in common for all Agents in initialTBoxAnnotations.n3 where allows cross-linking people and orgs
-    
+
 local:hasCollaboratorContext a :ConfigContext ; # persons
     :hasConfiguration local:hasCollaboratorConfig ;
     :configContextFor <http://vivoweb.org/ontology/core#hasCollaborator> ;
@@ -775,7 +775,7 @@ local:hasCollaboratorConfig a :ObjectPropertyDisplayConfig ;
      vitro:publicDescriptionAnnot
          "Use for a simple assertion that another person is an ongoing collaborator; to describe the relationship in more detail enter a role for each collaborator in some common endeavor."^^xsd:string ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
-    
+
 local:orgHasCollaboratorContext a :ConfigContext ;
     :hasConfiguration local:orgHasCollaboratorConfig ;
     :configContextFor <http://vivoweb.org/ontology/core#hasCollaborator> ;
@@ -1013,7 +1013,7 @@ local:webpageInfoConfig a :ObjectPropertyDisplayConfig ;
 local:webpageSoftwareContext a :ConfigContext ;
     :hasConfiguration local:webpageSoftwareConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
-    :qualifiedByDomain      <http://purl.obolibrary.org/obo/ERO_0000071> ; 
+    :qualifiedByDomain      <http://purl.obolibrary.org/obo/ERO_0000071> ;
     :qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
     :qualifiedBy      <http://www.w3.org/2006/vcard/ns#URL> .
 
@@ -1029,7 +1029,7 @@ local:webpageSoftwareConfig a :ObjectPropertyDisplayConfig ;
 local:webpageFacilityContext a :ConfigContext ;
     :hasConfiguration local:webpageFacilityConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
-    :qualifiedByDomain      <http://vivoweb.org/ontology/core#Facility> ; 
+    :qualifiedByDomain      <http://vivoweb.org/ontology/core#Facility> ;
     :qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
     :qualifiedBy      <http://www.w3.org/2006/vcard/ns#URL> .
 
@@ -1045,7 +1045,7 @@ local:webpageFacilityConfig a :ObjectPropertyDisplayConfig ;
 local:webpageProjectContext a :ConfigContext ;
     :hasConfiguration local:webpageProjectConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
-    :qualifiedByDomain      <http://vivoweb.org/ontology/core#Project> ; 
+    :qualifiedByDomain      <http://vivoweb.org/ontology/core#Project> ;
     :qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
     :qualifiedBy      <http://www.w3.org/2006/vcard/ns#URL> .
 
@@ -1143,7 +1143,7 @@ local:outputOfConfig a :ObjectPropertyDisplayConfig ;
     vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-    
+
 local:hasOutputContext a :ConfigContext ;
     :hasConfiguration local:hasOutputConfig ;
     :configContextFor obo:RO_0002234 ;
@@ -1210,7 +1210,7 @@ local:documentPartOfConfig a :ObjectPropertyDisplayConfig ;
     vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
     vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-    
+
 local:geographicLocationContainsLocationContext a :ConfigContext ;
     :hasConfiguration local:geographicLocationContainsLocationConfig ;
     :configContextFor  <http://purl.obolibrary.org/obo/BFO_0000051> ;
@@ -1227,13 +1227,13 @@ local:geographicLocationContainsLocationConfig a :ObjectPropertyDisplayConfig ;
     vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
     vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-        
+
 local:geographicLocationWithinLocationContext a :ConfigContext ;
     :hasConfiguration local:geographicLocationWithinLocationConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
     :qualifiedByDomain vivo:GeographicLocation ;
     :qualifiedBy       vivo:GeographicLocation .
-            
+
 local:geographicLocationWithinLocationConfig a :ObjectPropertyDisplayConfig ;
     :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ;
     rdfs:label "geographicLocationWithinLocation"@en-US;
@@ -1329,13 +1329,13 @@ local:inEventSeriesConfig a :ObjectPropertyDisplayConfig ;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-    
+
 local:eventsForSeriesContext a :ConfigContext ;
     :hasConfiguration  local:eventsForSeriesConfig ;
     :configContextFor  <http://purl.obolibrary.org/obo/BFO_0000051> ;
     :qualifiedByDomain <http://vivoweb.org/ontology/core#EventSeries> ;
     :qualifiedBy       <http://purl.org/NET/c4dm/event.owl#Event> .
- 
+
 local:eventsForSeriesConfig a :ObjectPropertyDisplayConfig ;
     :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ;
     rdfs:label "eventsForSeries"@en-US;
@@ -1363,7 +1363,7 @@ local:eventLocationConfig a :ObjectPropertyDisplayConfig ;
     vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaddress> .
-    
+
 local:eventInFacilityContext a :ConfigContext ;
     :hasConfiguration local:eventInFacilityConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0001025> ; ## located in
@@ -1448,7 +1448,7 @@ local:hasRoomConfig a :ObjectPropertyDisplayConfig ;
     vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
     vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-    
+
 local:roomWithinBuildingContext a :ConfigContext ;
     :hasConfiguration local:roomWithinBuildingConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
@@ -1517,7 +1517,7 @@ local:facilitySiteOfEventConfig a :ObjectPropertyDisplayConfig ;
     vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-    
+
 local:facilitySiteOfAgentContext a :ConfigContext ;
     :hasConfiguration local:facilitySiteOfAgentConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0001015> ; ## location of
@@ -1535,10 +1535,10 @@ local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ;
     vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
 
-# uses and used by need work -- apply to continuants and occurrents, and material entities as well as information content entities   
+# uses and used by need work -- apply to continuants and occurrents, and material entities as well as information content entities
 #local:projectUsesMaterialEntityContext a :ConfigContext ;
 #    :hasConfiguration local:projectUsesMaterialEntityConfig ;
-#    :configContextFor  <http://purl.obolibrary.org/obo/ERO_0000031> ; 
+#    :configContextFor  <http://purl.obolibrary.org/obo/ERO_0000031> ;
 #    :qualifiedByDomain vivo:Project  ;
 #    :qualifiedBy       <http://purl.obolibrary.org/obo/BFO_0000040> . ## Material Entity
 
@@ -1552,10 +1552,10 @@ local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ;
 #    vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
 #    vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
 #    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-    
+
 #local:materialEntityUsedByProjectContext a :ConfigContext ;
 #    :hasConfiguration local:MaterialEntityUsedByProjectConfig ;
-#    :configContextFor  <http://purl.obolibrary.org/obo/ERO_0000070> ; 
+#    :configContextFor  <http://purl.obolibrary.org/obo/ERO_0000070> ;
 #    :qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000040> ; ## Material Entity
 #    :qualifiedBy       vivo:Project .
 
diff --git a/home/src/main/resources/rdf/display/firsttime/PropertyConfigSupp.n3 b/home/src/main/resources/rdf/display/firsttime/PropertyConfigSupp.n3
index 7a3c5dc18c..e59129d47e 100644
--- a/home/src/main/resources/rdf/display/firsttime/PropertyConfigSupp.n3
+++ b/home/src/main/resources/rdf/display/firsttime/PropertyConfigSupp.n3
@@ -8,7 +8,7 @@
 @prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
 @prefix role:  <http://vitro.mannlib.cornell.edu/ns/vitro/role#> .
 @prefix local: <http://vitro.mannlib.cornell.edu/ns/vitro/siteConfig/> .
-@prefix vivo: <http://vivoweb.org/ontology/core#> . 
+@prefix vivo: <http://vivoweb.org/ontology/core#> .
 
 @base <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration> .
 
diff --git a/home/src/main/resources/rdf/display/firsttime/aboutPage.n3 b/home/src/main/resources/rdf/display/firsttime/aboutPage.n3
index 9aa2ceaab1..d2a7c2f7c6 100644
--- a/home/src/main/resources/rdf/display/firsttime/aboutPage.n3
+++ b/home/src/main/resources/rdf/display/firsttime/aboutPage.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix about: <http://vitro.mannlib.cornell.edu/ns/default/about#> .
 
diff --git a/home/src/main/resources/rdf/display/firsttime/menu.n3 b/home/src/main/resources/rdf/display/firsttime/menu.n3
index e6abb2018b..3d6aa54e5b 100644
--- a/home/src/main/resources/rdf/display/firsttime/menu.n3
+++ b/home/src/main/resources/rdf/display/firsttime/menu.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@@ -12,7 +12,7 @@
 
 #### Default Menu ####
 
-display:DefaultMenu 
+display:DefaultMenu
     a  display:MainMenu ;
     rdfs:label "Default Menu" ;
     display:hasElement display:EventsMenuItem ;
@@ -24,36 +24,36 @@ display:DefaultMenu
 
 #### Menu Items for Default Menu ####
 
-display:HomeMenuItem 
+display:HomeMenuItem
     a display:NavigationElement ;
     display:menuPosition 1;
     display:linkText "Home";
     display:toPage display:Home .
 
-display:PeopleMenuItem 
+display:PeopleMenuItem
     a display:NavigationElement ;
     display:menuPosition 2;
     display:linkText "People";
     display:toPage display:People .
 
-display:OrganizationsMenuItem 
+display:OrganizationsMenuItem
     a display:NavigationElement ;
     display:menuPosition 3;
     display:linkText "Organizations";
     display:toPage display:Organizations .
 
-display:ResearchMenuItem     
+display:ResearchMenuItem
     a display:NavigationElement ;
     display:menuPosition 4;
     display:linkText "Research";
     display:toPage display:Research .
 
-display:EventsMenuItem 
+display:EventsMenuItem
     a display:NavigationElement ;
     display:menuPosition 5;
     display:linkText "Events";
-    display:toPage display:Events .        
-    
+    display:toPage display:Events .
+
 display:CapabilityMapMenuItem
     a display:NavigationElement ;
     display:menuPosition 6;
@@ -61,22 +61,22 @@ display:CapabilityMapMenuItem
     display:toPage display:CapabilityMap .
 
 display:Home
-    a display:HomePage ;    
+    a display:HomePage ;
     a display:Page ;
-    display:title "Home" ;    
+    display:title "Home" ;
     display:urlMapping "/" ;
     display:hasDataGetter display:homeDataGetter;
     display:cannotDeletePage "true" .
 
-display:Events 
-    a display:Page ;    
+display:Events
+    a display:Page ;
     a display:ClassGroupPage;
     display:forClassGroup vivoweb:vitroClassGroupevents ;
     display:title "Events" ;
-    display:urlMapping "/events" ; 
+    display:urlMapping "/events" ;
     display:hasDataGetter display:eventsDataGetter .
 
-display:Organizations 
+display:Organizations
     a display:Page ;
     a display:ClassGroupPage;
     display:forClassGroup vivoweb:vitroClassGrouporganizations ;
@@ -84,16 +84,16 @@ display:Organizations
     display:urlMapping "/organizations";
     display:hasDataGetter display:organizationsDataGetter .
 
-display:People 
-    a display:Page ;    
+display:People
+    a display:Page ;
     a display:ClassGroupPage;
     display:forClassGroup vivoweb:vitroClassGrouppeople ;
     display:title "People" ;
     display:urlMapping "/people" ;
    	display:hasDataGetter display:peopleDataGetter .
 
-display:Research 
-    a display:Page ;        
+display:Research
+    a display:Page ;
     a display:ClassGroupPage;
     display:forClassGroup vivoweb:vitroClassGrouppublications ;
     display:title "Research" ;
@@ -121,12 +121,12 @@ display:organizationsDataGetter
       a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
       display:forClassGroup
               vivoweb:vitroClassGrouporganizations .
-                            
+
 display:eventsDataGetter
       a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
       display:forClassGroup
               vivoweb:vitroClassGroupevents .
-              
+
 display:homeDataGetter
       a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> .
 
diff --git a/home/src/main/resources/rdf/tbox/filegraph/ontologies.owl b/home/src/main/resources/rdf/tbox/filegraph/ontologies.owl
index 5308bc277e..9ed67996df 100644
--- a/home/src/main/resources/rdf/tbox/filegraph/ontologies.owl
+++ b/home/src/main/resources/rdf/tbox/filegraph/ontologies.owl
@@ -12,7 +12,7 @@
     <owl:Ontology rdf:about="http://purl.org/ontology/bibo/"/>
     <owl:Ontology rdf:about="http://vivoweb.org/ontology/core"/>
     <owl:Ontology rdf:about="http://purl.obolibrary.org/obo/"/>
-    <owl:Ontology rdf:about="http://www.w3.org/2006/vcard/ns"/>   
+    <owl:Ontology rdf:about="http://www.w3.org/2006/vcard/ns"/>
     <owl:Ontology rdf:about="http://aims.fao.org/aos/geopolitical.owl"/>
     <owl:Ontology rdf:about="http://purl.org/net/OCRe/research.owl"/>
     <owl:Ontology rdf:about="http://purl.org/net/OCRe/study_design.owl"/>
@@ -27,5 +27,5 @@
     <owl:Ontology rdf:about="http://purl.org/vocab/vann/"/>
     <owl:Ontology rdf:about="http://purl.obolibrary.org/obo/ro.owl"/>
     <owl:Ontology rdf:about="http://www.ebi.ac.uk/efo/swo/"/>
-    
-</rdf:RDF> 
+
+</rdf:RDF>
diff --git a/home/src/main/resources/rdf/tbox/filegraph/vivo.owl b/home/src/main/resources/rdf/tbox/filegraph/vivo.owl
index cffee159c0..669d8b7017 100644
--- a/home/src/main/resources/rdf/tbox/filegraph/vivo.owl
+++ b/home/src/main/resources/rdf/tbox/filegraph/vivo.owl
@@ -15,12 +15,12 @@
      xmlns:terms="http://purl.org/dc/terms/"
      xmlns:obo="http://purl.obolibrary.org/obo/"
      xmlns:statistics="http://purl.org/net/OCRe/statistics.owl#">
-     
+
     <owl:Ontology rdf:about="http://vivoweb.org/ontology/core">
         <rdfs:label xml:lang="en-US">VIVO Core Ontology</rdfs:label>
     </owl:Ontology>
 
-    <!-- 
+    <!--
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Annotation properties
@@ -32,157 +32,157 @@
     <!-- http://aims.fao.org/aos/geopolitical.owl#sourceCreator -->
 
     <owl:AnnotationProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#sourceCreator"/>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#sourceIdentifier -->
 
     <owl:AnnotationProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#sourceIdentifier"/>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#sourceModified -->
 
     <owl:AnnotationProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#sourceModified"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_0000033 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/ARG_0000033"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000179 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/BFO_0000179"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000180 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/BFO_0000180"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000111 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000111"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000112 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000112"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000114 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000114"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000115 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000115"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000116 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000116"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000117 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000117"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000118 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000118"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000119 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000119"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000231 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000231"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000232 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000232"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000412 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000412"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000600 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000600"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000601 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000601"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000602 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000602"/>
-    
+
 
 
     <!-- http://purl.org/dc/terms/description -->
 
     <owl:AnnotationProperty rdf:about="http://purl.org/dc/terms/description"/>
-    
+
 
 
     <!-- http://purl.org/dc/terms/source -->
 
     <owl:AnnotationProperty rdf:about="http://purl.org/dc/terms/source"/>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/statistics.owl#curator -->
 
     <owl:AnnotationProperty rdf:about="http://purl.org/net/OCRe/statistics.owl#curator"/>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_protocol.owl#develop_comment -->
 
     <owl:AnnotationProperty rdf:about="http://purl.org/net/OCRe/study_protocol.owl#develop_comment"/>
-    
+
 
 
     <!-- http://vitro.mannlib.cornell.edu/ns/vitro/0.7#descriptionAnnot -->
 
     <owl:AnnotationProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#descriptionAnnot"/>
-    
+
 
 
     <!-- http://vitro.mannlib.cornell.edu/ns/vitro/0.7#exampleAnnot -->
 
     <owl:AnnotationProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#exampleAnnot"/>
-    
+
 
 
     <!-- http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot -->
@@ -193,52 +193,52 @@
     <!-- http://www.w3.org/2000/01/rdf-schema#comment -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2000/01/rdf-schema#comment"/>
-    
+
 
 
     <!-- http://www.w3.org/2000/01/rdf-schema#isDefinedBy -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2000/01/rdf-schema#isDefinedBy"/>
-    
+
 
 
     <!-- http://www.w3.org/2000/01/rdf-schema#label -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2000/01/rdf-schema#label"/>
-    
+
 
 
     <!-- http://www.w3.org/2002/07/owl#minCardinality -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2002/07/owl#minCardinality"/>
-    
+
 
 
     <!-- http://www.w3.org/2003/06/sw-vocab-status/ns#term_status -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2003/06/sw-vocab-status/ns#term_status"/>
-    
+
 
 
     <!-- http://www.w3.org/2004/02/skos/core#scopeNote -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2004/02/skos/core#scopeNote"/>
-    
+
 
 
     <!-- http://www.w3.org/2008/05/skos#editorialNote -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2008/05/skos#editorialNote"/>
-    
+
 
 
     <!-- http://www.w3.org/2008/05/skos#scopeNote -->
 
     <owl:AnnotationProperty rdf:about="http://www.w3.org/2008/05/skos#scopeNote"/>
-    
 
 
-    <!-- 
+
+    <!--
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Datatypes
@@ -246,52 +246,52 @@
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-    
+
 
 
     <!-- http://www.w3.org/1999/02/22-rdf-syntax-ns#PlainLiteral -->
 
     <rdfs:Datatype rdf:about="http://www.w3.org/1999/02/22-rdf-syntax-ns#PlainLiteral"/>
-    
+
 
 
     <!-- http://www.w3.org/2000/01/rdf-schema#Literal -->
 
     <rdfs:Datatype rdf:about="http://www.w3.org/2000/01/rdf-schema#Literal"/>
-    
+
 
 
     <!-- http://www.w3.org/2001/XMLSchema#anyURI -->
 
     <rdfs:Datatype rdf:about="http://www.w3.org/2001/XMLSchema#anyURI"/>
-    
+
 
 
     <!-- http://www.w3.org/2001/XMLSchema#boolean -->
 
     <rdfs:Datatype rdf:about="http://www.w3.org/2001/XMLSchema#boolean"/>
-    
+
 
 
     <!-- http://www.w3.org/2001/XMLSchema#date -->
 
     <rdfs:Datatype rdf:about="http://www.w3.org/2001/XMLSchema#date"/>
-    
+
 
 
     <!-- http://www.w3.org/2001/XMLSchema#int -->
 
     <rdfs:Datatype rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
-    
+
 
 
     <!-- http://www.w3.org/2001/XMLSchema#string -->
 
     <rdfs:Datatype rdf:about="http://www.w3.org/2001/XMLSchema#string"/>
-    
 
 
-    <!-- 
+
+    <!--
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Object Properties
@@ -299,7 +299,7 @@
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasBorderWith -->
@@ -311,7 +311,7 @@
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">United Nations cartographic maps http://www.un.org/Depts/Cartographic/map/profile/world00.pdf</terms:source>
         <geopolitical:sourceIdentifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.un.org/Depts/Cartographic/map/profile/world00.pdf</geopolitical:sourceIdentifier>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasMember -->
@@ -322,7 +322,7 @@
         <owl:inverseOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#isInGroup"/>
         <rdfs:range rdf:resource="http://aims.fao.org/aos/geopolitical.owl#territory"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#isAdministeredBy -->
@@ -334,7 +334,7 @@
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">United Nations cartographic maps http://www.un.org/Depts/Cartographic/map/profile/world00.pdf</terms:source>
         <geopolitical:sourceIdentifier xml:lang="en">http://www.un.org/Depts/Cartographic/map/profile/world00.pdf</geopolitical:sourceIdentifier>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#isInGroup -->
@@ -344,7 +344,7 @@
         <rdfs:range rdf:resource="http://aims.fao.org/aos/geopolitical.owl#group"/>
         <rdfs:domain rdf:resource="http://aims.fao.org/aos/geopolitical.owl#territory"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#isPredecessorOf -->
@@ -360,7 +360,7 @@
         <rdfs:domain rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
         <owl:inverseOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#isSuccessorOf"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#isSuccessorOf -->
@@ -375,13 +375,13 @@
         <rdfs:range rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
         <rdfs:domain rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://isf/deprecated_op -->
 
     <owl:ObjectProperty rdf:about="http://isf/deprecated_op"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000028 -->
@@ -391,7 +391,7 @@
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/ARG_2000029"/>
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ARG_2000379"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000029 -->
@@ -400,7 +400,7 @@
         <rdfs:label xml:lang="en">contact info for</rdfs:label>
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/ARG_2000379"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000390 -->
@@ -409,7 +409,7 @@
         <rdfs:label xml:lang="en">context for</rdfs:label>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/ARG_2000391"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000391 -->
@@ -417,7 +417,7 @@
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ARG_2000391">
         <rdfs:label xml:lang="en">has context</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000399 -->
@@ -425,7 +425,7 @@
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ARG_2000399">
         <rdfs:label xml:lang="en">has contact agent</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000050 -->
@@ -435,7 +435,7 @@
         <rdfs:label xml:lang="en">part of</rdfs:label>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000051 -->
@@ -444,7 +444,7 @@
         <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#TransitiveProperty"/>
         <rdfs:label xml:lang="en">has part</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000054 -->
@@ -461,7 +461,7 @@
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000055"/>
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/bfo.owl"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000055 -->
@@ -476,7 +476,7 @@
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000017"/>
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/bfo.owl"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000029 -->
@@ -502,7 +502,7 @@
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000031 -->
@@ -528,7 +528,7 @@
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000033 -->
@@ -544,7 +544,7 @@
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000034 -->
@@ -569,7 +569,7 @@
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000037 -->
@@ -593,7 +593,7 @@
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000038 -->
@@ -618,7 +618,7 @@
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000070 -->
@@ -642,7 +642,7 @@
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000390 -->
@@ -665,7 +665,7 @@
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000397 -->
@@ -688,7 +688,7 @@
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000398 -->
@@ -711,7 +711,7 @@
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000460 -->
@@ -741,7 +741,7 @@
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000481 -->
@@ -766,7 +766,7 @@
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000482 -->
@@ -785,7 +785,7 @@
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2002/07/owl#DeprecatedProperty"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000543 -->
@@ -800,7 +800,7 @@
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0000007"/>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000572 -->
@@ -814,7 +814,7 @@
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">used to study</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000775 -->
@@ -830,7 +830,7 @@
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0000776"/>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000918 -->
@@ -847,7 +847,7 @@
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/ERO_0000919"/>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000919 -->
@@ -863,7 +863,7 @@
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0000020"/>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001518 -->
@@ -879,7 +879,7 @@
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:range rdf:resource="http://purl.org/net/OCRe/study_design.owl#OCRE100038"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001520 -->
@@ -896,7 +896,7 @@
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001521 -->
@@ -913,7 +913,7 @@
         <rdfs:subPropertyOf rdf:resource="http://www.obofoundry.org/ro/ro.owl#has_agent"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000039 -->
@@ -924,14 +924,14 @@
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/IAO_0000003"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000136 -->
 
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000136">
         <rdfs:label xml:lang="en">is about</rdfs:label>
-        <obo:IAO_0000116 xml:lang="en">7/6/2009 Alan Ruttenberg. Following discussion with Jonathan Rees, and introduction of &quot;mentions&quot; relation. Weaken the is_about relationship to be primitive. 
+        <obo:IAO_0000116 xml:lang="en">7/6/2009 Alan Ruttenberg. Following discussion with Jonathan Rees, and introduction of &quot;mentions&quot; relation. Weaken the is_about relationship to be primitive.
 
 We will try to build it back up by elaborating the various subproperties that are more precisely defined.
 
@@ -943,7 +943,7 @@ Some currently missing phenomena that should be considered &quot;about&quot; are
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000125"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000142 -->
@@ -952,7 +952,7 @@ Some currently missing phenomena that should be considered &quot;about&quot; are
         <rdfs:label xml:lang="en">mentions</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000136"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000221 -->
@@ -990,21 +990,21 @@ An attempt at defining assay using Barry&apos;s &quot;reliability&quot; wording
 
 assay:
 process and has_input some material entity
-and has_output some information content entity 
-and which is such that instances of this process type reliably generate 
+and has_output some information content entity
+and which is such that instances of this process type reliably generate
 outputs that describes the input.</obo:IAO_0000116>
         <obo:IAO_0000116 xml:lang="en">This one is the one we are struggling with at the moment. The issue is what a measurement measures. On the one hand saying that it measures the quality would include it &quot;measuring&quot; the bearer = referring to the bearer in the measurement. However this makes comparisons of two different things not possible. On the other hand not having it inhere in the bearer, on the face of it, breaks the audit trail.
 
 Werner suggests a solution based on &quot;Magnitudes&quot; a proposal for which we are awaiting details.</obo:IAO_0000116>
         <obo:IAO_0000115 xml:lang="en">m is a quality measurement of q at t when
-q is a quality 
+q is a quality
 there is a measurement process p that has specified output m, a measurement datum, that is about q</obo:IAO_0000115>
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000019"/>
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000109"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000136"/>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000417"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000417 -->
@@ -1016,7 +1016,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000115 xml:lang="en">inverse of the relation of is quality measurement of</obo:IAO_0000115>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000293 -->
@@ -1034,7 +1034,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/OBI_0000011"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/RO_0002233"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000299 -->
@@ -1051,7 +1051,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/OBI_0000312"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/RO_0002234"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000304 -->
@@ -1068,7 +1068,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000040"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000312 -->
@@ -1082,7 +1082,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/OBI_0000011"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/RO_0002353"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000417 -->
@@ -1098,7 +1098,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/OBI_0000011"/>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/OBI_0000833"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000643 -->
@@ -1113,7 +1113,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi_webservice.owl"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000833 -->
@@ -1125,7 +1125,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000005"/>
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/OBI_0000011"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0000052 -->
@@ -1139,7 +1139,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000020"/>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0000053"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0000053 -->
@@ -1149,7 +1149,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000004"/>
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000020"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0000056 -->
@@ -1160,7 +1160,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000003"/>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0000057"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0000057 -->
@@ -1170,7 +1170,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000002"/>
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000003"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0001000 -->
@@ -1178,7 +1178,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0001000">
         <rdfs:label xml:lang="en">derives from</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0001015 -->
@@ -1187,7 +1187,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">location of</rdfs:label>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0001025"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0001018 -->
@@ -1196,7 +1196,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">contained in</rdfs:label>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0001019"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0001019 -->
@@ -1204,7 +1204,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0001019">
         <rdfs:label xml:lang="en">contains</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0001025 -->
@@ -1212,7 +1212,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0001025">
         <rdfs:label xml:lang="en">located in</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0002220 -->
@@ -1220,7 +1220,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0002220">
         <rdfs:label xml:lang="en">adjacent to</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0002233 -->
@@ -1229,7 +1229,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has input</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/RO_0000057"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0002234 -->
@@ -1239,7 +1239,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/RO_0000057"/>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0002353"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0002350 -->
@@ -1248,7 +1248,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">member of</rdfs:label>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0002351"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0002351 -->
@@ -1256,7 +1256,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0002351">
         <rdfs:label xml:lang="en">has member</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0002353 -->
@@ -1265,7 +1265,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">output of</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://purl.obolibrary.org/obo/RO_0000056"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0003000 -->
@@ -1279,7 +1279,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0003001"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/ro.owl"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/RO_0003001 -->
@@ -1289,7 +1289,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000040"/>
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000040"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/dc/terms/contributor -->
@@ -1297,7 +1297,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://purl.org/dc/terms/contributor">
         <rdfs:label xml:lang="en">contributor</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/affirmedBy -->
@@ -1308,7 +1308,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:isDefinedBy rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://purl.org/ontology/bibo/</rdfs:isDefinedBy>
         <rdfs:comment xml:lang="en">A legal decision that affirms a ruling.</rdfs:comment>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/annotates -->
@@ -1320,7 +1320,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">Critical or explanatory note for a Document.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/citedBy -->
@@ -1331,7 +1331,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <owl:inverseOf rdf:resource="http://purl.org/ontology/bibo/cites"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/cites -->
@@ -1341,7 +1341,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/court -->
@@ -1353,7 +1353,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">A court associated with a legal document; for example, that which issues a decision.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/degree -->
@@ -1367,7 +1367,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <skos2:editorialNote xml:lang="en">We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won&apos;t do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen.</skos2:editorialNote>
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/ThesisDegree"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/director -->
@@ -1379,7 +1379,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">A Film director.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/distributor -->
@@ -1389,7 +1389,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Public Description for bibo:distributor taken from here:  http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html .</vitro:descriptionAnnot>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#distributes"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/interviewee -->
@@ -1400,7 +1400,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">An agent that is interviewed by another agent.</rdfs:comment>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/interviewer -->
@@ -1411,7 +1411,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">An agent that interview another agent.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/issuer -->
@@ -1424,7 +1424,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <ns:term_status>unstable</ns:term_status>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/performer -->
@@ -1435,7 +1435,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <ns:term_status>stable</ns:term_status>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/dc/terms/contributor"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/presentedAt -->
@@ -1450,7 +1450,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <owl:inverseOf rdf:resource="http://purl.org/ontology/bibo/presents"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/presents -->
@@ -1462,7 +1462,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">Relates an event to associated documents; for example, conference to a paper.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/recipient -->
@@ -1473,7 +1473,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">An agent that receives a communication document.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/reproducedIn -->
@@ -1485,7 +1485,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#reproduces"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/reversedBy -->
@@ -1496,7 +1496,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:isDefinedBy rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://purl.org/ontology/bibo/</rdfs:isDefinedBy>
         <rdfs:comment xml:lang="en">A legal decision that reverses a ruling.</rdfs:comment>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/reviewOf -->
@@ -1506,7 +1506,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html .  As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn&apos;t seem to be being used.</obo:IAO_0000112>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#reviewedIn"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/status -->
@@ -1517,7 +1517,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/DocumentStatus"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/subsequentLegalDecision -->
@@ -1528,7 +1528,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:isDefinedBy rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://purl.org/ontology/bibo/</rdfs:isDefinedBy>
         <rdfs:comment xml:lang="en">A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.).</rdfs:comment>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/transcriptOf -->
@@ -1540,7 +1540,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">Relates a document to some transcribed original.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/translationOf -->
@@ -1555,7 +1555,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#hasTranslation"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/translator -->
@@ -1574,7 +1574,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/spar/c4o/hasGlobalCitationFrequency -->
@@ -1585,7 +1585,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A property linking a publication entity to the property c40:GlobalCitationCount that specify how many times a work has been cited by others, according to a particular information source on a particular date.</vitro:descriptionAnnot>
         <rdfs:range rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/spar/c4o/hasGlobalCountSource -->
@@ -1597,7 +1597,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.org/spar/c4o/BibliographicInformationSource"/>
         <rdfs:domain rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/spar/cito/citesAsDataSource -->
@@ -1607,7 +1607,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment xml:lang="en">The citing entity cites the cited entity as source of data.</rdfs:comment>
         <owl:inverseOf rdf:resource="http://purl.org/spar/cito/isCitedAsDataSourceBy"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://purl.org/spar/cito/isCitedAsDataSourceBy -->
@@ -1616,7 +1616,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">is cited as data source by</rdfs:label>
         <rdfs:comment xml:lang="en">The cited entity is cited as a data source by the citing entity.</rdfs:comment>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#affiliatedOrganization -->
@@ -1626,7 +1626,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#assignedBy -->
@@ -1636,7 +1636,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000115 xml:lang="en">Relates a Relationship (as a predicate or n-ary relation over one or more Thing) to an Agent that defined or instantiated the predicate instance. </obo:IAO_0000115>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#assigns"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#assignee -->
@@ -1647,7 +1647,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#assigneeFor"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#assigneeFor -->
@@ -1657,7 +1657,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Patent"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#assigns -->
@@ -1665,7 +1665,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#assigns">
         <rdfs:label xml:lang="en">assigns</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#conceptAssociatedWith -->
@@ -1674,7 +1674,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">concept for</rdfs:label>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#hasAssociatedConcept"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#confirmedOrcidId -->
@@ -1684,7 +1684,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment>Indicates that the Orcid ID has been confirmed by this Person</rdfs:comment>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#contributingRole -->
@@ -1694,7 +1694,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#roleContributesTo"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#dateFiled -->
@@ -1705,7 +1705,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#dateIssued -->
@@ -1715,7 +1715,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#dateTimeInterval -->
@@ -1724,7 +1724,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">date/time interval</rdfs:label>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeInterval"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#dateTimePrecision -->
@@ -1734,7 +1734,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValuePrecision"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#dateTimeValue -->
@@ -1743,7 +1743,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">date/time value</rdfs:label>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#degreeCandidacy -->
@@ -1753,7 +1753,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#AcademicDegree"/>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#AdvisingRelationship"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#distributes -->
@@ -1762,7 +1762,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">distributes</rdfs:label>
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Public Description for bibo:distributor taken from here:  http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html .</vitro:descriptionAnnot>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#distributesFundingFrom -->
@@ -1774,7 +1774,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#FundingOrganization"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#providesFundingThrough"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#eligibleFor -->
@@ -1783,7 +1783,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">credential eligibility attained</rdfs:label>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Credential"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#end -->
@@ -1794,7 +1794,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#equipmentFor -->
@@ -1806,7 +1806,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#hasEquipment"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#expirationDate -->
@@ -1815,7 +1815,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">expiration date</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#facilityFor -->
@@ -1824,7 +1824,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Facility"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#hasFacility"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#featuredIn -->
@@ -1835,7 +1835,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#features"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#features -->
@@ -1846,7 +1846,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#fundingVehicleFor -->
@@ -1857,7 +1857,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#hasFundingVehicle"/>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#supports"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#geographicFocus -->
@@ -1867,7 +1867,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#GeographicRegion"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#geographicFocusOf"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#geographicFocusOf -->
@@ -1876,7 +1876,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">geographic focus of</rdfs:label>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#GeographicRegion"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#governingAuthorityFor -->
@@ -1886,7 +1886,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#hasGoverningAuthority"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#grantSubcontractedThrough -->
@@ -1897,7 +1897,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#subcontractsGrant"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasAssociatedConcept -->
@@ -1905,7 +1905,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#hasAssociatedConcept">
         <rdfs:label xml:lang="en">associated concept</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasCollaborator -->
@@ -1929,7 +1929,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Equipment"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasFacility -->
@@ -1938,7 +1938,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has facility</rdfs:label>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Facility"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasFundingVehicle -->
@@ -1954,7 +1954,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasGoverningAuthority -->
@@ -1963,7 +1963,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">governing authority</rdfs:label>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasPredecessorOrganization -->
@@ -1974,7 +1974,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasPrerequisite -->
@@ -1985,7 +1985,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Course"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#prerequisiteFor"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasProceedings -->
@@ -1997,7 +1997,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Proceedings"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#proceedingsOf"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasPublicationVenue -->
@@ -2006,7 +2006,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">published in</rdfs:label>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#publicationVenueFor"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasResearchArea -->
@@ -2016,7 +2016,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#hasAssociatedConcept"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#researchAreaOf"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasSubjectArea -->
@@ -2026,7 +2026,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#hasAssociatedConcept"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#subjectAreaOf"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasSuccessorOrganization -->
@@ -2036,7 +2036,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasTranslation -->
@@ -2047,7 +2047,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#informationResourceSupportedBy -->
@@ -2059,7 +2059,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#supportedBy"/>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#supportedInformationResource"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#offeredBy -->
@@ -2068,7 +2068,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">offered by</rdfs:label>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#offers"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#offers -->
@@ -2076,7 +2076,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#offers">
         <rdfs:label xml:lang="en">offers</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#orcidId -->
@@ -2087,7 +2087,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <vitro:stubObjectPropertyAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:stubObjectPropertyAnnot>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#prerequisiteFor -->
@@ -2097,7 +2097,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Course"/>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Course"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#proceedingsOf -->
@@ -2108,7 +2108,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Conference"/>
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Proceedings"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#providesFundingThrough -->
@@ -2119,7 +2119,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#FundingOrganization"/>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#FundingOrganization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#publicationVenueFor -->
@@ -2127,7 +2127,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#publicationVenueFor">
         <rdfs:label xml:lang="en">publication venue for</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#publisher -->
@@ -2138,7 +2138,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#publisherOf"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#publisherOf -->
@@ -2149,7 +2149,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#relatedBy -->
@@ -2159,7 +2159,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000115 xml:lang="en">Relates a Thing to a Relationship as a Thing that is somehow related to other Thing in the same Relationship instance. A Relationship instnace is a predicate over Thing and is created by an Agent.</obo:IAO_0000115>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#relates"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#relates -->
@@ -2168,7 +2168,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">relates</rdfs:label>
         <obo:IAO_0000115 xml:lang="en">Relates a Relationship instance to the one or more Thing of the Relationship. There is a separate property (assigned by) to relate to the Agent that defines the Relationship.</obo:IAO_0000115>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#reproduces -->
@@ -2179,7 +2179,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#researchAreaOf -->
@@ -2188,7 +2188,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">research area of</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#conceptAssociatedWith"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#reviewedIn -->
@@ -2198,7 +2198,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html .  As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn&apos;t seem to be being used.</vitro:descriptionAnnot>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Review"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#roleContributesTo -->
@@ -2207,7 +2207,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">contributes to</rdfs:label>
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#sponsoredBy -->
@@ -2218,7 +2218,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#sponsors"/>
         <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#sponsors -->
@@ -2228,7 +2228,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Award"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#start -->
@@ -2239,7 +2239,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#subcontractsGrant -->
@@ -2249,7 +2249,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#subjectAreaOf -->
@@ -2258,7 +2258,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">subject area of</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#conceptAssociatedWith"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#supportedBy -->
@@ -2268,7 +2268,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">general relationship of support</vitro:descriptionAnnot>
         <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#supports"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#supportedInformationResource -->
@@ -2279,7 +2279,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#supports"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#supports -->
@@ -2288,7 +2288,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">supports</rdfs:label>
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">general relationship of support</vitro:descriptionAnnot>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#translatorOf -->
@@ -2305,7 +2305,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#validIn -->
@@ -2314,7 +2314,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">valid in</rdfs:label>
         <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#GeographicLocation"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#accessProvidedBy -->
@@ -2323,7 +2323,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">access provided by</rdfs:label>
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0000391"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#documentationFor -->
@@ -2345,7 +2345,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#protocolRealizedBy -->
@@ -2362,7 +2362,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.ebi.ac.uk/efo/swo/SWO_0000740 -->
@@ -2370,7 +2370,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://www.ebi.ac.uk/efo/swo/SWO_0000740">
         <rdfs:label xml:lang="en">implements</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.ebi.ac.uk/efo/swo/SWO_0000741 -->
@@ -2386,7 +2386,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:domain>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.obofoundry.org/ro/ro.owl#has_agent -->
@@ -2394,7 +2394,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://www.obofoundry.org/ro/ro.owl#has_agent">
         <rdfs:label xml:lang="en">has agent</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2002/07/owl#DeprecatedProperty -->
@@ -2402,7 +2402,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:ObjectProperty rdf:about="http://www.w3.org/2002/07/owl#DeprecatedProperty">
         <rdfs:label xml:lang="en">deprecated property</rdfs:label>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2002/07/owl#sameAs -->
@@ -2413,13 +2413,13 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
         <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2002/07/owl#topObjectProperty"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2002/07/owl#topObjectProperty -->
 
     <owl:ObjectProperty rdf:about="http://www.w3.org/2002/07/owl#topObjectProperty"/>
-    
+
 
 
     <!-- http://www.w3.org/2004/02/skos/core#broader -->
@@ -2432,7 +2432,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
         <owl:inverseOf rdf:resource="http://www.w3.org/2004/02/skos/core#narrower"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2004/02/skos/core#narrower -->
@@ -2444,7 +2444,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2004/02/skos/core#related -->
@@ -2455,7 +2455,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasAddress -->
@@ -2464,7 +2464,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has address</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Address"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasCalendarLink -->
@@ -2473,7 +2473,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has calendar link</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#CalendarLink"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasCalendarRequest -->
@@ -2482,7 +2482,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has calendar request</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#CalendarRequest"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasCalenderBusy -->
@@ -2491,7 +2491,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has calendar busy</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#CalendarBusy"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasCategory -->
@@ -2500,7 +2500,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has category</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Category"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasEmail -->
@@ -2509,7 +2509,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has email</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Email"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasFormattedName -->
@@ -2518,7 +2518,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has formatted name</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#FormattedName"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasGeo -->
@@ -2527,7 +2527,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has geo</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Geo"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasInstantMessage -->
@@ -2536,7 +2536,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has messaging</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#InstantMessage"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasKey -->
@@ -2545,7 +2545,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has key</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Key"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasLanguage -->
@@ -2554,7 +2554,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has language</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Language"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasLogo -->
@@ -2563,7 +2563,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has logo</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Logo"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasMember -->
@@ -2582,7 +2582,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:range>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasName -->
@@ -2591,7 +2591,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has name</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Name"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasNickname -->
@@ -2600,7 +2600,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has nickname</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Nickname"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasNote -->
@@ -2609,7 +2609,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has note</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Note"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasOrganizationName -->
@@ -2618,7 +2618,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has organization name</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#OrganizationName"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasOrganizationalUnitName -->
@@ -2627,7 +2627,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has organizational unit name</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#OrganizationUnitName"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasPhoto -->
@@ -2636,7 +2636,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has photo</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Photo"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasRelated -->
@@ -2645,7 +2645,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has related</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Related"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasSound -->
@@ -2654,7 +2654,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has sound</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Sound"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasTelephone -->
@@ -2663,7 +2663,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has telephone</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Telephone"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasTimeZone -->
@@ -2672,7 +2672,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has time zone</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#TimeZone"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasTitle -->
@@ -2681,7 +2681,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has title</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#Title"/>
     </owl:ObjectProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#hasURL -->
@@ -2690,10 +2690,10 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">has URL</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#URL"/>
     </owl:ObjectProperty>
-    
 
 
-    <!-- 
+
+    <!--
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Data properties
@@ -2701,7 +2701,7 @@ there is a measurement process p that has specified output m, a measurement datu
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#GDP -->
@@ -2718,7 +2718,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="es">http://datos.bancomundial.org/indicador/NY.GDP.MKTP.CD</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://donnees.banquemondiale.org/indicateur/NY.GDP.MKTP.CD</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#GDPNotes -->
@@ -2726,7 +2726,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#GDPNotes">
         <rdfs:label xml:lang="en">GDP notes</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#GDPTotalInCurrentPrices -->
@@ -2734,7 +2734,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#GDPTotalInCurrentPrices">
         <rdfs:label xml:lang="en">GDP total in current prices</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#GDPUnit -->
@@ -2742,7 +2742,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#GDPUnit">
         <rdfs:label xml:lang="en">GDP unit</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#GDPYear -->
@@ -2750,7 +2750,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#GDPYear">
         <rdfs:label xml:lang="en">GDPYear</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#HDI -->
@@ -2766,31 +2766,31 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="es">http://hdrstats.undp.org/es/indicadores/49806.html</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://hdrstats.undp.org/fr/indicateurs/49806.html</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#HDINotes -->
 
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#HDINotes"/>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#HDITotal -->
 
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#HDITotal"/>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#HDIUnit -->
 
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#HDIUnit"/>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#HDIYear -->
 
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#HDIYear"/>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#agriculturalArea -->
@@ -2806,7 +2806,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="es">http://faostat.fao.org/DesktopDefault.aspx?PageID=377&amp;lang=es#ancor</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://faostat.fao.org/DesktopDefault.aspx?PageID=377&amp;lang=fr#ancor</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaNotes -->
@@ -2814,7 +2814,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaNotes">
         <rdfs:label xml:lang="en">agricultural area notes</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaTotal -->
@@ -2822,7 +2822,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaTotal">
         <rdfs:label xml:lang="en">agriculturalAreaTotal</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaUnit -->
@@ -2830,7 +2830,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaUnit">
         <rdfs:label xml:lang="en">agricultural area unit</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaYear -->
@@ -2838,7 +2838,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#agriculturalAreaYear">
         <rdfs:label xml:lang="en">agriculturalAreaYear</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeAGROVOC -->
@@ -2853,7 +2853,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://aims.fao.org/fr/website/Search-AGROVOC/sub</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://aims.fao.org/zh-hans/website/Search-AGROVOC/sub</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeCurrency -->
@@ -2870,7 +2870,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeDBPediaID -->
@@ -2882,7 +2882,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">DBpedia http://dbpedia.org/About</terms:source>
         <geopolitical:sourceIdentifier xml:lang="en">http://dbpedia.org/About</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeFAOSTAT -->
@@ -2895,7 +2895,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="es">http://faostat.fao.org/default.aspx?lang=es</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://faostat.fao.org/default.aspx?lang=fr</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeFAOTERM -->
@@ -2912,7 +2912,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeGAUL -->
@@ -2924,7 +2924,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Global Administrative Unit Layers http://www.fao.org/geonetwork/srv/en/metadata.show?id=12691</terms:source>
         <geopolitical:sourceIdentifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.fao.org/geonetwork/srv/en/metadata.show?id=12691</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeISO2 -->
@@ -2935,7 +2935,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">ISO 3166-1 http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm</terms:source>
         <geopolitical:sourceIdentifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeISO3 -->
@@ -2948,7 +2948,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="en">http://unstats.un.org/unsd/methods/m49/m49alpha.htm</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://unstats.un.org/unsd/methods/m49/m49alphaf.htm</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeUN -->
@@ -2961,7 +2961,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="en">http://unstats.un.org/unsd/methods/m49/m49alpha.htm</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://unstats.un.org/unsd/methods/m49/m49alphaf.htm</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#codeUNDP -->
@@ -2969,7 +2969,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#codeUNDP">
         <rdfs:label xml:lang="en">codeUNDP</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#countryArea -->
@@ -2985,7 +2985,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="es">http://faostat.fao.org/DesktopDefault.aspx?PageID=377&amp;lang=es#ancor</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://faostat.fao.org/DesktopDefault.aspx?PageID=377&amp;lang=fr#ancor</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#countryAreaNotes -->
@@ -2993,7 +2993,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#countryAreaNotes">
         <rdfs:label xml:lang="en">country area notes</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#countryAreaTotal -->
@@ -3001,7 +3001,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#countryAreaTotal">
         <rdfs:label xml:lang="en">total country area</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#countryAreaUnit -->
@@ -3009,7 +3009,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#countryAreaUnit">
         <rdfs:label xml:lang="en">country area unit</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#countryAreaYear -->
@@ -3017,7 +3017,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#countryAreaYear">
         <rdfs:label xml:lang="en">countryAreaYear</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasCode -->
@@ -3025,7 +3025,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasCode">
         <rdfs:label xml:lang="en">has code</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasCoordinate -->
@@ -3033,7 +3033,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasCoordinate">
         <rdfs:label xml:lang="en">has coordinate</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasCurrency -->
@@ -3041,7 +3041,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasCurrency">
         <rdfs:label xml:lang="en">has currency</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasListName -->
@@ -3049,7 +3049,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasListName">
         <rdfs:label xml:lang="en">has list name</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasMaxLatitude -->
@@ -3057,7 +3057,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasMaxLatitude">
         <rdfs:label xml:lang="en">has maximum latitude</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasMaxLongitude -->
@@ -3065,7 +3065,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasMaxLongitude">
         <rdfs:label xml:lang="en">has maximum longitude</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasMinLatitude -->
@@ -3073,7 +3073,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasMinLatitude">
         <rdfs:label xml:lang="en">has minimum latitude</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasMinLongitude -->
@@ -3081,7 +3081,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasMinLongitude">
         <rdfs:label xml:lang="en">has minimum longitude</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasNationality -->
@@ -3089,7 +3089,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasNationality">
         <rdfs:label xml:lang="en">has nationality</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasOfficialName -->
@@ -3097,7 +3097,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasOfficialName">
         <rdfs:label xml:lang="en">has official name</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasShortName -->
@@ -3105,7 +3105,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasShortName">
         <rdfs:label xml:lang="en">has short name</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#hasStatistics -->
@@ -3113,7 +3113,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasStatistics">
         <rdfs:label xml:lang="en">has statistics</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#landArea -->
@@ -3129,7 +3129,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="es">http://faostat.fao.org/DesktopDefault.aspx?PageID=377&amp;lang=es#ancor</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://faostat.fao.org/DesktopDefault.aspx?PageID=377&amp;lang=fr#ancor</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#landAreaNotes -->
@@ -3137,7 +3137,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#landAreaNotes">
         <rdfs:label xml:lang="en">land area notes</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#landAreaTotal -->
@@ -3145,7 +3145,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#landAreaTotal">
         <rdfs:label xml:lang="en">total land area</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#landAreaUnit -->
@@ -3153,7 +3153,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#landAreaUnit">
         <rdfs:label xml:lang="en">land area unit</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#landAreaYear -->
@@ -3161,7 +3161,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#landAreaYear">
         <rdfs:label xml:lang="en">landAreaYear</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameCurrencyAR -->
@@ -3178,7 +3178,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameCurrencyEN -->
@@ -3195,7 +3195,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameCurrencyES -->
@@ -3212,7 +3212,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameCurrencyFR -->
@@ -3229,7 +3229,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameCurrencyIT -->
@@ -3246,7 +3246,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameCurrencyRU -->
@@ -3263,7 +3263,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameCurrencyZH -->
@@ -3280,7 +3280,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameListAR -->
@@ -3297,7 +3297,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameListEN -->
@@ -3314,7 +3314,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameListES -->
@@ -3331,7 +3331,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameListFR -->
@@ -3348,7 +3348,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameListIT -->
@@ -3365,7 +3365,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameListRU -->
@@ -3382,7 +3382,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameListZH -->
@@ -3399,7 +3399,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameOfficialAR -->
@@ -3416,7 +3416,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameOfficialEN -->
@@ -3433,7 +3433,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameOfficialES -->
@@ -3450,7 +3450,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameOfficialFR -->
@@ -3467,7 +3467,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameOfficialIT -->
@@ -3484,7 +3484,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameOfficialRU -->
@@ -3501,7 +3501,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameOfficialZH -->
@@ -3518,7 +3518,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameShortAR -->
@@ -3535,7 +3535,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameShortEN -->
@@ -3552,7 +3552,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameShortES -->
@@ -3569,7 +3569,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameShortFR -->
@@ -3586,7 +3586,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameShortIT -->
@@ -3603,7 +3603,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameShortRU -->
@@ -3620,7 +3620,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nameShortZH -->
@@ -3637,7 +3637,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nationalityAR -->
@@ -3654,7 +3654,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nationalityEN -->
@@ -3671,7 +3671,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nationalityES -->
@@ -3688,7 +3688,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nationalityFR -->
@@ -3705,7 +3705,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nationalityIT -->
@@ -3722,7 +3722,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nationalityRU -->
@@ -3739,7 +3739,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#nationalityZH -->
@@ -3756,7 +3756,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="fr">http://www.fao.org/termportal/contr/fr/</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="zh">http://www.fao.org/termportal/contr/zh/</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#population -->
@@ -3772,7 +3772,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <geopolitical:sourceIdentifier xml:lang="es">http://faostat.fao.org/DesktopDefault.aspx?PageID=550&amp;lang=es#ancor</geopolitical:sourceIdentifier>
         <geopolitical:sourceIdentifier xml:lang="fr">http://faostat.fao.org/DesktopDefault.aspx?PageID=550&amp;lang=fr#ancor</geopolitical:sourceIdentifier>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#populationNotes -->
@@ -3780,7 +3780,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#populationNotes">
         <rdfs:label xml:lang="en">population notes</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#populationTotal -->
@@ -3788,7 +3788,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#populationTotal">
         <rdfs:label xml:lang="en">total population</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#populationUnit -->
@@ -3796,7 +3796,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#populationUnit">
         <rdfs:label xml:lang="en">population unit</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#populationYear -->
@@ -3804,7 +3804,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#populationYear">
         <rdfs:label xml:lang="en">populationYear</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#validSince -->
@@ -3813,7 +3813,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:label xml:lang="en">valid since</rdfs:label>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area&apos;s  first year of validity.  The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before.       </rdfs:comment>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#validUntil -->
@@ -3823,7 +3823,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The value of the datatype property *validUntil* associated to a particular area (territory or group) indicates the area&apos;s last year of validity. In case the area is currently valid, this value is set by default to 9999.
       </rdfs:comment>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_0000001 -->
@@ -3834,7 +3834,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_0000015 -->
@@ -3844,7 +3844,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000115>A free text field for recording topics which relate to the resource. </obo:IAO_0000115>
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/ARG_0000008"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_0000172 -->
@@ -3855,7 +3855,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_0000197 -->
@@ -3866,7 +3866,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000012 -->
@@ -3874,7 +3874,7 @@ there is a measurement process p that has specified output m, a measurement datu
     <owl:DatatypeProperty rdf:about="http://purl.obolibrary.org/obo/ARG_2000012">
         <rdfs:label xml:lang="en">Measurement Label</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000044 -->
@@ -3898,7 +3898,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000045 -->
@@ -3929,7 +3929,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000046 -->
@@ -3946,7 +3946,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000050 -->
@@ -3962,7 +3962,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000054 -->
@@ -3985,7 +3985,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000072 -->
@@ -4007,7 +4007,7 @@ there is a measurement process p that has specified output m, a measurement datu
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000424 -->
@@ -4023,7 +4023,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000774 -->
@@ -4039,7 +4039,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/abstract -->
@@ -4052,7 +4052,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:comment>A summary of the resource.</rdfs:comment>
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/asin -->
@@ -4066,7 +4066,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <ns:term_status>stable</ns:term_status>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/chapter -->
@@ -4079,7 +4079,7 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/BookSection"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/locator"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/coden -->
@@ -4093,7 +4093,7 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik
         <ns:term_status>stable</ns:term_status>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/doi -->
@@ -4106,7 +4106,7 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/eanucc13 -->
@@ -4120,7 +4120,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <ns:term_status>stable</ns:term_status>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/edition -->
@@ -4131,7 +4131,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">The name defining a special edition of a document. Normally its a literal value composed of a version number and words.</rdfs:comment>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/eissn -->
@@ -4144,7 +4144,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <ns:term_status>stable</ns:term_status>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/gtin14 -->
@@ -4157,7 +4157,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:comment xml:lang="en">Global Trade Item Number 14</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/identifier -->
@@ -4166,7 +4166,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:label xml:lang="en">identifier</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/isbn10 -->
@@ -4177,7 +4177,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Book"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/isbn13 -->
@@ -4188,7 +4188,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Book"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/issn -->
@@ -4201,7 +4201,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:comment xml:lang="en">International Standard Serial Number</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/issue -->
@@ -4212,7 +4212,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Article"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/locator"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/lccn -->
@@ -4225,7 +4225,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:comment xml:lang="en">Library of Congress Control Number</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/locator -->
@@ -4237,7 +4237,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:comment xml:lang="en">A description (often numeric) that locates an item within a containing document or collection.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/numPages -->
@@ -4246,7 +4246,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:label xml:lang="en">number of pages</rdfs:label>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/locator"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/number -->
@@ -4255,14 +4255,14 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
         <rdfs:label xml:lang="en">number</rdfs:label>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html</obo:IAO_0000112>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/oclcnum -->
 
     <owl:DatatypeProperty rdf:about="http://purl.org/ontology/bibo/oclcnum">
         <rdfs:label xml:lang="en">Online Computer Library Center (OCLC) number</rdfs:label>
-        <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://info-uri.info/registry/OAIHandler?verb=GetRecord&amp;metadataPrefix=reg&amp;identifier=info:oclcnum/. 
+        <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://info-uri.info/registry/OAIHandler?verb=GetRecord&amp;metadataPrefix=reg&amp;identifier=info:oclcnum/.
 
 
 bibo has the domain of this property set to the union of Collection and Document.</obo:IAO_0000112>
@@ -4271,7 +4271,7 @@ bibo has the domain of this property set to the union of Collection and Document
         <ns:term_status>stable</ns:term_status>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/pageEnd -->
@@ -4283,7 +4283,7 @@ bibo has the domain of this property set to the union of Collection and Document
         <rdfs:comment xml:lang="en">Ending page number within a continuous page range.</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/locator"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/pageStart -->
@@ -4295,7 +4295,7 @@ bibo has the domain of this property set to the union of Collection and Document
         <rdfs:comment xml:lang="en">Starting page number within a continuous page range.</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/locator"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/pmid -->
@@ -4309,7 +4309,7 @@ bibo has the domain of this property set to the union of Collection and Document
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/prefixName -->
@@ -4322,7 +4322,7 @@ bibo has the domain of this property set to the union of Collection and Document
         <rdfs:comment xml:lang="en">The prefix of a name</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/section -->
@@ -4337,7 +4337,7 @@ modern society using the world of Star trek. Los Angeles Times, March
 15, sec. A, p. 3.</obo:IAO_0000112>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/locator"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/shortDescription -->
@@ -4349,7 +4349,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <ns:term_status>unstable</ns:term_status>
         <skos:scopeNote xml:lang="en">The idea here is that while dcterms:description may involve length descriptions, this for short (two or three word) descriptions that could go in a bibliographic entry.</skos:scopeNote>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/sici -->
@@ -4362,7 +4362,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:comment xml:lang="en">Serial Item and Contribution Identifier</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/upc -->
@@ -4375,7 +4375,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:comment xml:lang="en">Universal Product Code</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/uri -->
@@ -4385,7 +4385,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition from: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html</obo:IAO_0000112>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/volume -->
@@ -4395,7 +4395,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/locator"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/spar/c4o/hasGlobalCountDate -->
@@ -4406,7 +4406,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:domain rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/spar/c4o/hasGlobalCountValue -->
@@ -4418,7 +4418,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:domain rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#int"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://purl.org/vocab/vann/preferredNamespaceUri -->
@@ -4426,7 +4426,7 @@ modern society using the world of Star trek. Los Angeles Times, March
     <owl:DatatypeProperty rdf:about="http://purl.org/vocab/vann/preferredNamespaceUri">
         <rdfs:label xml:lang="en">preferred namespace URI</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#abbreviation -->
@@ -4437,7 +4437,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A short form for an longer title or name.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">B.A.</obo:IAO_0000112>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#cclCode -->
@@ -4446,7 +4446,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:label xml:lang="en">published US Classification Class/subclass (CCL) code</rdfs:label>
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Patent"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#contactInformation -->
@@ -4454,7 +4454,7 @@ modern society using the world of Star trek. Los Angeles Times, March
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#contactInformation">
         <rdfs:label xml:lang="en">contact information</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#courseCredits -->
@@ -4463,7 +4463,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
         <rdfs:label xml:lang="en">credits</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#dateTime -->
@@ -4473,7 +4473,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#departmentOrSchool -->
@@ -4483,7 +4483,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Not intended to be an institution name.</vitro:descriptionAnnot>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#EducationalProcess"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#description -->
@@ -4491,7 +4491,7 @@ modern society using the world of Star trek. Los Angeles Times, March
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#description">
         <rdfs:label xml:lang="en">description</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#eRACommonsId -->
@@ -4501,7 +4501,7 @@ modern society using the world of Star trek. Los Angeles Times, March
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#identifier"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#entryTerm -->
@@ -4509,7 +4509,7 @@ modern society using the world of Star trek. Los Angeles Times, March
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#entryTerm">
         <rdfs:label xml:lang="en">entry term</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#freetextKeyword -->
@@ -4521,7 +4521,7 @@ modern society using the world of Star trek. Los Angeles Times, March
 use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">one keyword or phrase per freetextKeyword assertion</obo:IAO_0000112>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#grantDirectCosts -->
@@ -4538,7 +4538,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasMonetaryAmount -->
@@ -4546,7 +4546,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#hasMonetaryAmount">
         <rdfs:label xml:lang="en">has monetary amount</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hasValue -->
@@ -4554,7 +4554,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#hasValue">
         <rdfs:label xml:lang="en">has value</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hideFromDisplay -->
@@ -4564,7 +4564,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdfs:label xml:lang="en">hide from display</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#hrJobTitle -->
@@ -4575,7 +4575,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <vitro:exampleAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">administrative secretary</vitro:exampleAnnot>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Position"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#iclCode -->
@@ -4586,7 +4586,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
 </obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Patent"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#identifier -->
@@ -4594,7 +4594,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#identifier">
         <rdfs:label xml:lang="en">identifier</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#isCorrespondingAuthor -->
@@ -4606,7 +4606,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Authorship"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#licenseNumber -->
@@ -4615,7 +4615,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdfs:label xml:lang="en">license number</rdfs:label>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Licensure"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#localAwardId -->
@@ -4633,7 +4633,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#majorField -->
@@ -4643,7 +4643,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Information Science; Computer Science; Anthropology</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#EducationalProcess"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#middleName -->
@@ -4651,7 +4651,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#middleName">
         <rdfs:label xml:lang="en">middle name or initial</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#nihmsid -->
@@ -4661,7 +4661,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Article"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#outreachOverview -->
@@ -4673,7 +4673,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Used for a single narrative summary of outreach, typically covering a wide range of activities and time periods; use Outreach Provider Role for information on individual activities</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#overview -->
@@ -4685,7 +4685,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <obo:IAO_0000115 xml:lang="en">Short text for presentation describing the agent's purpose, activities, and/or accomplishments.</obo:IAO_0000115>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#patentNumber -->
@@ -4697,7 +4697,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Patent"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#placeOfPublication -->
@@ -4706,7 +4706,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
         <rdfs:label xml:lang="en">place of publication</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#pmcid -->
@@ -4717,7 +4717,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Article"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#preferredDisplayOrder -->
@@ -4725,7 +4725,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#preferredDisplayOrder">
         <rdfs:label xml:lang="en">preferred display order</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#rank -->
@@ -4735,7 +4735,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">this number indicates a position in a list</obo:IAO_0000112>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#int"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#reportId -->
@@ -4746,7 +4746,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Report"/>
         <rdfs:subPropertyOf rdf:resource="http://purl.org/ontology/bibo/identifier"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#researchOverview -->
@@ -4757,7 +4757,7 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#researcherId -->
@@ -4769,7 +4769,7 @@ Definition source: http://isiwebofknowledge.com/researcherid/</obo:IAO_0000112>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#identifier"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#scopusId -->
@@ -4780,7 +4780,7 @@ Definition source: http://isiwebofknowledge.com/researcherid/</obo:IAO_0000112>
         <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#identifier"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#seatingCapacity -->
@@ -4793,7 +4793,7 @@ Definition source: http://isiwebofknowledge.com/researcherid/</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Room"/>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#int"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#sponsorAwardId -->
@@ -4816,7 +4816,7 @@ See also core:localAwardId.
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#supplementalInformation -->
@@ -4824,7 +4824,7 @@ See also core:localAwardId.
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#supplementalInformation">
         <rdfs:label xml:lang="en">supplemental information</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#teachingOverview -->
@@ -4835,7 +4835,7 @@ See also core:localAwardId.
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the &quot;teaches&quot; property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person&apos;s role in non-credit teaching or their specific contribution to individual courses</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#termLabel -->
@@ -4843,7 +4843,7 @@ See also core:localAwardId.
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#termLabel">
         <rdfs:label xml:lang="en">term label</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#termType -->
@@ -4851,7 +4851,7 @@ See also core:localAwardId.
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#termType">
         <rdfs:label xml:lang="en">term type</rdfs:label>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#totalAwardAmount -->
@@ -4868,7 +4868,7 @@ See also core:localAwardId.
             </owl:Class>
         </rdfs:domain>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#irbNumber -->
@@ -4877,7 +4877,7 @@ See also core:localAwardId.
         <rdfs:label xml:lang="en">Institutional Review Board (IRB) number</rdfs:label>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. </obo:IAO_0000115>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#nctId -->
@@ -4887,7 +4887,7 @@ See also core:localAwardId.
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">ClinicalTrials.gov is an ICMJE-acceptable public registry, offering up-to-date information for locating clinical trials for a wide range of diseases and conditions. The U.S. National Institutes of Health (NIH), through its National Library of Medicine (NLM), developed this site in collaboration with the Food and Drug Administration (FDA), as a result of the FDA Modernization Act, which was passed into law in November 1997.   This property should be publically visible since it is one of the principal identifiers in a national registry of clinical trials </obo:IAO_0000115>
         <vitro:exampleAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">NCT00000419</vitro:exampleAnnot>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#studyPopulationCount -->
@@ -4896,7 +4896,7 @@ See also core:localAwardId.
         <rdfs:label xml:lang="en">study population count</rdfs:label>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">number of human participants in the study (trial).</obo:IAO_0000115>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#additionalName -->
@@ -4906,7 +4906,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Name"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#anniversary -->
@@ -4917,7 +4917,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Individual"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#birthdate -->
@@ -4928,7 +4928,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Individual"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#calendarBusy -->
@@ -4938,7 +4938,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#CalendarBusy"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#calendarLink -->
@@ -4948,7 +4948,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#CalendarLink"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#calendarRequest -->
@@ -4958,7 +4958,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#CalendarRequest"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#category -->
@@ -4968,7 +4968,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Category"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#country -->
@@ -4978,7 +4978,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Address"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#email -->
@@ -4988,7 +4988,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Email"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#familyName -->
@@ -4999,7 +4999,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Name"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#formattedName -->
@@ -5009,7 +5009,7 @@ See also core:localAwardId.
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#FormattedName"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#gender -->
@@ -5021,7 +5021,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Individual"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#geo -->
@@ -5032,7 +5032,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Geo"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#givenName -->
@@ -5043,7 +5043,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Name"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#honorificPrefix -->
@@ -5054,7 +5054,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Name"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#honorificSuffix -->
@@ -5064,7 +5064,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Name"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#instantMessage -->
@@ -5074,7 +5074,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#InstantMessage"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#key -->
@@ -5084,7 +5084,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Key"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#language -->
@@ -5094,7 +5094,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use 2 char language code from RFC5646</rdfs:comment>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#locality -->
@@ -5104,7 +5104,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Address"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#logo -->
@@ -5114,7 +5114,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Logo"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#nickName -->
@@ -5124,7 +5124,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Nickname"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#note -->
@@ -5134,7 +5134,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Note"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#organizationName -->
@@ -5144,7 +5144,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#OrganizationName"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#organizationalUnitName -->
@@ -5154,7 +5154,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#OrganizationUnitName"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#photo -->
@@ -5164,7 +5164,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Photo"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#postalCode -->
@@ -5174,7 +5174,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Address"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#productId -->
@@ -5183,7 +5183,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">product ID</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#region -->
@@ -5193,7 +5193,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Address"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#related -->
@@ -5203,7 +5203,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Related"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#revision -->
@@ -5212,7 +5212,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">revision</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#role -->
@@ -5222,7 +5222,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Role"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#sortAs -->
@@ -5231,7 +5231,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">sort as</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#sound -->
@@ -5241,7 +5241,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Sound"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#source -->
@@ -5250,7 +5250,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">source</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#streetAddress -->
@@ -5260,7 +5260,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Address"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#telephone -->
@@ -5269,7 +5269,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Telephone</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#timeZone -->
@@ -5279,7 +5279,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#TimeZone"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#title -->
@@ -5289,7 +5289,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
         <rdfs:domain rdf:resource="http://www.w3.org/2006/vcard/ns#Title"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#uid -->
@@ -5299,7 +5299,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify a value that represents a globally unique identifier corresponding to the entity associated with the vCard</rdfs:comment>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
     </owl:DatatypeProperty>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#url -->
@@ -5308,10 +5308,10 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">URL</rdfs:label>
         <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
     </owl:DatatypeProperty>
-    
 
 
-    <!-- 
+
+    <!--
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Classes
@@ -5319,7 +5319,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#area -->
@@ -5520,7 +5520,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
             </owl:Restriction>
         </rdfs:subClassOf>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#disputed -->
@@ -5529,7 +5529,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Disputed</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#territory"/>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#economic_region -->
@@ -5538,7 +5538,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Economic Region</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#group"/>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#geographical_region -->
@@ -5549,7 +5549,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#GeographicRegion"/>
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">United Nations statistics department http://unstats.un.org/unsd/methods/m49/m49regin.htm</terms:source>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#group -->
@@ -5558,7 +5558,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Group</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#non_self_governing -->
@@ -5586,7 +5586,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         </rdfs:subClassOf>
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">UN Cartographic Section, Department of Field Support http://www.un.org/Depts/Cartographic/map/profile/world00.pdf</terms:source>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#organization -->
@@ -5595,7 +5595,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Organization</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#group"/>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#other -->
@@ -5604,7 +5604,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Other</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#territory"/>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#self_governing -->
@@ -5616,7 +5616,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#GeopoliticalEntity"/>
         <terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">United Nations Map Library http://www.un.org/depts/dhl/maplib/countinfo.htm</terms:source>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#special_group -->
@@ -5625,7 +5625,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Special Group</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#group"/>
     </owl:Class>
-    
+
 
 
     <!-- http://aims.fao.org/aos/geopolitical.owl#territory -->
@@ -5887,13 +5887,13 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
             </owl:Restriction>
         </rdfs:subClassOf>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_0000008 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/ARG_0000008"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000008 -->
@@ -5902,7 +5902,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Topic Weight Measurement</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000032"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000009 -->
@@ -5911,7 +5911,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Expertise Measurement</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/ARG_2000008"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000010 -->
@@ -5920,7 +5920,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Topic Weight Measurement Process</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/OBI_0000011"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000011 -->
@@ -5929,7 +5929,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Expertise Measurement Process</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/ARG_2000010"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000021 -->
@@ -5938,7 +5938,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Experience</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000019"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000022 -->
@@ -5947,7 +5947,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">specialty</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000019"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000376 -->
@@ -5956,7 +5956,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Contact Qualifier</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000377 -->
@@ -5965,7 +5965,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">FOAF Profile</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/ARG_2000379"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ARG_2000379 -->
@@ -5974,7 +5974,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Contact</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000001 -->
@@ -5982,7 +5982,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000001">
         <rdfs:label xml:lang="en">Entity</rdfs:label>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000002 -->
@@ -5991,7 +5991,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Continuant</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000001"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000003 -->
@@ -6000,7 +6000,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Occurrent</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000001"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000004 -->
@@ -6009,7 +6009,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Independent Continuant</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000002"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000006 -->
@@ -6018,7 +6018,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Spatial Region</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000141"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000008 -->
@@ -6027,7 +6027,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Temporal Region</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000003"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000015 -->
@@ -6036,7 +6036,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Process</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000003"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000016 -->
@@ -6045,7 +6045,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Disposition</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000017"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000017 -->
@@ -6067,7 +6067,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000112 xml:lang="en">the role of this boundary to delineate where Utah and Colorado meet</obo:IAO_0000112>
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/bfo.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000019 -->
@@ -6076,7 +6076,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Quality</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000020"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000020 -->
@@ -6085,7 +6085,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Specifically Dependent Continuant</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000002"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000023 -->
@@ -6115,7 +6115,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Only use if no specific subclasses of core:Role describe the role.</obo:IAO_0000112>
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Only use this broad role class if no subclasses of role describe the item being classified.</vitro:descriptionAnnot>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000029 -->
@@ -6124,7 +6124,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Site</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000141"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000031 -->
@@ -6133,7 +6133,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Generically Dependent Continuant</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000002"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000034 -->
@@ -6142,7 +6142,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Function</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000016"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000038 -->
@@ -6151,7 +6151,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">One-Dimensional Temporal Region</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000008"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000040 -->
@@ -6160,7 +6160,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Material Entity</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000004"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000141 -->
@@ -6169,7 +6169,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Immaterial Entity</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000004"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000148 -->
@@ -6178,7 +6178,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:label xml:lang="en">Zero-Dimensional Temporal Region</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000008"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000004 -->
@@ -6206,7 +6206,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">instrument</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000005 -->
@@ -6222,7 +6222,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">service</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000006 -->
@@ -6257,7 +6257,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">reagent</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000007 -->
@@ -6272,7 +6272,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://en.wikipedia.org/wiki/Technique</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000012 -->
@@ -6288,7 +6288,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Nicole Vasilevsky</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000014 -->
@@ -6310,7 +6310,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000117>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000015 -->
@@ -6326,7 +6326,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">human study</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000016 -->
@@ -6351,7 +6351,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://en.wikipedia.org/wiki/Clinical_trial</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000020 -->
@@ -6374,7 +6374,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://en.wikipedia.org/wiki/Specimen</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000071 -->
@@ -6390,7 +6390,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">software</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000224 -->
@@ -6404,7 +6404,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The NIH is a funding agency.</obo:IAO_0000112>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000225 -->
@@ -6418,7 +6418,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Nicole Vasilevsky</obo:IAO_0000117>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000391 -->
@@ -6433,7 +6433,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Matthew Brush</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000392 -->
@@ -6448,7 +6448,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">coordinate with NIF. NIF ID:nlx_res_20090419</rdfs:comment>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000393 -->
@@ -6463,7 +6463,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Training a researcher to use a microscope.</obo:IAO_0000112>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000394 -->
@@ -6478,7 +6478,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://neurolex.org/wiki/Category:Production_service_resource</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000395 -->
@@ -6493,7 +6493,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://neurolex.org/wiki/Category:Analysis_service_resource</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000396 -->
@@ -6508,7 +6508,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://neurolex.org/wiki/Category:Material_service_resource</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000565 -->
@@ -6522,7 +6522,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Technology Transfer Office</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000595 -->
@@ -6562,7 +6562,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">student research opportunity</obo:IAO_0000111>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000776 -->
@@ -6575,7 +6575,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Nicole Vasilevsky</obo:IAO_0000117>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000777 -->
@@ -6588,7 +6588,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://en.wiktionary.org/wiki/citizen</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000778 -->
@@ -6601,7 +6601,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">https://www.google.com/search?q=residency+status&amp;ie=utf-8&amp;oe=utf-8&amp;aq=t&amp;rls=org.mozilla:en-US:official&amp;client=firefox-a#hl=en&amp;client=firefox-a&amp;hs=Bcx&amp;rls=org.mozilla:en-US:official&amp;q=citizen&amp;tbs=dfn:1&amp;tbo=u&amp;sa=X&amp;ei=micXT_DwMIjUiAK15tDUDw&amp;ved=0CCgQkQ4&amp;bav=on.2,or.r_gc.r_pw.,cf.osb&amp;fp=7b67128a22f602af&amp;biw=1609&amp;bih=794</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000779 -->
@@ -6614,7 +6614,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://connection.ebscohost.com/us/immigration-restrictions/overview-legal-and-illegal-immigration</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000780 -->
@@ -6627,7 +6627,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.irs.gov/taxtopics/tc851.html</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000783 -->
@@ -6641,7 +6641,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.thefreedictionary.com/student</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000784 -->
@@ -6655,7 +6655,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.thefreedictionary.com/student</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000785 -->
@@ -6669,7 +6669,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.thefreedictionary.com/student</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000786 -->
@@ -6683,7 +6683,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://www.thefreedictionary.com/student</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000787 -->
@@ -6697,7 +6697,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://dictionary.reference.com/browse/employment</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000788 -->
@@ -6711,7 +6711,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://dictionary.reference.com/browse/faculty</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000789 -->
@@ -6725,7 +6725,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Nicole Vasilevsky</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000790 -->
@@ -6738,7 +6738,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Nicole Vasilevsky</obo:IAO_0000117>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0000914 -->
@@ -6752,7 +6752,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Nicole Vasilevsky</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001245 -->
@@ -6766,7 +6766,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://en.wikipedia.org/wiki/License</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001254 -->
@@ -6780,7 +6780,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Transport of a patient within a hospital.</obo:IAO_0000112>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001255 -->
@@ -6794,7 +6794,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Technical support.</obo:IAO_0000112>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001256 -->
@@ -6808,7 +6808,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Matthew Brush</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001257 -->
@@ -6822,7 +6822,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Storing data on a server.</obo:IAO_0000112>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001258 -->
@@ -6835,7 +6835,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Matthew Brush</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001259 -->
@@ -6849,7 +6849,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Matthew Brush</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001260 -->
@@ -6863,7 +6863,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Matthew Brush</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001261 -->
@@ -6877,7 +6877,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Matthew Brush</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001262 -->
@@ -6893,7 +6893,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000118 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">data transformation service</obo:IAO_0000118>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001263 -->
@@ -6907,7 +6907,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Matthew Brush</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/ERO_0001716 -->
@@ -6921,7 +6921,7 @@ To enable other Gender/Sex codes to be used, this dataproperty has range URI. Th
         <obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://en.wikipedia.org/wiki/Database</obo:IAO_0000119>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000003 -->
@@ -6943,7 +6943,7 @@ of this, different, term.</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000125"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000005 -->
@@ -6964,7 +6964,7 @@ of this, different, term.</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000125"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000007 -->
@@ -6979,7 +6979,7 @@ of this, different, term.</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000009 -->
@@ -6994,7 +6994,7 @@ of this, different, term.</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000013 -->
@@ -7012,7 +7012,7 @@ of this, different, term.</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000027 -->
@@ -7024,10 +7024,10 @@ of this, different, term.</obo:IAO_0000116>
         <obo:IAO_0000116 xml:lang="en">2009-03-16: data item deliberatly ambiguous: we merged data set and datum to be one entity, not knowing how to define singular versus plural. So data item is more general than datum.</obo:IAO_0000116>
         <obo:IAO_0000116 xml:lang="en">2009-03-16: removed datum as alternative term as datum specifically refers to singular form, and is thus not an exact synonym.</obo:IAO_0000116>
         <obo:IAO_0000112 xml:lang="en">Data items include counts of things, analyte concentrations, and statistical summaries.</obo:IAO_0000112>
-        <obo:IAO_0000116 xml:lang="en">JAR: datum     -- well, this will be very tricky to define, but maybe some 
-information-like stuff that might be put into a computer and that is 
-meant, by someone, to denote and/or to be interpreted by some 
-process... I would include lists, tables, sentences... I think I might 
+        <obo:IAO_0000116 xml:lang="en">JAR: datum     -- well, this will be very tricky to define, but maybe some
+information-like stuff that might be put into a computer and that is
+meant, by someone, to denote and/or to be interpreted by some
+process... I would include lists, tables, sentences... I think I might
 defer to Barry, or to Brian Cantwell Smith
 
 JAR: A data item is an approximately justified approximately true approximate belief</obo:IAO_0000116>
@@ -7040,7 +7040,7 @@ JAR: A data item is an approximately justified approximately true approximate be
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000125"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000030 -->
@@ -7108,7 +7108,7 @@ Previous. An information content entity is a non-realizable information entity t
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000125"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000032 -->
@@ -7125,7 +7125,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000115 xml:lang="en">a scalar measurement datum is a measurement datum that is composed of two parts, numerals and a unit label.</obo:IAO_0000115>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000033 -->
@@ -7141,7 +7141,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000123"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000102 -->
@@ -7152,7 +7152,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Person:Alan Ruttenberg</obo:IAO_0000117>
         <obo:IAO_0000115 xml:lang="en">data about an ontology part is a data item about a part of an ontology, for example a term</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000104 -->
@@ -7171,7 +7171,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000109 -->
@@ -7188,7 +7188,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000117 xml:lang="en">person:Chris Stoeckert</obo:IAO_0000117>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000144 -->
@@ -7205,7 +7205,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000300 -->
@@ -7221,7 +7221,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000118 xml:lang="en">text</obo:IAO_0000118>
         <obo:IAO_0000111 xml:lang="en">textual entity</obo:IAO_0000111>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000011 -->
@@ -7239,7 +7239,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000122"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000017 -->
@@ -7255,25 +7255,25 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000066 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/OBI_0000066"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000086 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/OBI_0000086"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000094 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/OBI_0000094"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000272 -->
@@ -7290,13 +7290,13 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000122"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000571 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/OBI_0000571"/>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0000835 -->
@@ -7323,7 +7323,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person or organization that has a manufacturer role</obo:IAO_0000115>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000124"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0001554 -->
@@ -7332,7 +7332,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <rdfs:label xml:lang="en">Rate Measurement Datum</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000032"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0100026 -->
@@ -7351,7 +7351,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000121"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/OBI_0500000 -->
@@ -7363,7 +7363,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <obo:IAO_0000111 xml:lang="en">study design</obo:IAO_0000111>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.obolibrary.org/obo/UO_0000280 -->
@@ -7372,7 +7372,7 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
         <rdfs:label xml:lang="en">Rate Unit</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000003"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/NET/c4dm/event.owl#Event -->
@@ -7428,13 +7428,13 @@ this case we explicitly refer to the singular form</obo:IAO_0000116>
 
 The previous short definition was: &quot;An arbitrary classification of a space/time region, by a cognitive agent.&quot;</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/research.owl#Interventional_study -->
 
     <owl:Class rdf:about="http://purl.org/net/OCRe/research.owl#Interventional_study"/>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_design.owl#OCRE100038 -->
@@ -7442,17 +7442,17 @@ The previous short definition was: &quot;An arbitrary classification of a space/
     <owl:Class rdf:about="http://purl.org/net/OCRe/study_design.owl#OCRE100038">
         <rdfs:label xml:lang="en">Phase</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000015"/>
-        <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase describes the level of a trial required of drugs before (and after) they are routinely used in clinical practice: 
-- Phase I trials assess toxic effects on humans (not many people participate in them, and usually without controls); 
-- Phase ll trials assess therapeutic benefit (usually involving a few hundred people, usually with controls, but not always); 
-- Phase III trials compare the new treatment against standard (or placebo) treatment (usually a full randomised controlled trial). At this point, a drug can be approved for community use. 
+        <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase describes the level of a trial required of drugs before (and after) they are routinely used in clinical practice:
+- Phase I trials assess toxic effects on humans (not many people participate in them, and usually without controls);
+- Phase ll trials assess therapeutic benefit (usually involving a few hundred people, usually with controls, but not always);
+- Phase III trials compare the new treatment against standard (or placebo) treatment (usually a full randomised controlled trial). At this point, a drug can be approved for community use.
 - Phase IV monitors a new treatment in the community, often to evaluate longterm safety and effectiveness. [Glossary of Terms in The Cochrane Collaboration]
 
 A trial can be of a combination phase (e.g., I/II).
 The concept of phase is not applicable to trials studying certain interventions (e.g., device, procedure, behavioral)</obo:IAO_0000115>
         <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona</obo:IAO_0000117>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_design.owl#Phase_0 -->
@@ -7463,7 +7463,7 @@ The concept of phase is not applicable to trials studying certain interventions
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A Phase 0 trial is an exploratory trial involving very limited human exposure, with no therapeutic or diagnostic intent (e.g., screening study, microdose study). [http://prsinfo.clinicaltrials.gov/definitions.html]</obo:IAO_0000115>
         <statistics:curator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona</statistics:curator>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_design.owl#Phase_1 -->
@@ -7474,7 +7474,7 @@ The concept of phase is not applicable to trials studying certain interventions
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A Phase I trial assesses toxic effects on humans (not many people participate, and usually without controls) [Glossary of Terms in The Cochrane Collaboration]</obo:IAO_0000115>
         <statistics:curator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona</statistics:curator>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_design.owl#Phase_2 -->
@@ -7485,7 +7485,7 @@ The concept of phase is not applicable to trials studying certain interventions
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A Phase ll trial assesses therapeutic benefit (usually involving a few hundred people, usually with controls, but not always) [Glossary of Terms in The Cochrane Collaboration]</obo:IAO_0000115>
         <statistics:curator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona</statistics:curator>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_design.owl#Phase_3 -->
@@ -7497,7 +7497,7 @@ The concept of phase is not applicable to trials studying certain interventions
 randomised controlled trial). At this point, a drug can be approved for community use. [Glossary of Terms in The Cochrane Collaboration]</obo:IAO_0000115>
         <statistics:curator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona</statistics:curator>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_design.owl#Phase_4 -->
@@ -7508,7 +7508,7 @@ randomised controlled trial). At this point, a drug can be approved for communit
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A Phase IV study monitors a new treatment in the community, often to evaluate longterm safety and effectiveness. [Glossary of Terms in The Cochrane Collaboration]</obo:IAO_0000115>
         <statistics:curator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona</statistics:curator>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/net/OCRe/study_design.owl#Single_group_study -->
@@ -7521,7 +7521,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <statistics:curator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona</statistics:curator>
         <study_protocol:develop_comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Simona: to be reviewed</study_protocol:develop_comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/AcademicArticle -->
@@ -7547,7 +7547,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A scholarly academic article, typically published in a journal.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Article -->
@@ -7580,7 +7580,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/AudioDocument -->
@@ -7600,7 +7600,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">An audio document; aka record.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/AudioVisualDocument -->
@@ -7620,7 +7620,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">An audio-visual document; film, video, and so forth.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Bill -->
@@ -7634,7 +7634,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">Draft legislation presented for discussion to a legal body.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Book -->
@@ -7672,7 +7672,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/BookSection -->
@@ -7704,7 +7704,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A section of a book.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Brief -->
@@ -7717,7 +7717,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A written argument submitted to a court.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Chapter -->
@@ -7730,7 +7730,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A chapter of a book.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Code -->
@@ -7745,7 +7745,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A collection of statutes.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/CollectedDocument -->
@@ -7765,7 +7765,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A document that simultaneously contains other documents.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Collection -->
@@ -7786,7 +7786,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A collection of Documents or Collections</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Conference -->
@@ -7807,7 +7807,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A meeting for consultation or discussion.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/CourtReporter -->
@@ -7821,7 +7821,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A collection of legal cases.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Document -->
@@ -7876,7 +7876,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
         <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/iao.owl"/>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/DocumentPart -->
@@ -7902,7 +7902,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">a distinct part of a larger document or collected document.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/DocumentStatus -->
@@ -7916,7 +7916,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">The status of the publication of a document.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/EditedBook -->
@@ -7948,7 +7948,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">An edited book.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Excerpt -->
@@ -7962,7 +7962,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A passage selected from a larger work.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Film -->
@@ -7975,7 +7975,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">aka movie.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Hearing -->
@@ -7989,7 +7989,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">An instance or a session in which testimony and arguments are presented, esp. before an official, as a judge in a lawsuit.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Image -->
@@ -8005,7 +8005,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A document that presents visual or diagrammatic information.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Interview -->
@@ -8019,7 +8019,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A formalized discussion between two or more people.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Issue -->
@@ -8033,7 +8033,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">something that is printed or published and distributed, esp. a given number of a periodical</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Journal -->
@@ -8054,7 +8054,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A periodical of scholarly journal Articles.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/LegalCaseDocument -->
@@ -8067,7 +8067,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A document accompanying a legal case.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/LegalDecision -->
@@ -8080,7 +8080,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A document containing an authoritative determination (as a decree or judgment) made after consideration of facts or law.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/LegalDocument -->
@@ -8093,7 +8093,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A legal document; for example, a court decision, a brief, and so forth.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Legislation -->
@@ -8107,7 +8107,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A legal document proposing or enacting a law or a group of laws.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Letter -->
@@ -8118,7 +8118,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A written or printed communication addressed to a person or organization and usually transmitted by mail</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A written or printed communication addressed to a person or organization and usually transmitted by mail</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Magazine -->
@@ -8133,7 +8133,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A periodical of magazine Articles. A magazine is a publication that is issued periodically, usually bound in a paper cover, and typically contains essays, stories, poems, etc., by many writers, and often photographs and drawings, frequently specializing in a particular subject or area, as hobbies, news, or sports.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Manual -->
@@ -8147,7 +8147,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A small reference book, especially one giving instructions.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Manuscript -->
@@ -8161,7 +8161,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">An unpublished Document, which may also be submitted to a publisher for publication.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Map -->
@@ -8175,7 +8175,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A graphical depiction of geographic features.</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Newspaper -->
@@ -8189,7 +8189,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A periodical of documents, usually issued daily or weekly, containing current news, editorials, feature articles, and usually advertising.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Note -->
@@ -8203,7 +8203,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">Notes or annotations about a resource.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Patent -->
@@ -8229,7 +8229,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A document describing the exclusive right granted by a government to an inventor to manufacture, use, or sell an invention for a certain number of years.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Performance -->
@@ -8242,7 +8242,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A public performance.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Periodical -->
@@ -8272,7 +8272,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A group of related documents issued at regular intervals.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/PersonalCommunicationDocument -->
@@ -8283,7 +8283,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A personal communication manifested in some document.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A personal communication manifested in some document.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Proceedings -->
@@ -8297,7 +8297,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A compilation of documents published from an event, such as a conference.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Quote -->
@@ -8311,7 +8311,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">An excerpted collection of words.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/ReferenceSource -->
@@ -8325,7 +8325,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A document that presents authoritative reference information, such as a dictionary or encylopedia .</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Report -->
@@ -8351,7 +8351,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc..</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Series -->
@@ -8377,7 +8377,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A loose, thematic, collection of Documents, often Books.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Slide -->
@@ -8391,7 +8391,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A slide in a slideshow</rdfs:comment>
         <ns:term_status>unstable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Slideshow -->
@@ -8405,7 +8405,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A presentation of a series of slides, usually presented in front of an audience with written text and images.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Standard -->
@@ -8419,7 +8419,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">A document describing a standard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Statute -->
@@ -8433,7 +8433,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A bill enacted into law.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Thesis -->
@@ -8459,7 +8459,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A document created to summarize research findings associated with the completion of an academic degree.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/ThesisDegree -->
@@ -8474,7 +8474,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>stable</ns:term_status>
         <rdfs:comment xml:lang="en">The academic degree of a Thesis</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Webpage -->
@@ -8487,7 +8487,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Website -->
@@ -8507,7 +8507,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <ns:term_status>unstable</ns:term_status>
         <rdfs:comment xml:lang="en">A group of Webpages accessible on the Web.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/ontology/bibo/Workshop -->
@@ -8520,7 +8520,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:comment xml:lang="en">A seminar, discussion group, or the like, that emphasizes zxchange of ideas and the demonstration and application of techniques, skills, etc.</rdfs:comment>
         <ns:term_status>stable</ns:term_status>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/spar/c4o/BibliographicInformationSource -->
@@ -8531,7 +8531,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A source of information about bibliographic citations, such as Google Scholar, Web of Science or Scopus.</obo:IAO_0000115>
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A source of information about bibliographic citations, such as Google Scholar, Web of Science or Scopus.</vitro:descriptionAnnot>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/spar/c4o/GlobalCitationCount -->
@@ -8542,7 +8542,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The number of times a work has been cited globally, as determined from a particular bibliographic information source on a particular date.</vitro:descriptionAnnot>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The number of times a work has been cited globally, as determined from a particular bibliographic information source on a particular date.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/spar/fabio/ClinicalGuideline -->
@@ -8552,7 +8552,7 @@ A study in which an individual acts has his/her own comparison does not fall int
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A recommendation on the appropriate treatment and care of people with a specific disease or condition, based on the best available evidence, designed to help healthcare professionals in their work.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/spar/fabio/Comment -->
@@ -8565,7 +8565,7 @@ A study in which an individual acts has his/her own comparison does not fall int
 
 has super-classes</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://purl.org/spar/fabio/Erratum -->
@@ -8575,7 +8575,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A formal correction to an error introduced by the publisher into a previously published document.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Abstract -->
@@ -8585,7 +8585,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An abstract that is published as a standalone document or in a journal of abstracts</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AcademicDegree -->
@@ -8610,7 +8610,7 @@ has super-classes</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">B.A. Bachelor of Arts</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This list may have multiple abbreviations for some degrees.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AcademicDepartment -->
@@ -8621,7 +8621,7 @@ has super-classes</obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A distinct, usually specialized educational unit within an educational organization.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts)</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AcademicTerm -->
@@ -8631,7 +8631,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#DateTimeInterval"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An explicit individual academic term, quarter, or semester rather than the generic fall, spring or summer semester.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AcademicYear -->
@@ -8641,7 +8641,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#DateTimeInterval"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An explicit individual period considered by an academic institution to be its primary academic cycle.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AdministratorRole -->
@@ -8650,7 +8650,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:label xml:lang="en">Administrator Role</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AdviseeRole -->
@@ -8659,7 +8659,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:label xml:lang="en">Advisee Role</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AdvisingProcess -->
@@ -8668,7 +8668,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:label xml:lang="en">Advising Process</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000015"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AdvisingRelationship -->
@@ -8708,7 +8708,7 @@ has super-classes</obo:IAO_0000115>
         </rdfs:subClassOf>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A dual relationship of one person being advised or mentored by another person, typically including start and end dates</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AdvisorRole -->
@@ -8717,7 +8717,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:label xml:lang="en">Advisor Role</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Association -->
@@ -8729,7 +8729,7 @@ has super-classes</obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A group of persons or organizations organized for a common purpose.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Special Libraries Association; Association for Computing Machinery(ACM); American Medical Informatics Association(AMIA)</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AttendeeRole -->
@@ -8739,7 +8739,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role of attending an Event or EventSeries</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AttendingProcess -->
@@ -8748,7 +8748,7 @@ has super-classes</obo:IAO_0000115>
         <rdfs:label xml:lang="en">Attending Process</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000015"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Authorship -->
@@ -8780,7 +8780,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Currently any abstract name is given to members of this class. This could change in the future.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Award -->
@@ -8792,7 +8792,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An Award or Honor</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Wiley Prize in Biomedical Sciences</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AwardReceipt -->
@@ -8839,7 +8839,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The award bestowed may be represented with the Award class.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The bestowal of an award, honor, or distinction to a person or person&apos;s at a particular time.  </obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#AwardedDegree -->
@@ -8861,7 +8861,7 @@ This class allows for linking an author to a publication while indicating inform
         </rdfs:subClassOf>
         <obo:IAO_0000115>The awarding of a degree by an agent to another agent. It is mostly for academic degrees.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Blog -->
@@ -8873,7 +8873,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Library of Congress Blog</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#BlogPosting -->
@@ -8890,7 +8890,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A specific blog posting</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An online article or commentary appearing on a blog</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Building -->
@@ -8914,7 +8914,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Enter building name. If the building&apos;s name is a number (as in many governmental organizations such as national laboratories and military bases), then enter it. Do not confuse with the number that appears in a postal address.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Martha Van Rensselaer Hall (VR); Caldwell Hall (CD); University Auditorium</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Campus -->
@@ -8926,7 +8926,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition taken from dictionary.com (http://dictionary.reference.com/browse/campus).</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#CaseStudy -->
@@ -8937,7 +8937,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A form of qualitative descriptive research that is used to study individuals, a small group of participants, or a group as a whole. Medical usage (from MeSH): clinical presentations that may be followed by evaluative studies that eventually lead to a diagnosis. </obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A qualitative descriptive research study of individuals or a group</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Catalog -->
@@ -8961,7 +8961,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">NLM Catalog</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short Definition is the Medical Subject Heading (MeSH) definition </obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Center -->
@@ -8974,7 +8974,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organization where a specified activity is concentrated.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short Definition take from http://www.thefreedictionary.com/center.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Certificate -->
@@ -8985,7 +8985,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A document confirming certain characteristics of a person or organization, usually provided by some form of external review, education, or assessment.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A document confirming certain characteristics of a person or organization, usually provided by some form of external review, education, or assessment.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Certification -->
@@ -8996,7 +8996,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An issued certificate</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">see also core:Certificate</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ClinicalOrganization -->
@@ -9008,7 +9008,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Any organization with a significant clinical function as a matter of course and not just through occasional clinical roles</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations &quot;are&quot; clinical and some &quot;are&quot; research organizations and that the distinction is important enough to warrant the additional class and class assertions</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ClinicalRole -->
@@ -9018,7 +9018,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role of observing or treating patients</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#CoPrincipalInvestigatorRole -->
@@ -9028,7 +9028,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#InvestigatorRole"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Role of co-principal investigator of an Agreement (for example, a grant), who devotes a specified percentage of time and is considered key personnel.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#College -->
@@ -9040,7 +9040,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A primary academic unit within a University or a free-standing higher education organization without graduate degree programs.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">College of Arts &amp; Sciences; Ivy Tech Community College</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Committee -->
@@ -9053,7 +9053,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Curriculum Steering Committee; PhD Advisory Committee</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Company -->
@@ -9065,7 +9065,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A legally-recognized business organization.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">from Wikipedia: &quot;A company is a form of business organization. It is an association or collection of individual real persons and/or other companies ... This collection, group or association of persons can be made to exist in law and then a company is itself considered a &quot;legal person&quot;. The name company arose because, at least originally, it represented or was owned by more than one real or legal person.&quot;</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Competition -->
@@ -9077,7 +9077,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Intel Talent Search; poetry contest</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Not the same as an award or distinction.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ConferencePaper -->
@@ -9093,7 +9093,7 @@ This class allows for linking an author to a publication while indicating inform
         </rdfs:subClassOf>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ConferencePoster -->
@@ -9103,7 +9103,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ConferenceSeries -->
@@ -9114,7 +9114,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organized series of a meeting for consultation or discussion.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">For individual, separate conferences, use conference instead.  core:ConferenceSeries and core:SeminarSeries are very similar.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Consortium -->
@@ -9125,7 +9125,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A group  of independent organizations working together toward a common goal, under an expressed agreement.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Continent -->
@@ -9137,7 +9137,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short Definition take from http://en.wiktionary.org/wiki/continent.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The seven commonly recognized continents are Africa; Antarctica; Asia; Australia; Europe; North America; South America</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Contract -->
@@ -9183,7 +9183,7 @@ This class allows for linking an author to a publication while indicating inform
         </rdfs:subClassOf>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An agreement involving specific deliverables and payment</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#CoreLaboratory -->
@@ -9193,7 +9193,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#ServiceProvidingLaboratory"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A lab providing services such as training, protocols, or access to instruments or software</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Country -->
@@ -9205,7 +9205,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An area of land distinguished by its political autonomy. Politically independent territories.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Source of the Short Definition: http://www.thefreedictionary.com/country.  This is also the same as geopolitical.owl:self_governing.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#County -->
@@ -9217,7 +9217,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short Definition modified from the one found here: http://www.thefreedictionary.com/county.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The largest administrative division of most states or provinces.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Course -->
@@ -9234,7 +9234,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A course as taught in one time period (such as a semester; although note that a course could consist of only one meeting (teaching session)) by one or more instructors, normally but not always for credit. Does not represent either each meeting of the course or the course offering such as Biology 101 taught every semester from 1980 to 2010</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A course as taught in one time period by one or more instructors, normally but not always for credit. Does not represent either each meeting of the course or the course offering such as Biology 101 taught every semester from 1980 to 2010</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Credential -->
@@ -9263,7 +9263,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An attestation of qualification, competence, or authority issued to an individual by a third party with a relevant or  de facto authority or assumed competence to do so.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An attestation of qualification, competence, or authority issued to an individual by a third party with a relevant or  de facto authority or assumed competence to do so.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Database -->
@@ -9281,7 +9281,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PubMed</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short Definition is the Medical Subject Heading (MeSH) definition</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Dataset -->
@@ -9298,7 +9298,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A named collection of data, usually containing only one type of data</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">US Patent Data; US Job Data</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#DateTimeInterval -->
@@ -9308,7 +9308,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000038"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">a specific period or duration, defined by (optional) start and end date/times.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#DateTimeValue -->
@@ -9318,7 +9318,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000148"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A date and/or time</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#DateTimeValuePrecision -->
@@ -9328,7 +9328,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Indicates the precision of the value of a DateTimeValue instance.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Department -->
@@ -9340,7 +9340,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Legal (department within a company); Use for any non-academic department</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Division -->
@@ -9352,7 +9352,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Cardiovascular Medicine (division within medicine)</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition modified from http://www.thefreedictionary.com/division.  It is difficult to tell the difference between a division and a department.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#EditorRole -->
@@ -9363,7 +9363,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An ongoing editorial responsibility for a bibo:Collection, such as a Journal or Series</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An ongoing editorial responsibility for a bibo:Collection, such as a Journal or Series</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#EditorialArticle -->
@@ -9373,7 +9373,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Article"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An article of opinion, typically published in a newspaper. For academics, most commonly Op Ed pieces</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Editorship -->
@@ -9395,7 +9395,7 @@ This class allows for linking an author to a publication while indicating inform
         </rdfs:subClassOf>
         <obo:IAO_0000115>A relationship that represents the recognition of an agent as an editor.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#EducationalProcess -->
@@ -9419,7 +9419,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Represents educational training that has been received.</obo:IAO_0000115>
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree.</vitro:descriptionAnnot>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#EmeritusFaculty -->
@@ -9429,7 +9429,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A retired faculty member who has retained their rank, title and privileges.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#EmeritusLibrarian -->
@@ -9439,7 +9439,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A retired librarian who has retained their rank, title and privileges.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#EmeritusProfessor -->
@@ -9450,7 +9450,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A retired professor who has retained their rank, title and privileges.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Equipment -->
@@ -9468,7 +9468,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A physical object provided for specific purpose, task or occupation. </obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">server; Bruker Vector-33 FT-IR</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#EventSeries -->
@@ -9504,7 +9504,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Only use if no specific subclasses of core:EventSeries desribe the activity.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Two or more events that occur at different times and are connected to each other.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Exhibit -->
@@ -9514,7 +9514,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.org/NET/c4dm/event.owl#Event"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The showing of an object or a collection of objects, in an organized manner.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ExtensionUnit -->
@@ -9526,7 +9526,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A unit devoted primarily to extension activities, whether for outreach or research.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Alachua County Extension Office</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#F1000Link -->
@@ -9536,7 +9536,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#URL"/>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">F1000 is a place where faculty go to critique papers published in PubMed. Any given record in F1000 might have anywhere from one to dozens of reviews.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Facility -->
@@ -9560,7 +9560,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use subclasses of core:Facility subclasses instead of this class if possible</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#FacultyAdministrativePosition -->
@@ -9572,7 +9572,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Associate Dean</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">That is a position held by an academic faculty member who works for administration.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#FacultyMember -->
@@ -9583,7 +9583,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person with at least one academic appointment to a specific faculty of a university or institution of higher learning.</obo:IAO_0000115>
         <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition from here: http://research.carleton.ca/htr/defs.php.</vitro:descriptionAnnot>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#FacultyMentoringRelationship -->
@@ -9593,7 +9593,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#AdvisingRelationship"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An advisory relationship in which one faculty member mentors another faculty member.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#FacultyPosition -->
@@ -9605,7 +9605,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Professor, associate professor and assistant professor are common positions for academic faculty.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Professor; Associate Professor; Assistant Professor</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Foundation -->
@@ -9617,7 +9617,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition take from: http://dictionary.reference.com/browse/foundation.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The Ford Foundation</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#FundingOrganization -->
@@ -9635,7 +9635,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organization that provides financial support to individuals or organizations to carry out specified activities.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">National Institute of Health (NIH)</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#GeographicLocation -->
@@ -9659,7 +9659,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Removed the word &quot;stable&quot; because disputed territories from geopolitical.owl are included. This could imply that the geographic coordinates could change. I&apos;ve also copied this definition to core:Geographic Location.  I think core:Geographic Location and core:Geographic Region are both the same and only one is needed. There is also geopolitical.owl:geographical_region which further causes confusion.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use subclasses of core:Geographic Location subclasses instead of this class if possible.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#GeographicRegion -->
@@ -9671,7 +9671,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Removed the word &quot;stable&quot; because disputed territories from geopolitical.owl are included. This could imply that the geographic coordinates could change. This definition was originally in core:Geographic Location.  I simply copied the definition from there.  I think core:Geographic Location and core:Geographic Region are both the same and only one is needed. There is also geopolitical.owl:geographical_region which further causes confusion.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use subclasses of core:Geographic Region subclasses instead of this class if possible.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#GeopoliticalEntity -->
@@ -9683,7 +9683,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#GovernmentAgency -->
@@ -9695,7 +9695,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition take from: http://en.wikipedia.org/wiki/Government_agency.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">United States Library of Congress</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#GraduateAdvisingRelationship -->
@@ -9705,7 +9705,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#AdvisingRelationship"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An advisory relationship in which a professor advises a graduate student.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#GraduateStudent -->
@@ -9715,7 +9715,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#Student"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person who has already received a bachelor&apos;s degree and is working toward a Master&apos;s or Doctoral degree.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Grant -->
@@ -9763,7 +9763,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short definition is from the Glossary of NIH Terms.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Hospital -->
@@ -9775,7 +9775,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition take from: http://dictionary.reference.com/browse/hospital.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Shands at the University of Florida</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Institute -->
@@ -9787,7 +9787,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organization founded to pursue or promote certain research, educational or public policy interests or activities.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Institute for Fundamental Theory</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Internship -->
@@ -9797,7 +9797,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#EducationalProcess"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Typically a student or a recent graduate undergoing supervised practical training.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#InvestigatorRole -->
@@ -9807,7 +9807,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#ResearcherRole"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role in an Agreement (for example, a grant) as a named investigator or key personnel.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#InvitedTalk -->
@@ -9816,7 +9816,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:label xml:lang="en">Invited Talk</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#Presentation"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#IssuedCredential -->
@@ -9867,7 +9867,7 @@ This class allows for linking an author to a publication while indicating inform
             </owl:Restriction>
         </rdfs:subClassOf>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Laboratory -->
@@ -9878,7 +9878,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organization unit that facilitates or conduits observation, testing, experimentation, or research in a field of study or practice.</obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#LeaderRole -->
@@ -9889,7 +9889,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A broad-ranging leader concept, from leading a small temporary committee to head of a large international organization.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A leadership role</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Librarian -->
@@ -9899,7 +9899,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person working in a position of librarian or information professional, or academic or technical expert in support of providing information services or materials.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#LibrarianPosition -->
@@ -9911,7 +9911,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">It is the common position in libraries.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Librarian; Library Systems Analyst; Music Bibliographer</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Library -->
@@ -9923,7 +9923,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Marston Science Library</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Used information from this definition: http://dictionary.reference.com/browse/library.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#License -->
@@ -9934,7 +9934,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Licenses are usually issued in order to regulate some activity that is deemed to be dangerous or a threat to the person or the public or which involves a high level of specialized skill.  See also core:Licensure.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Official or legal permission to do something</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Licensure -->
@@ -9945,7 +9945,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A granted license, which gives a &apos;permission to practice.&apos;</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A granted license, which gives a &apos;permission to practice.&apos; Such licenses are usually issued in order to regulate some activity that is deemed to be dangerous or a threat to the person or the public or which involves a high level of specialized skill.  See also core:License.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Location -->
@@ -9957,7 +9957,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Top level of all location classes.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use subclasses of core:Location when classsifying items.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#MedicalResidency -->
@@ -9967,7 +9967,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#EducationalProcess"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Residency is a stage of graduate medical training. </obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Meeting -->
@@ -9977,7 +9977,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.org/NET/c4dm/event.owl#Event"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A gathering of people for a defined purpose, not necessarily public or announced</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#MemberRole -->
@@ -9987,7 +9987,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role of being a member in a Process or an Organization</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Museum -->
@@ -9999,7 +9999,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition was take from here:  http://dictionary.reference.com/browse/museum</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The Getty Museum</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#NewsRelease -->
@@ -10009,7 +10009,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Newsletter -->
@@ -10020,7 +10020,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The Ornithological Newsletter</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Usually issued periodically, prepared by or for a group or institution to present information to a specific audience, often also made available to the press and public</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#NonAcademic -->
@@ -10030,7 +10030,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person holding a position that is not considered to be an academic appointment.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#NonAcademicPosition -->
@@ -10042,7 +10042,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Accounting &amp; Research Services Assistant; Director of Information Technology</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Staff, support, and other non-academic positions.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#NonFacultyAcademic -->
@@ -10052,7 +10052,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person not considered a faculty member but holding an academic appointment.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#NonFacultyAcademicPosition -->
@@ -10064,7 +10064,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Researcher; Academic Extension Associate; Postdoctoral Associate</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Those positions are held by people who do academic work but do not have faculty positions in universities or institutes.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#OrganizerRole -->
@@ -10074,7 +10074,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role of organizing</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#OrganizingProcess -->
@@ -10083,7 +10083,7 @@ This class allows for linking an author to a publication while indicating inform
         <rdfs:label xml:lang="en">Organizing Process</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000015"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#OutreachProviderRole -->
@@ -10095,7 +10095,7 @@ This class allows for linking an author to a publication while indicating inform
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Communicating Astronomy to the Public</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The example is one outreach role required by US space agency NASA, which is related with one project in NASA. Name of the outreach role should be put here.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PeerReviewerRole -->
@@ -10108,7 +10108,7 @@ This class allows for linking an author to a publication while indicating inform
 Contents
 [hide]</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PopulatedPlace -->
@@ -10118,7 +10118,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#GeopoliticalEntity"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Either city or town - a thickly populated area having fixed boundaries and certain local powers of government.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Position -->
@@ -10154,7 +10154,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Director of Admissions and Placement; Associate University Librarian</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Postdoc -->
@@ -10164,7 +10164,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#NonFacultyAcademic"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term)</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PostdocOrFellowAdvisingRelationship -->
@@ -10174,7 +10174,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#AdvisingRelationship"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An advisory relationship in which the advisee is a Postdoc or Fellow.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PostdocPosition -->
@@ -10184,7 +10184,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#NonFacultyAcademicPosition"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A postdoctoral training appointment (job)</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PostdoctoralTraining -->
@@ -10194,7 +10194,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#EducationalProcess"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Postdoctoral research is academic or scholarly research conducted by a person who has completed his or her doctoral studies, normally within the following five years. It is intended to further deepen expertise in a specialist subject.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Presentation -->
@@ -10204,7 +10204,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/NET/c4dm/event.owl#Event"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Encompasses talk, speech, lecture, slide lecture, conference presentation</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PresenterRole -->
@@ -10215,7 +10215,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role of presenting information</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Are we assuming that a PresenterRole is in a Presentation?  Or could you have a PresenterRole in, say, a committee?</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PresentingProcess -->
@@ -10224,7 +10224,7 @@ Contents
         <rdfs:label xml:lang="en">Presenting Process</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000015"/>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PrimaryPosition -->
@@ -10235,7 +10235,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A position designated as primary by the organization or group where it is held. This designation may be applied to zero or more of an agent&apos;s positions and may be asserted in conjunction with other subclasses of position.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A position designated as primary by the organization where it is held.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PrincipalInvestigatorRole -->
@@ -10245,7 +10245,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#InvestigatorRole"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Role of a person to direct a project or activity being supported by an Agreement (for example, a grant), and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#PrivateCompany -->
@@ -10257,7 +10257,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company.  Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Publix Super Markets; Ernst &amp; Young; PricewaterhouseCoopers</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Program -->
@@ -10268,7 +10268,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A Cornell graduate field (http://vivo.cornell.edu/index.jsp?home=65535&amp;collection=820)</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An ongoing academic initiative not formalized with department or division status.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Project -->
@@ -10298,7 +10298,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim.
 </obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Publisher -->
@@ -10310,7 +10310,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition found here: http://dictionary.reference.com/browse/publisher</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Elsevier; Harper &amp; Row; Indiana University Press</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Relationship -->
@@ -10321,7 +10321,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">a reified relationship</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">functions as an n-ary predicate</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ResearchOrganization -->
@@ -10331,7 +10331,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ResearchProposal -->
@@ -10341,7 +10341,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A proposal for a research grant that has been submitted but not approved; does not represent an existing activity</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ResearcherRole -->
@@ -10352,7 +10352,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role of conducting funded or unfunded research,  sometimes linked to an Agreement.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Examples of research can be seen at: http://www.ufl.edu/research/products/index.html.  Note these may have been funded, but the research doesn&apos;t have to be funded.  Also, the research may be linked to an Agreement (for example, a Grant), but does not need to be.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Review -->
@@ -10362,7 +10362,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Article"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An article reviewing one or more other information resources (a book, one or more other articles, movies, etc)</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ReviewerRole -->
@@ -10373,7 +10373,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role that encompasses both ongoing reviewer responsibility for a bibo:Collection, such as a Journal or Series, and also a review performed for a bibo:Document, such as a book, academic article or conference paper.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role that encompasses both ongoing reviewer responsibility for a bibo:Collection, such as a Journal or Series, and also a review performed for a bibo:Document, such as a book, academic article or conference paper.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Room -->
@@ -10391,7 +10391,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Enter room number of name.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Room that provides a particular service or is used for a particular activity.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#School -->
@@ -10403,7 +10403,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition take from here: http://dictionary.reference.com/browse/school.</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">School of Architecture; School of Music</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Score -->
@@ -10413,7 +10413,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Written musical composition for voice or instruments or both</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Screenplay -->
@@ -10423,7 +10423,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Written script for a film production, including dialogue and descriptions of gestures, actions, shooting directions</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#SeminarSeries -->
@@ -10435,7 +10435,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Applied Microeconomics Seminars; Future of Rural New York Seminar Series</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">For individual seminars, use seminar instead.  core:ConferenceSeries and core:SeminarSeries are very similar.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#ServiceProvidingLaboratory -->
@@ -10446,7 +10446,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A laboratory that provides services</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Ideally a defined class -- a Laboratory the provides some Service via the property</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Speech -->
@@ -10456,7 +10456,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Text of a speech written in preparation for delivery of the speech.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#StateOrProvince -->
@@ -10468,7 +10468,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">One of a number of areas or communities having their own governments and forming a federation under a sovereign government, as in the US.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Source of the Short Definition: http://www.thefreedictionary.com/state.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Student -->
@@ -10479,7 +10479,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person who is enrolled in an educational institution.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use only if no specific subclasses of core:Student describe the person.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#StudentOrganization -->
@@ -10491,7 +10491,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Dancin&apos; Gators</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition take from here: http://en.wikipedia.org/wiki/Student_society</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#SubnationalRegion -->
@@ -10504,7 +10504,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Short definition was partially taken from http://en.wikipedia.org/wiki/Subnational_entity.</obo:IAO_0000112>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Smaller administrative division into which a country may be divided.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#TeacherRole -->
@@ -10514,7 +10514,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A role of serving as an educator</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Team -->
@@ -10526,7 +10526,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An informal organization brought together for the purposes of a project or event</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">VIVO Outreach Team; VIVO Ontology Team</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Translation -->
@@ -10536,7 +10536,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The result of rendering a work from one language to another</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#UndergraduateAdvisingRelationship -->
@@ -10546,7 +10546,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#AdvisingRelationship"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An advisory relationship in which a professor advises an undergraduate student.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#UndergraduateStudent -->
@@ -10556,7 +10556,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#Student"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A person registered in an undergraduate program leading to a bachelor&apos;s degree or an undergraduate diploma or certificate.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#University -->
@@ -10568,7 +10568,7 @@ Contents
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Definition taken from: http://en.wikipedia.org/wiki/University</obo:IAO_0000112>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">University of Florida; Washington University in St. Louis</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#Video -->
@@ -10578,7 +10578,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/AudioVisualDocument"/>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Audiovisual recording in video format</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#WorkingPaper -->
@@ -10594,7 +10594,7 @@ Contents
         </rdfs:subClassOf>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A document created as a basis for discussion or a very early draft of a formal paper</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/core#WorkshopSeries -->
@@ -10605,7 +10605,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops.</obo:IAO_0000115>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Use workshop for individual events.</obo:IAO_0000112>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#Phase0ClinicalTrial -->
@@ -10616,7 +10616,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase 0 Clinical Trial</obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase 0 is a recent designation for exploratory, first-in-human trials  conducted in accordance with the United States Food and Drug Administration&apos;s (FDA) 2006 Guidance on Exploratory Investigational New Drug (IND) Studies.  Phase 0 trials are also known as human microdosing  studies and are designed to speed up the development of promising drugs or imaging agents by establishing very early on whether the drug or agent behaves in human subjects as was expected from preclinical studies.</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#Phase1ClinicalTrial -->
@@ -10627,7 +10627,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">In Phase I trials, researchers test an experimental drug or treatment in a small group of people (20-80) for the first time to evaluate its safety, determine a safe dosage range, and identify side effects</obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase 1 Clinical Trial</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#Phase2ClinicalTrial -->
@@ -10638,7 +10638,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">In Phase 2 trials, an experimental study drug or treatment is given to a larger group of people (100-300) to see if it is effective and to further evaluate its safety.</obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase 2 Clinical Trial</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#Phase3ClinicalTrial -->
@@ -10650,7 +10650,7 @@ Contents
 </obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase 3 Clinical Trial</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://vivoweb.org/ontology/scientific-research#Phase4ClinicalTrial -->
@@ -10661,7 +10661,7 @@ Contents
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">In Phase 4 trials, post marketing studies delineate additional information including the drug&apos;s or treatment&apos;s risks, benefits, and optimal use.</obo:IAO_0000115>
         <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Phase 4 Clinical Trial</obo:IAO_0000115>
     </owl:Class>
-    
+
 
 
     <!-- http://www.geneontology.org/formats/oboInOwl#DbXref -->
@@ -10669,7 +10669,7 @@ Contents
     <owl:Class rdf:about="http://www.geneontology.org/formats/oboInOwl#DbXref">
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000102"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.geneontology.org/formats/oboInOwl#Definition -->
@@ -10677,7 +10677,7 @@ Contents
     <owl:Class rdf:about="http://www.geneontology.org/formats/oboInOwl#Definition">
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000102"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.geneontology.org/formats/oboInOwl#Synonym -->
@@ -10685,7 +10685,7 @@ Contents
     <owl:Class rdf:about="http://www.geneontology.org/formats/oboInOwl#Synonym">
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000102"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.geneontology.org/formats/oboInOwl#SynonymType -->
@@ -10693,7 +10693,7 @@ Contents
     <owl:Class rdf:about="http://www.geneontology.org/formats/oboInOwl#SynonymType">
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000102"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2004/02/skos/core#Concept -->
@@ -10701,7 +10701,7 @@ Contents
     <owl:Class rdf:about="http://www.w3.org/2004/02/skos/core#Concept">
         <rdfs:label xml:lang="en">Concept</rdfs:label>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Acquaintance -->
@@ -10710,7 +10710,7 @@ Contents
         <rdfs:label xml:lang="en">Acquaintance</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Address -->
@@ -10786,7 +10786,7 @@ Contents
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Addressing"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the components of the delivery address for the vCard object</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Addressing -->
@@ -10849,7 +10849,7 @@ Contents
         </owl:equivalentClass>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">These types are concerned with information related to the delivery addressing or label for the vCard object</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Agent -->
@@ -10858,7 +10858,7 @@ Contents
         <rdfs:label xml:lang="en">Agent</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Calendar -->
@@ -10896,7 +10896,7 @@ Contents
             </owl:Class>
         </owl:equivalentClass>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#CalendarBusy -->
@@ -10921,7 +10921,7 @@ Contents
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the URI for the busy time associated with the object that the vCard represents.
 Was called FBURI in vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#CalendarLink -->
@@ -10946,7 +10946,7 @@ Was called FBURI in vCard</rdfs:comment>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the URI for a calendar associated with the object represented by the vCard.
 Was called CALURI in vCard.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#CalendarRequest -->
@@ -10968,10 +10968,10 @@ Was called CALURI in vCard.</rdfs:comment>
             </owl:Class>
         </owl:equivalentClass>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Calendar"/>
-        <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the calendar user address [RFC5545] to which a scheduling request [RFC5546] should be sent for the object represented by the vCard. 
+        <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the calendar user address [RFC5545] to which a scheduling request [RFC5546] should be sent for the object represented by the vCard.
 Was called CALADRURI in vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Category -->
@@ -10995,7 +10995,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Explanatory"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify application category information about the vCard, also known as tags. This was called CATEGORIES in vCard.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Cell -->
@@ -11005,7 +11005,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#TelephoneType"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Also called mobile telephone</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Child -->
@@ -11014,7 +11014,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Child</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Code -->
@@ -11023,7 +11023,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Code</rdfs:label>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Contains all the Code related Classes that are used to indicate vCard Types</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Colleague -->
@@ -11032,7 +11032,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Colleague</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Communication -->
@@ -11095,7 +11095,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">These properties describe information about how to communicate with the object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Contact -->
@@ -11104,7 +11104,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Contact</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Coresident -->
@@ -11113,7 +11113,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Coresident</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Coworker -->
@@ -11122,7 +11122,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Coworker</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Crush -->
@@ -11131,7 +11131,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Crush</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Date -->
@@ -11140,7 +11140,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Date</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Email -->
@@ -11164,7 +11164,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Communication"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the electronic mail address for communication with the object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Emergency -->
@@ -11173,7 +11173,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Emergency</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Explanatory -->
@@ -11236,7 +11236,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">These properties are concerned with additional explanations, such as that related to informational notes or revisions specific to the  vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Fax -->
@@ -11245,7 +11245,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Fax</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#TelephoneType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Female -->
@@ -11254,7 +11254,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Female</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Gender"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#FormattedName -->
@@ -11278,7 +11278,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Identification"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Specifies the formatted text corresponding to the name of the object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Friend -->
@@ -11287,7 +11287,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Friend</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Gender -->
@@ -11296,7 +11296,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:label xml:lang="en">Gender</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Code"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Geo -->
@@ -11320,7 +11320,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Geographical"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Used to indicate global positioning  information that is specific to an address</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Geographical -->
@@ -11343,7 +11343,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">These properties are concerned with information associated with  geographical positions or regions associated with the object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Group -->
@@ -11367,7 +11367,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Kind"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Defines all the properties required to be a Group of Individuals or  Organizations</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Home -->
@@ -11377,7 +11377,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Type"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This implies that the property is related to an individual&apos;s personal life</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Identification -->
@@ -11440,7 +11440,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">These types are used to capture information associated with the identification and naming of the entity associated with the vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Individual -->
@@ -11504,7 +11504,7 @@ Was called CALADRURI in vCard</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Kind"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Defines all the properties required to be an Individual</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#InstantMessage -->
@@ -11526,10 +11526,10 @@ Was called CALADRURI in vCard</rdfs:comment>
             </owl:Class>
         </owl:equivalentClass>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Communication"/>
-        <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the URI for instant messaging and presence protocol communications with the object the vCard represents. 
+        <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the URI for instant messaging and presence protocol communications with the object the vCard represents.
 Was called IMPP in vCard.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Key -->
@@ -11552,7 +11552,7 @@ Was called IMPP in vCard.</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Security"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Kin -->
@@ -11561,7 +11561,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Kin</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Kind -->
@@ -11661,7 +11661,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/ARG_2000379"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The parent class for all vCard Objects</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Language -->
@@ -11685,7 +11685,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Communication"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the language(s) that may be used for contacting the entity associated with the vCard.</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Location -->
@@ -11695,7 +11695,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Kind"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Defines all the properties required to be a Location</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Logo -->
@@ -11719,7 +11719,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Organizational"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify a graphic image of a logo associated with the  object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Male -->
@@ -11728,7 +11728,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Male</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Gender"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Me -->
@@ -11737,7 +11737,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Me</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Met -->
@@ -11746,7 +11746,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Met</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Muse -->
@@ -11755,7 +11755,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Muse</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Name -->
@@ -11831,7 +11831,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Identification"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Specifies the components of the name of the object the  vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Neighbor -->
@@ -11840,7 +11840,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Neighbor</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Nickname -->
@@ -11864,7 +11864,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Identification"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Specifies the text corresponding to the nickname of the object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#None -->
@@ -11873,7 +11873,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">None</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Gender"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Note -->
@@ -11897,7 +11897,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Explanatory"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify supplemental information or a comment that is associated with the vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Organization -->
@@ -11908,7 +11908,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Defines all the properties required to be an  Organization</rdfs:comment>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the organizational name  associated with the vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#OrganizationName -->
@@ -11931,7 +11931,7 @@ Was called IMPP in vCard.</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Organizational"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#OrganizationUnitName -->
@@ -11954,7 +11954,7 @@ Was called IMPP in vCard.</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#OrganizationName"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Organizational -->
@@ -12017,7 +12017,7 @@ Was called IMPP in vCard.</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">These properties are concerned with information associated with characteristics of the organization or organizational units of the object that the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Other -->
@@ -12026,7 +12026,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Other</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Gender"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Pager -->
@@ -12035,7 +12035,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Pager</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#TelephoneType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Parent -->
@@ -12044,7 +12044,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Parent</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Photo -->
@@ -12068,7 +12068,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Identification"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Specifies an image or photograph information that annotates some aspect of the object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Related -->
@@ -12092,7 +12092,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Organizational"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify a relationship between another entity and the entity represented by this vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#RelatedType -->
@@ -12101,13 +12101,13 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Relation Type</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Code"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Role -->
 
     <owl:Class rdf:about="http://www.w3.org/2006/vcard/ns#Role"/>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Security -->
@@ -12158,7 +12158,7 @@ Was called IMPP in vCard.</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Contains all the Security related Classes</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Sibling -->
@@ -12167,7 +12167,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Sibling</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Sound -->
@@ -12191,7 +12191,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Explanatory"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify a digital sound content information that annotates some aspect of the vCard.  This property is often used to specify the proper pronunciation of the name property value of the vCard</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Spouse -->
@@ -12200,7 +12200,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Spouse</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Sweetheart -->
@@ -12209,7 +12209,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Sweetheart</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#RelatedType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Telephone -->
@@ -12232,7 +12232,7 @@ Was called IMPP in vCard.</rdfs:comment>
         </owl:equivalentClass>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Communication"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#TelephoneType -->
@@ -12241,7 +12241,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Telephone Type</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Code"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Text -->
@@ -12251,7 +12251,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#TelephoneType"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Also called sms telephone</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#TextPhone -->
@@ -12260,7 +12260,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Text Phone</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#TelephoneType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#TimeZone -->
@@ -12284,7 +12284,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Geographical"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Used to indicate time zone information that is specific to a location or address</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Title -->
@@ -12308,7 +12308,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Organizational"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify the position or job of the object the vCard represents</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Type -->
@@ -12318,7 +12318,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Code"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This is called TYPE in vCard but renamed here to Context for less confusion (with types/class)</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#URL -->
@@ -12342,7 +12342,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Explanatory"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">To specify a uniform resource locator associated with the object to which the vCard refers.  Examples for individuals include personal web sites, blogs, and social networking site  identifiers. </rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Unknown -->
@@ -12351,7 +12351,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Unknown</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Gender"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Video -->
@@ -12360,7 +12360,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Video</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#TelephoneType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Voice -->
@@ -12369,7 +12369,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:label xml:lang="en">Voice</rdfs:label>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#TelephoneType"/>
     </owl:Class>
-    
+
 
 
     <!-- http://www.w3.org/2006/vcard/ns#Work -->
@@ -12379,7 +12379,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <rdfs:subClassOf rdf:resource="http://www.w3.org/2006/vcard/ns#Type"/>
         <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This implies that the property is related to an individual&apos;s work place</rdfs:comment>
     </owl:Class>
-    
+
 
 
     <!-- http://xmlns.com/foaf/0.1/Agent -->
@@ -12414,7 +12414,7 @@ Was called IMPP in vCard.</rdfs:comment>
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">see: http://xmlns.com/foaf/spec/#term_Agent</obo:IAO_0000112>
         <skos:scopeNote xml:lang="en">Used to describe any &quot;agent&quot; related to bibliographic items. Such agents can be persons, organizations or groups of any kind.</skos:scopeNote>
     </owl:Class>
-    
+
 
 
     <!-- http://xmlns.com/foaf/0.1/Group -->
@@ -12431,7 +12431,7 @@ see: http://xmlns.com/foaf/spec/#term_Group</obo:IAO_0000112>
         <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Scott Hoffmann</obo:IAO_0000117>
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">group</obo:IAO_0000111>
     </owl:Class>
-    
+
 
 
     <!-- http://xmlns.com/foaf/0.1/Organization -->
@@ -12479,7 +12479,7 @@ see: http://xmlns.com/foaf/spec/#term_Group</obo:IAO_0000112>
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">organization</obo:IAO_0000111>
         <skos:scopeNote xml:lang="en">Ued to describe an organization related to bibliographic items such as a publishing company, etc.</skos:scopeNote>
     </owl:Class>
-    
+
 
 
     <!-- http://xmlns.com/foaf/0.1/Person -->
@@ -12525,12 +12525,12 @@ see: http://xmlns.com/foaf/spec/#term_Group</obo:IAO_0000112>
         <obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">person</obo:IAO_0000111>
     </owl:Class>
 
-    
-    
+
+
     <rdf:Description>
         <owl:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</owl:minCardinality>
     </rdf:Description>
-    
+
 </rdf:RDF>
 
 
diff --git a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3
index c23d014eeb..9651b0251a 100644
--- a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3
+++ b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3
@@ -32,7 +32,7 @@
 <http://www.w3.org/2004/02/skos/core>
       rdfs:label "SKOS (Simple Knowledge Organization System)"@en-US ;
       vitro:ontologyPrefixAnnot "skos" .
-      
+
 <http://vivoweb.org/ontology/core>
       rdfs:label "VIVO Core Ontology"@en-US ;
       vitro:ontologyPrefixAnnot "vivo" .
@@ -40,35 +40,35 @@
 <http://purl.org/net/OCRe/research.owl>
       rdfs:label "OCRe Research"@en-US ;
       vitro:ontologyPrefixAnnot "ocrer" .
-      
+
 <http://purl.org/net/OCRe/study_design.owl>
       rdfs:label "OCRe Study Design"@en-US ;
       vitro:ontologyPrefixAnnot "ocresd" .
-      
+
 <http://purl.org/net/OCRe/study_protocol.owl>
       rdfs:label "OCRe Study Protocol"@en-US ;
       vitro:ontologyPrefixAnnot "ocresp" .
-      
+
 <http://purl.org/net/OCRe/statistics.owl>
       rdfs:label "OCRe Statistics"@en-US ;
       vitro:ontologyPrefixAnnot "ocresst" .
-      
+
 <http://aims.fao.org/aos/geopolitical.owl>
       rdfs:label "Geopolitical Ontology"@en-US ;
       vitro:ontologyPrefixAnnot "geo" .
-      
+
 <http://purl.org/NET/c4dm/event.owl>
       rdfs:label "Event Ontology"@en-US ;
       vitro:ontologyPrefixAnnot "event" .
 
-<http://purl.obolibrary.org/obo/>  
+<http://purl.obolibrary.org/obo/>
       rdfs:label "OBO Foundry"@en-US ;
       vitro:ontologyPrefixAnnot "obo" .
-              
+
 <http://www.w3.org/2006/vcard/ns>
       rdfs:label "VCard"@en-US ;
       vitro:ontologyPrefixAnnot "vcard" .
-              
+
 <http://xmlns.com/foaf/0.1/>
       rdfs:label "FOAF (Friend of a Friend)"@en-US ;
       vitro:ontologyPrefixAnnot "foaf" .
@@ -88,22 +88,22 @@
 <http://purl.org/spar/cito/>
       rdfs:label "CiTO (Citation Typing Ontology)"@en-US ;
       vitro:ontologyPrefixAnnot "cito" .
-    
+
 <http://purl.org/dc/terms/>
       rdfs:label "Dublin Core Terms"@en-US ;
-      vitro:ontologyPrefixAnnot "dcterms" .  
-    
+      vitro:ontologyPrefixAnnot "dcterms" .
+
 <http://purl.org/vocab/vann/>
       rdfs:label "Vocabulary for Annotating Vocabulary Descriptions"@en-US ;
       vitro:ontologyPrefixAnnot "vann" .
-      
+
 <http://purl.obolibrary.org/obo/ro.owl>
       rdfs:label "Relations Ontology"@en-US ;
-      vitro:ontologyPrefixAnnot "ro" .    
-      
+      vitro:ontologyPrefixAnnot "ro" .
+
 <http://www.ebi.ac.uk/efo/swo/>
       rdfs:label "Software Ontology"@en-US ;
-      vitro:ontologyPrefixAnnot "swo" . 
+      vitro:ontologyPrefixAnnot "swo" .
 
 vivo:pmcid
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
@@ -2512,7 +2512,7 @@ obo:ERO_0000044
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-              
+
 obo:ERO_0001261
       vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGroupactivities> .
 
@@ -2670,7 +2670,7 @@ obo:ERO_0000045
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
- 
+
 vivo:Division
       vitro:displayLimitAnnot
               "-1"^^xsd:int ;
@@ -4642,7 +4642,7 @@ obo:ERO_0000482 # deprecated
 #              "true"^^xsd:boolean ;
 #      vitro:inPropertyGroupAnnot
 #              <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-              
+
 vivo:ResearchProposal
       vitro:displayLimitAnnot
               "-1"^^xsd:int ;
@@ -5323,7 +5323,7 @@ geo:agriculturalAreaYear
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
-        
+
 vivo:providesFundingThrough
       vitro:displayLimitAnnot
               "5"^^xsd:int ;
@@ -6188,7 +6188,7 @@ obo:ERO_0000033
               "true"^^xsd:boolean ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
-              
+
 obo:ERO_0000397
       vitro:displayLimitAnnot
               "5"^^xsd:int ;
@@ -7376,7 +7376,7 @@ obo:ERO_0000919
               "true"^^xsd:boolean ;
       vitro:offerCreateNewOptionAnnot
               "true"^^xsd:boolean .
-              
+
 bibo:status
       vitro:displayLimitAnnot
               "5"^^xsd:int ;
@@ -7460,7 +7460,7 @@ geo:validUntil
       vitro:hiddenFromPublishBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
- 
+
 vivo:hasEquipment
       vitro:displayRankAnnot
               "80"^^xsd:int ;
@@ -7518,37 +7518,37 @@ vivo:hasEquipment
       vitro:displayRankAnnot
               "1"^^xsd:int .
 
-<http://purl.obolibrary.org/obo/RO_0000053> 
-      vitro:hiddenFromDisplayBelowRoleLevelAnnot 
+<http://purl.obolibrary.org/obo/RO_0000053>
+      vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
 
-<http://purl.obolibrary.org/obo/ARG_2000028> 
+<http://purl.obolibrary.org/obo/ARG_2000028>
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
-      vitro:prohibitedFromUpdateBelowRoleLevelAnnot 
+      vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
-  
-vivo:relates 
+
+vivo:relates
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
 
-vivo:relatedBy 
+vivo:relatedBy
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
 
-vivo:assigns 
+vivo:assigns
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
-      vitro:prohibitedFromUpdateBelowRoleLevelAnnot 
+      vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
 
-vivo:assignedBy 
+vivo:assignedBy
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
diff --git a/installer/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf b/installer/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
index 4435ddc4bb..e582f0494c 100644
--- a/installer/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
+++ b/installer/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
@@ -3,7 +3,7 @@
     xmlns:owl="http://www.w3.org/2002/07/owl#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:j.0="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
     <rdf:Description>
         <rdf:type rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Portal"/>
         <rdfs:label xml:lang="en-US">VIVO</rdfs:label>
diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
index 89f1b4378f..b8307c2b38 100644
--- a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
+++ b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
@@ -1,11 +1,11 @@
-log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
+log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
 log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log
-log4j.appender.AllAppender.MaxFileSize=10MB 
-log4j.appender.AllAppender.MaxBackupIndex=10 
-log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout 
+log4j.appender.AllAppender.MaxFileSize=10MB
+log4j.appender.AllAppender.MaxBackupIndex=10
+log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
 
-log4j.rootLogger=INFO, AllAppender 
+log4j.rootLogger=INFO, AllAppender
 
 # Make all of the Solr classes quieter...
 log4j.logger.org.apache.solr.level = WARNING
diff --git a/installer/webapp/src/main/webapp/local/css/local.css b/installer/webapp/src/main/webapp/local/css/local.css
index 4a441c963e..b12c01cc8f 100644
--- a/installer/webapp/src/main/webapp/local/css/local.css
+++ b/installer/webapp/src/main/webapp/local/css/local.css
@@ -2,4 +2,4 @@
     Override theme CSS styles by placing them in this file
 
     Note - all themes must include <../../..>/local/css/local.css as the last import.
-*/
\ No newline at end of file
+*/
diff --git a/legacy/config/licenser/licenser.properties b/legacy/config/licenser/licenser.properties
index ead4e62fd1..6cb869170e 100644
--- a/legacy/config/licenser/licenser.properties
+++ b/legacy/config/licenser/licenser.properties
@@ -1,34 +1,34 @@
-# --------------------------------------------------------------------------
-#  Properties for running the licenser utility in VIVO.
-# --------------------------------------------------------------------------
-  
-# The path to the top level directory to be scanned or copied
-# (if relative, then relative to this file)
-source_dir = ../../
-
-# The path to the top level directory to copy into (ignored if only scanning)
-# (if relative, then relative to this file)
-target_dir = 
-
-# A list of filename globs that match the files we want to license,
-# delimited by commas with optional white-space.
-file_matchers = *.java, *.jsp, *.tld, *.xsl, *.xslt, *.css, *.js, *.ftl, *.xml
-
-# "globs" that describe paths that we won't follow for scanning OR FOR COPYING.
-# (relative to the source_dir)
-skip_directories = ./bin, ./.svn, ./**/.svn, ./.build, ./vitro-core
-
-# The path to a file containing filename/path globs that match the files that 
-# we know should have no license tags in them. 
-# The file contains one glob per line; blank lines and comments ("#") are ignored. 
-# (if relative, then relative to the source directory)
-known_exceptions = config/licenser/known_exceptions.txt
-
-# The path to the text of the license agreement (ignored if only scanning)
-# If the agreement contains a ${year} token, the current year will be substituted.
-# (if relative, then relative to the source directory)
-license_file = doc/license.txt
-
-# Set to 'full' for a full report, 'short' for a brief statment, or to anything
-# else for a medium-length summary.
-report_level = short
+# --------------------------------------------------------------------------
+#  Properties for running the licenser utility in VIVO.
+# --------------------------------------------------------------------------
+
+# The path to the top level directory to be scanned or copied
+# (if relative, then relative to this file)
+source_dir = ../../
+
+# The path to the top level directory to copy into (ignored if only scanning)
+# (if relative, then relative to this file)
+target_dir =
+
+# A list of filename globs that match the files we want to license,
+# delimited by commas with optional white-space.
+file_matchers = *.java, *.jsp, *.tld, *.xsl, *.xslt, *.css, *.js, *.ftl, *.xml
+
+# "globs" that describe paths that we won't follow for scanning OR FOR COPYING.
+# (relative to the source_dir)
+skip_directories = ./bin, ./.svn, ./**/.svn, ./.build, ./vitro-core
+
+# The path to a file containing filename/path globs that match the files that
+# we know should have no license tags in them.
+# The file contains one glob per line; blank lines and comments ("#") are ignored.
+# (if relative, then relative to the source directory)
+known_exceptions = config/licenser/known_exceptions.txt
+
+# The path to the text of the license agreement (ignored if only scanning)
+# If the agreement contains a ${year} token, the current year will be substituted.
+# (if relative, then relative to the source directory)
+license_file = doc/license.txt
+
+# Set to 'full' for a full report, 'short' for a brief statment, or to anything
+# else for a medium-length summary.
+report_level = short
diff --git a/legacy/example.build.properties b/legacy/example.build.properties
index dce8c9da61..bfd56aceac 100644
--- a/legacy/example.build.properties
+++ b/legacy/example.build.properties
@@ -1,56 +1,56 @@
-# -----------------------------------------------------------------------------
-#
-# VIVO build properties
-#
-# This file is provided as example.build.properties.
-#
-# Save a copy of this file as build.properties, and edit the properties as 
-# needed for your deployment.
-#
-# -----------------------------------------------------------------------------
-
-
-# -----------------------------------------------------------------------------
-# BASIC PROPERTIES
-# -----------------------------------------------------------------------------
-
-  #
-  # Where is the Vitro core directory?
-  # In most deployments, this is set to ./vitro-core (It is not uncommon for this 
-  # setting to point elsewhere in development environments).
-  #   Examples:
-  #      vitro.core.dir = ./vitro-core
-  #      vitro.core.dir = ../Vitro
-  #      vitro.core.dir = /usr/local/vitro/trunk
-vitro.core.dir = ./vitro-core
-
-  #
-  # The base install directory for your Tomcat server. The VIVO application 
-  # will be deployed in the /webapps directory below this base. 
-  #
-tomcat.home = /usr/local/tomcat
-
-  #
-  # The name of the VIVO application. This will be used as the name of the
-  # subdirectory within your Tomcat server's /webapps directory. It also appears
-  # in the URL for the application. For example, http://my.vivo.server/vivo
-  #
-webapp.name = vivo
-
-  #
-  # The location where the VIVO application will store the data that it creates.
-  # This includes uploaded files (usually images) and the search index.
-  #
-vitro.home = /usr/local/vivo/home
-
-
-# -----------------------------------------------------------------------------
-# ADDING LANGUAGES TO VIVO
-# -----------------------------------------------------------------------------
-
-  #
-  # Additional languages to be built into your VIVO site. The locales specified
-  # here must appear as sub-directories of [vivo]/languages in the distribution.
-  # Find more information on the VIVO Wiki (https://wiki.duraspace.org/display/VIVO).
-  #
-#languages.addToBuild = 
+# -----------------------------------------------------------------------------
+#
+# VIVO build properties
+#
+# This file is provided as example.build.properties.
+#
+# Save a copy of this file as build.properties, and edit the properties as
+# needed for your deployment.
+#
+# -----------------------------------------------------------------------------
+
+
+# -----------------------------------------------------------------------------
+# BASIC PROPERTIES
+# -----------------------------------------------------------------------------
+
+  #
+  # Where is the Vitro core directory?
+  # In most deployments, this is set to ./vitro-core (It is not uncommon for this
+  # setting to point elsewhere in development environments).
+  #   Examples:
+  #      vitro.core.dir = ./vitro-core
+  #      vitro.core.dir = ../Vitro
+  #      vitro.core.dir = /usr/local/vitro/trunk
+vitro.core.dir = ./vitro-core
+
+  #
+  # The base install directory for your Tomcat server. The VIVO application
+  # will be deployed in the /webapps directory below this base.
+  #
+tomcat.home = /usr/local/tomcat
+
+  #
+  # The name of the VIVO application. This will be used as the name of the
+  # subdirectory within your Tomcat server's /webapps directory. It also appears
+  # in the URL for the application. For example, http://my.vivo.server/vivo
+  #
+webapp.name = vivo
+
+  #
+  # The location where the VIVO application will store the data that it creates.
+  # This includes uploaded files (usually images) and the search index.
+  #
+vitro.home = /usr/local/vivo/home
+
+
+# -----------------------------------------------------------------------------
+# ADDING LANGUAGES TO VIVO
+# -----------------------------------------------------------------------------
+
+  #
+  # Additional languages to be built into your VIVO site. The locales specified
+  # here must appear as sub-directories of [vivo]/languages in the distribution.
+  # Find more information on the VIVO Wiki (https://wiki.duraspace.org/display/VIVO).
+  #
+#languages.addToBuild =
diff --git a/legacy/languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3 b/legacy/languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3
index 10d619161f..0145c84512 100644
--- a/legacy/languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3
+++ b/legacy/languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 @prefix about: <http://vitro.mannlib.cornell.edu/ns/default/about#> .
 
diff --git a/legacy/languages/es_GO/rdf/display/firsttime/menu_es_GO.n3 b/legacy/languages/es_GO/rdf/display/firsttime/menu_es_GO.n3
index 5df58fe9b5..fe31441adf 100644
--- a/legacy/languages/es_GO/rdf/display/firsttime/menu_es_GO.n3
+++ b/legacy/languages/es_GO/rdf/display/firsttime/menu_es_GO.n3
@@ -4,7 +4,7 @@ display:HomeMenuItem display:linkText "Inicio"@es-GO .
 display:PeopleMenuItem display:linkText "Personas"@es-GO .
 display:OrganizationsMenuItem display:linkText "Organizaciones"@es-GO .
 display:ResearchMenuItem display:linkText "Investigación"@es-GO .
-display:EventsMenuItem display:linkText "Eventos"@es-GO . 
+display:EventsMenuItem display:linkText "Eventos"@es-GO .
 display:Home display:title "Inicio"@es-GO .
 display:Events display:title "Eventos"@es-GO .
 display:Organizations display:title "Organizaciones"@es-GO .
diff --git a/legacy/languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl b/legacy/languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl
index 244b16d7a6..75470475fc 100644
--- a/legacy/languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl
+++ b/legacy/languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl
@@ -1,52 +1,52 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#assign aboutImagesRoot = '${urls.images}/visualization/mapofscience/about/'>
-
-<h2>Acerca Mapa de Visualización de Ciencia VIVO</h2>
-<h3>Mapa base de referencia</h3>
-<p>El mapa VIVO de la visualización ciencia utiliza el mapa UCSD de la ciencia y clasificación
-sistema que se calcula a partir de datos de papel a nivel de alrededor de 25 000 revistas de Elsevier
-Scopus y y Thomson Reuters Web of Science (WoS) para los años 2001-2010. El mapa UCSD
-de la ciencia se encarga de los 25.000 diarios a 554 subdisciplinas que se agregan más
-en 13 disciplinas principales de la ciencia. En el mapa, cada disciplina tiene un color distinto
-(verde para 'Biología', marrón de 'Ciencias de la Tierra', etc) y una etiqueta. (Sub) disciplinas que
-son similares más cerca el uno al otro en el mapa. (Sub) disciplinas que son especialmente similares
-están conectados por líneas grises.</p>
-
-<h3>Data Overlay</h3>
-<p>La actividad de publicación de una universidad, organización o persona puede superponerse a la
-asignar para generar perfiles experiencia. El proceso es el siguiente: (1) El conjunto de único
-se identifica revistas, (2) el número de veces que cada revista sirve como un lugar de publicación
-se calcula, y (3) el tamaño del área de las 13 disciplinas y 554 es subdisciplinas
-calculado sobre la base de estas publicaciones de revistas recuentos lugar. Tenga en cuenta que algunas revistas están
-asociado con exactamente una disciplina (sub), mientras que otros, por ejemplo, los interdisciplinares como
-<em>Ciencia</em> o <em>Nature</em>, son marginalmente asociados con múltiples
-(sub) disciplinas. Subdisciplinas heredan los colores de sus disciplinas principales.
-(Sub) disciplinas sin ningún tipo de publicaciones asociadas se muestran en gris.</p>
-
-<img src="${aboutImagesRoot}/scimap_discipline.jpg" width="450" height="327" />
-<img src="${aboutImagesRoot}/scimap_subdiscipline.jpg" width="450" height="327" />
-
-<h3>Experiencia Perfil Comparación Mapa</h3>
-<p>La actividad de publicación de hasta tres personas u organizaciones pueden compararse a través de "Comparar
-organizaciones. "en la tabla de la izquierda, seleccione hasta tres organizaciones. La experiencia
-el perfil de cada organización se muestra como datos de overlay. Todas las organizaciones es
-representada en un color distinto y una lista de 10 de subdisciplinas con el mayor número
-de las publicaciones es la siguiente el mapa comparación. Los datos pueden ser guardados como archivos CSV.</p>
-
-<img src="${aboutImagesRoot}/scimap_comparison.jpg" width="803" height="781" style=
-"margin-left: 50px;"/>
-
-<h3>Interactividad</h3>
-<p>El mapa puede ser explorado en dos niveles-por 13 disciplinas o subdisciplinas 554. Al hacer clic en
-en un nodo en el mapa aparece el número de publicaciones en revistas fraccionada asociada
-y el porcentaje de publicaciones asignadas a esta disciplina (sub). Pase el ratón sobre una disciplina
-en la tabla de la izquierda para ver lo que los círculos corresponde a en el mapa. Usar control deslizante situado debajo
-mapa, sobre el derecho a reducir el número de subdisciplinas demostrado mejorar la legibilidad.</p>
-
-<h3>Enlaces</h3>
-<p>Para obtener más información sobre el mapa UCSD de la ciencia y el sistema de clasificación, véase 
-<a href="http://sci.cns.iu.edu/ucsdmap" target="_blank">http://sci.cns.iu.edu/ucsdmap</a>. 
-Para otros mapas de la ciencia, ver
-<a href="http://scimaps.org" target="_blank">http://scimaps.org</a> y
-<a href="http://mapofscience.com" target="_blank">http://mapofscience.com</a>.</p>
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#assign aboutImagesRoot = '${urls.images}/visualization/mapofscience/about/'>
+
+<h2>Acerca Mapa de Visualización de Ciencia VIVO</h2>
+<h3>Mapa base de referencia</h3>
+<p>El mapa VIVO de la visualización ciencia utiliza el mapa UCSD de la ciencia y clasificación
+sistema que se calcula a partir de datos de papel a nivel de alrededor de 25 000 revistas de Elsevier
+Scopus y y Thomson Reuters Web of Science (WoS) para los años 2001-2010. El mapa UCSD
+de la ciencia se encarga de los 25.000 diarios a 554 subdisciplinas que se agregan más
+en 13 disciplinas principales de la ciencia. En el mapa, cada disciplina tiene un color distinto
+(verde para 'Biología', marrón de 'Ciencias de la Tierra', etc) y una etiqueta. (Sub) disciplinas que
+son similares más cerca el uno al otro en el mapa. (Sub) disciplinas que son especialmente similares
+están conectados por líneas grises.</p>
+
+<h3>Data Overlay</h3>
+<p>La actividad de publicación de una universidad, organización o persona puede superponerse a la
+asignar para generar perfiles experiencia. El proceso es el siguiente: (1) El conjunto de único
+se identifica revistas, (2) el número de veces que cada revista sirve como un lugar de publicación
+se calcula, y (3) el tamaño del área de las 13 disciplinas y 554 es subdisciplinas
+calculado sobre la base de estas publicaciones de revistas recuentos lugar. Tenga en cuenta que algunas revistas están
+asociado con exactamente una disciplina (sub), mientras que otros, por ejemplo, los interdisciplinares como
+<em>Ciencia</em> o <em>Nature</em>, son marginalmente asociados con múltiples
+(sub) disciplinas. Subdisciplinas heredan los colores de sus disciplinas principales.
+(Sub) disciplinas sin ningún tipo de publicaciones asociadas se muestran en gris.</p>
+
+<img src="${aboutImagesRoot}/scimap_discipline.jpg" width="450" height="327" />
+<img src="${aboutImagesRoot}/scimap_subdiscipline.jpg" width="450" height="327" />
+
+<h3>Experiencia Perfil Comparación Mapa</h3>
+<p>La actividad de publicación de hasta tres personas u organizaciones pueden compararse a través de "Comparar
+organizaciones. "en la tabla de la izquierda, seleccione hasta tres organizaciones. La experiencia
+el perfil de cada organización se muestra como datos de overlay. Todas las organizaciones es
+representada en un color distinto y una lista de 10 de subdisciplinas con el mayor número
+de las publicaciones es la siguiente el mapa comparación. Los datos pueden ser guardados como archivos CSV.</p>
+
+<img src="${aboutImagesRoot}/scimap_comparison.jpg" width="803" height="781" style=
+"margin-left: 50px;"/>
+
+<h3>Interactividad</h3>
+<p>El mapa puede ser explorado en dos niveles-por 13 disciplinas o subdisciplinas 554. Al hacer clic en
+en un nodo en el mapa aparece el número de publicaciones en revistas fraccionada asociada
+y el porcentaje de publicaciones asignadas a esta disciplina (sub). Pase el ratón sobre una disciplina
+en la tabla de la izquierda para ver lo que los círculos corresponde a en el mapa. Usar control deslizante situado debajo
+mapa, sobre el derecho a reducir el número de subdisciplinas demostrado mejorar la legibilidad.</p>
+
+<h3>Enlaces</h3>
+<p>Para obtener más información sobre el mapa UCSD de la ciencia y el sistema de clasificación, véase
+<a href="http://sci.cns.iu.edu/ucsdmap" target="_blank">http://sci.cns.iu.edu/ucsdmap</a>.
+Para otros mapas de la ciencia, ver
+<a href="http://scimaps.org" target="_blank">http://scimaps.org</a> y
+<a href="http://mapofscience.com" target="_blank">http://mapofscience.com</a>.</p>
diff --git a/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl b/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl
index 9faded02ab..8ae99d70dd 100644
--- a/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl
+++ b/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl
@@ -44,7 +44,7 @@ La cobertura de la publicación de esta visualización se puede mejorar mediante
 Las organizaciones mencionadas son hijos del nodo de ${entityLabel} en la jerarquía organizacional. Es posible que 'profundizar' para ver las organizaciones por debajo de un determinado sub-organización, seleccione el icono de gráfico junto al nombre de un sub-organización seleccionada por debajo de la gráfica de la derecha.
 <br /><br />
 
-El número de publicaciones columna muestra la cantidad de las publicaciones fueron asignadas a cada especialidad. Esta cuenta puede ser fraccionario ya que algunos lugares de publicación están asociados con más de una especialidad. Cada publicación de tal lugar contribuye fraccionadamente a todas las subdisciplinas asociados de acuerdo con un esquema de ponderación. 
+El número de publicaciones columna muestra la cantidad de las publicaciones fueron asignadas a cada especialidad. Esta cuenta puede ser fraccionario ya que algunos lugares de publicación están asociados con más de una especialidad. Cada publicación de tal lugar contribuye fraccionadamente a todas las subdisciplinas asociados de acuerdo con un esquema de ponderación.
 <br /><br />
 
 El porcentaje de la columna de actividad muestra qué proporción de las publicaciones que se asigna a cada especialidad.
diff --git a/legacy/languages/es_GO/themes/wilma/i18n/all_es_GO.properties b/legacy/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
index 464d2aaad7..5c381b0f55 100644
--- a/legacy/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
+++ b/legacy/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
@@ -38,7 +38,7 @@ intro_searchvivo = Buscar VIVO
 intro_filtersearch = búsqueda Filtrar
 
 #
-# "partial" individual templates ( /templates/freemarker/body/partials/individual ) 
+# "partial" individual templates ( /templates/freemarker/body/partials/individual )
 #
 contact_capitalized = Contacto
 phone = teléfono
@@ -169,7 +169,7 @@ link_text = texto del enlace
 link_name = nombre del enlace
 no_url_provided = no url prevista enlace
 
-# 
+#
 # individual templates ( /templates/freemarker/body/individual )
 #
 standard_view = Vista de perfil estándar
@@ -180,7 +180,7 @@ geographic_focus = Enfoque Geográfico
 background_top_image = background image arriba
 full_view_icon = icono de la vista
 profile_type = Tipo de perfil
-# 
+#
 # body templates ( /templates/freemarker/body/ )
 #
 export_qr_code = Exportar código QR
@@ -190,12 +190,12 @@ view_this_profile = Ver perfil de este usuario
 vcard = Vcard
 hyperlink = Hiperenlace
 
-# 
+#
 # accounts templates ( /templates/freemarker/body/accounts )
 #
 password = contraseña
 
-# 
+#
 # harvester templates ( /templates/freemarker/body/harvester )
 #
 must_be_admin = Usted debe ser un administrador para usar esta herramienta.
@@ -242,14 +242,14 @@ progress_capitalized = Progreso
 undefined_runtime_property = propiedad en runtime.properties no está definido.
 define_value_for_property = Para utilizar esta función, defina un valor para esta propiedad que señala al directorio de instalación antes de volver a implementar Cosechadora y reiniciar la aplicación.
 
-# 
+#
 # menupage templates ( /templates/freemarker/body/menupage )
 #
 grants_text_one = Este cuerpo es de la la plantilla del archivo vivo / productMods / templates / FreeMarker / cuerpo / menupage / grants.ftl. En el modelo de presentación, la página de becas tiene una pantalla: la propiedad requiresBodyTemplate que define que la página de becas anula la plantilla predeterminada. La plantilla predeterminada de estas páginas está en / in vitro / webapp / web / templates / FreeMarker / cuerpo / menupage / menupage.ftl
 grants_two = Esta técnica podría ser usada para definir las páginas sin elementos de menú, que obtienen su contenido a partir de una plantilla de FreeMarker. Un ejemplo sería el relacionado con la página.
 grants_text_three = Esto crearía una página que utilice about.ftl como el cuerpo. La página se accede a través de / sobre y anularía todas las asignaciones de servlet en web.xml.
 
-# 
+#
 # lib templates ( /templates/freemarker/body/lib )
 #
 faculty_capitalized = Profesorado
@@ -264,7 +264,7 @@ verify_match_capitalized = Verifique este partido
 change_selection = cambiar la selección
 
 #
-# custom form templates ( /templates/freemarker/edit/forms ) 
+# custom form templates ( /templates/freemarker/edit/forms )
 #
 manage_concepts = Gestione Conceptos
 no_concepts_specified = Actualmente no hay conceptos especificados.
@@ -504,7 +504,7 @@ postal_code = Código Postal
 posn_entry_for = entrada de la posición de
 
 #
-#  coauthorship templates ( /templates/freemarker/visualization/coauthorship ) 
+#  coauthorship templates ( /templates/freemarker/visualization/coauthorship )
 #
 within_last_10_years = dentro de los últimos 10 años
 total = total
@@ -518,7 +518,7 @@ unique_coauthors_per_year = Únicos coautores por año
 count_capitalized = Contar
 
 #
-#  copi templates ( /templates/freemarker/visualization/copi ) 
+#  copi templates ( /templates/freemarker/visualization/copi )
 #
 year_capitalized = Año
 unique_coinvestigators = Unique co-investigadores
@@ -528,7 +528,7 @@ unique_coinvestigators_per_year = Únicos co-investigadores por año
 view_timeline_copi_network = Ver entrada completa línea de tiempo y de la red co-investigador.
 
 #
-#  entity comparison templates ( /templates/freemarker/visualization/entitycomparison ) 
+#  entity comparison templates ( /templates/freemarker/visualization/entitycomparison )
 #
 parent_organization_of = Organización de padres de
 temporal_graph_drill_up = gráfico temporal sintetiza
@@ -577,7 +577,7 @@ activity = actividad
 activities = actividades
 
 #
-#  grant visualization templates ( /templates/freemarker/visualization/grant ) 
+#  grant visualization templates ( /templates/freemarker/visualization/grant )
 #
 view_all_grants = ver todas las subvenciones
 view_all_grants_text = Ver todas las subvenciones VIVO y correspondiente de la red co-investigador.
@@ -585,7 +585,7 @@ grant_per_year = Donaciones por año
 link = enlace
 
 #
-#  map of science templates ( /templates/freemarker/visualization/mapOfScience ) 
+#  map of science templates ( /templates/freemarker/visualization/mapOfScience )
 #
 parent_entity = entidad matriz
 map_of_science_icon = mapa de icono de la ciencia
@@ -601,14 +601,14 @@ please_visit = Por favor visite el
 for_complete_overview = para obtener una descripción completa.
 
 #
-#  model constructor templates ( /templates/freemarker/visualization/modelconstructor ) 
+#  model constructor templates ( /templates/freemarker/visualization/modelconstructor )
 #
 cached_models_regenerated = Se regenerarán los siguientes modelos de caché.
 uri_independent_model = URI Independiente Modelo
 currently_no_constructed_models = De momento no hay modelos construidos para el uso de la visualización.
 
 #
-#  person level templates ( /templates/freemarker/visualization/personlevel) 
+#  person level templates ( /templates/freemarker/visualization/personlevel)
 #
 loading_data = la carga de datos
 co_investigator_icon = icono de co-investigador
@@ -646,7 +646,7 @@ grant_info_for_all_years = La información de las siguientes tablas es para todo
 grant_sparkline_note = Las líneas de chispa que se muestran arriba reflejan las becas del último año natural completo. Estas tablas, sin embargo, muestran la información de concesión para todos los años, sobre la base de la información cargada en el sistema in vivo.
 
 #
-#  publication templates ( /templates/freemarker/visualization/publication) 
+#  publication templates ( /templates/freemarker/visualization/publication)
 #
 numbers_based_on_publications_in_vivo = Estas cifras se basan únicamente en las publicaciones que se han cargado en la aplicación in vivo. Si esta es tu perfil, puede entrar en las publicaciones adicionales a continuación.
 last_ten_full_years = en los últimos 10 años completos
@@ -656,7 +656,7 @@ download_link = el enlace de descarga
 years = año
 
 #
-#  miscellaneous visualization templates ( /templates/freemarker/visualization) 
+#  miscellaneous visualization templates ( /templates/freemarker/visualization)
 #
 visualization_tools = Herramientas de visualización
 refresh_cached_vis_models = Actualizar Modelos en caché para visualización
@@ -668,7 +668,7 @@ vis_tools_note_three = Actualmente estamos caché estos modelos en la memoria. L
 vis_tools_note_four = Los modelos se actualizan cada vez que se reinicia el servidor. Dado que esto no es generalmente práctico sobre instancias de producción, los administradores pueden usar en lugar del enlace "actualización de caché" para hacer esto sin reiniciar.
 
 #
-#  custom form javascript variables ( /templates/freemarker/edit/js) 
+#  custom form javascript variables ( /templates/freemarker/edit/js)
 #
 drag_drop_reorder_authors = Arrastrar y soltar para cambiar el orden de los autores
 reordering_authors_failed = Reordenación de los autores no.
@@ -710,7 +710,7 @@ confirm_webpage_deletion = ¿Está seguro de que desea eliminar esta página web
 error_removing_webpage = Solicitud de procesamiento Error: la página web no se elimina.
 
 #
-#  miscellaneous javascript variables ( productMods/js) 
+#  miscellaneous javascript variables ( productMods/js)
 #
 researcher = investigador
 researchers = investigadores
@@ -729,13 +729,13 @@ view_all_departments = ver todos los departamentos académicos
 no_departments_found = No hay departamentos académicos encontrados.
 
 #
-#  individual javascript variables ( productMods/js/individual) 
+#  individual javascript variables ( productMods/js/individual)
 #
 error_processing_type_change = Solicitud de procesamiento Error: las etiquetas sin control no pudo ser eliminado.
 
 
 #
-#  visualization javascript variables ( productMods/js/visualization) 
+#  visualization javascript variables ( productMods/js/visualization)
 #
 publications_with = Publicaciones con
 
@@ -803,7 +803,7 @@ publication_pubs = publicaciones (pubs.)
 percent_activity = % De actividad
 
 #
-#  miscellaneous additions 
+#  miscellaneous additions
 #
 
 limit_search = limitar la búsqueda
diff --git a/legacy/utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql b/legacy/utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql
index 9e11dc858c..071856e599 100644
--- a/legacy/utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql
+++ b/legacy/utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql
@@ -2,7 +2,7 @@
 # Run this sparql query and format the output as CSV to find a list of
 # everywhere that VIVO expects to find an image file.
 #
-# Process the result file with ????? to insert dummy images in all of 
+# Process the result file with ????? to insert dummy images in all of
 # those locations.
 #
 
diff --git a/legacy/utilities/acceptance-tests/example.acceptance_tests.properties b/legacy/utilities/acceptance-tests/example.acceptance_tests.properties
index 003c11f13d..6db81a83dc 100644
--- a/legacy/utilities/acceptance-tests/example.acceptance_tests.properties
+++ b/legacy/utilities/acceptance-tests/example.acceptance_tests.properties
@@ -1,30 +1,30 @@
-#
-# These properties tell how to set up Selenium to run a test suite.
-#
-website_url                   = http://localhost:8080/vivo
-suite_parent_directories      = suites
-output_directory              = ../../.build/acceptance-tests-output
-user_extensions_path          = /vitro/utilities/testrunner/selenium/user-extensions.js
-firefox_profile_template_path =
-suite_timeout_limit           = 240
-selenium_jar_path             = /vitro/utilities/testrunner/selenium/selenium-server.jar
-
-#
-# These properties are needed to cleanse the data model between test suites.
-#
-
-mysql_username             = vivoUser
-mysql_password             = vivoPass
-mysql_dumpfile             = test-model/testmodeldump.sql
-mysql_db_name              = vivo
-vivo_webapp_directory      = /usr/local/tomcat//webapps/vivo
-upload_directory           = /usr/local/vivo/data/uploads
-tomcat_check_ready_command = /usr/local/vivo/commands/check_tomcat.sh
-tomcat_stop_command        = /usr/local/vivo/commands/stop_tomcat.sh
-tomcat_start_command       = /usr/local/vivo/commands/start_tomcat.sh
-
-
-#
-# These properties control the output formatting of the tests.
-#
-ignored_tests_file = suites/ignored_tests.txt
+#
+# These properties tell how to set up Selenium to run a test suite.
+#
+website_url                   = http://localhost:8080/vivo
+suite_parent_directories      = suites
+output_directory              = ../../.build/acceptance-tests-output
+user_extensions_path          = /vitro/utilities/testrunner/selenium/user-extensions.js
+firefox_profile_template_path =
+suite_timeout_limit           = 240
+selenium_jar_path             = /vitro/utilities/testrunner/selenium/selenium-server.jar
+
+#
+# These properties are needed to cleanse the data model between test suites.
+#
+
+mysql_username             = vivoUser
+mysql_password             = vivoPass
+mysql_dumpfile             = test-model/testmodeldump.sql
+mysql_db_name              = vivo
+vivo_webapp_directory      = /usr/local/tomcat//webapps/vivo
+upload_directory           = /usr/local/vivo/data/uploads
+tomcat_check_ready_command = /usr/local/vivo/commands/check_tomcat.sh
+tomcat_stop_command        = /usr/local/vivo/commands/stop_tomcat.sh
+tomcat_start_command       = /usr/local/vivo/commands/start_tomcat.sh
+
+
+#
+# These properties control the output formatting of the tests.
+#
+ignored_tests_file = suites/ignored_tests.txt
diff --git a/legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3 b/legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
index 3a7631a845..d1086bd812 100644
--- a/legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
+++ b/legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
@@ -8,12 +8,12 @@
 @prefix vivo:    <http://vivoweb.org/ontology/core#> .
 
 <http://vivo.mydomain.edu/individual/MultiLabelFaculty>
-      a       foaf:Person , 
-              vivo:FacultyMember , 
-              foaf:Agent , 
-              owl:Thing , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       foaf:Person ,
+              vivo:FacultyMember ,
+              foaf:Agent ,
+              owl:Thing ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               obo:BFO_0000004 ;
       rdfs:label "Furter, Frank "^^xsd:string ;
       rdfs:label "Test Label 1 "^^xsd:string ;
@@ -22,30 +22,30 @@
       vitro:mostSpecificType vivo:FacultyMember .
 
 <http://vivo.mydomain.edu/individual/MultiLabelVCard>
-      a       obo:BFO_0000031 , 
-              vcard:Kind , 
-              obo:ARG_2000379 , 
-              owl:Thing , 
-              obo:IAO_0000030 , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       obo:BFO_0000031 ,
+              vcard:Kind ,
+              obo:ARG_2000379 ,
+              owl:Thing ,
+              obo:IAO_0000030 ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               vcard:Individual ;
       obo:ARG_2000029 <http://vivo.mydomain.edu/individual/MultiLabelFaculty> ;
       vitro:mostSpecificType vcard:Individual ;
       vcard:hasName <http://vivo.mydomain.edu/individual/MultiLabelName> .
 
 <http://vivo.mydomain.edu/individual/MultiLabelName>
-      a       vcard:Name , 
-              vcard:Geographical , 
-              vcard:TimeZone , 
-              owl:Thing , 
-              vcard:Organizational , 
-              vcard:Geo , 
-              vcard:Communication , 
-              vcard:Explanatory , 
-              vcard:Identification , 
-              vcard:Security , 
-              vcard:Addressing , 
+      a       vcard:Name ,
+              vcard:Geographical ,
+              vcard:TimeZone ,
+              owl:Thing ,
+              vcard:Organizational ,
+              vcard:Geo ,
+              vcard:Communication ,
+              vcard:Explanatory ,
+              vcard:Identification ,
+              vcard:Security ,
+              vcard:Addressing ,
               vcard:Calendar ;
       vitro:mostSpecificType vcard:Name ;
       vcard:familyName "Furter"^^xsd:string ;
diff --git a/legacy/utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf
index b178ec2758..d6f5249d6d 100644
--- a/legacy/utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf
+++ b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf
@@ -4127,7 +4127,7 @@
     <core:inScheme rdf:resource="#V"/>
     <core:prefLabel xml:lang="en">vineyards</core:prefLabel>
   </ontology:Code>
-  
+
   <core:Concept rdf:about="http://www.eionet.europa.eu/gemet/concept/1001">
     <owl:sameAs rdf:resource="#S.BDG"/>
   </core:Concept>
diff --git a/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3 b/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3
index 725dd113f4..1b2d82706d 100644
--- a/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3
+++ b/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3
@@ -1,9 +1,9 @@
 
 
-#<http://xmlns.com/foaf/0.1/Person> 
+#<http://xmlns.com/foaf/0.1/Person>
 #<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#searchBoostAnnot> 100000.0.
 
-#<http://vivoweb.org/ontology/core#EmeritusProfessor> 
+#<http://vivoweb.org/ontology/core#EmeritusProfessor>
 #	<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#searchBoostAnnot> 5000.0.
 
 <http://www.w3.org/2004/02/skos/core#Concept>
diff --git a/legacy/utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3 b/legacy/utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3
index a4beecdfb2..01c9068ad0 100644
--- a/legacy/utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3
+++ b/legacy/utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3
@@ -1,7 +1,7 @@
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix vitroDisplay: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-vitroDisplay:SearchIndex 
-    rdf:type owl:Thing ; 
-    vitroDisplay:excludeClass <http://xmlns.com/foaf/0.1/Person> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix vitroDisplay: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+vitroDisplay:SearchIndex
+    rdf:type owl:Thing ;
+    vitroDisplay:excludeClass <http://xmlns.com/foaf/0.1/Person> .
diff --git a/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 b/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
index f0ff92f0fc..e2ba509ef1 100644
--- a/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
+++ b/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
@@ -1,4 +1,4 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
 #
 # Short View configuration
@@ -8,7 +8,7 @@
 # implementation, and should be replaced when the work on the Application and Display
 # Ontology is complete.
 #
-# Find out how to use this file at 
+# Find out how to use this file at
 # https://sourceforge.net/apps/mediawiki/vivo/index.php?title=Using_Short_Views_in_Release_1.5
 #
 
@@ -18,34 +18,34 @@
 @prefix mydomain: <http://vivo.mydomain.edu/individual/> .
 
 #
-# In all views, Facult Members should show the name of the 
+# In all views, Facult Members should show the name of the
 # department they belong to.
 #
 
-vivo:FacultyMember 
+vivo:FacultyMember
 	display:hasCustomView mydomain:facultySearchView ;
 	display:hasCustomView mydomain:facultyIndexView ;
 	display:hasCustomView mydomain:facultyBrowseView .
-	
+
 mydomain:facultySearchView
 	a display:customViewForIndividual ;
 	display:appliesToContext "SEARCH" ;
 	display:hasTemplate "view-search-faculty.ftl" ;
 	display:hasDataGetter mydomain:facultyDepartmentDG .
-	
+
 mydomain:facultyIndexView
 	a display:customViewForIndividual ;
 	display:appliesToContext "INDEX" ;
 	display:hasTemplate "view-index-faculty.ftl" ;
 	display:hasDataGetter mydomain:facultyDepartmentDG .
-	
+
 mydomain:facultyBrowseView
 	a display:customViewForIndividual ;
 	display:appliesToContext "BROWSE" ;
 	display:hasTemplate "view-browse-faculty.ftl" ;
 	display:hasDataGetter mydomain:facultyDepartmentDG ;
 	display:hasDataGetter mydomain:facultyPreferredTitleDG .
-	
+
 mydomain:facultyDepartmentDG
 	a datagetters:SparqlQueryDataGetter ;
 	display:saveToVar "details" ;
@@ -57,11 +57,11 @@ SELECT ?deptName
 WHERE {
 ?individualUri obo:RO_0000053 ?membership .
 ?membership vivo:roleContributesTo ?deptUri .
-?deptUri 
+?deptUri
 	a vivo:AcademicDepartment ;
 	rdfs:label ?deptName .
 }
-LIMIT 20 
+LIMIT 20
 	""" .
 
 mydomain:facultyPreferredTitleDG
@@ -80,7 +80,7 @@ LIMIT 1
 	""" .
 
 #
-# In the INDEX view, Academic departments should show locations 
+# In the INDEX view, Academic departments should show locations
 # and department head.
 #
 
diff --git a/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
index c223ec4157..023c48fbab 100644
--- a/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
+++ b/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
@@ -35,6 +35,6 @@
 <#if (details[0].deptName)?? >
     <span class="title"><em>Member of</em> ${details[0].deptName}</span>
 </#if>
-    
+
 </li>
 
diff --git a/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3 b/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3
index 5548d4b077..f83bfe533e 100644
--- a/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3
+++ b/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3
@@ -2,5 +2,5 @@
 @prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
 @prefix simplePermission: <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#> .
 
-auth:ADMIN 
-  	auth:hasPermission simplePermission:UseSparqlQueryApi ;    
+auth:ADMIN
+  	auth:hasPermission simplePermission:UseSparqlQueryApi ;
diff --git a/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3 b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
index a9d54a1a92..3a8ec2c6ab 100644
--- a/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
+++ b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
@@ -2,5 +2,5 @@
 @prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
 @prefix simplePermission: <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#> .
 
-auth:ADMIN 
-  	auth:hasPermission simplePermission:UseSparqlUpdateApi ;    
+auth:ADMIN
+  	auth:hasPermission simplePermission:UseSparqlUpdateApi ;
diff --git a/selenium/test-output/testng.css b/selenium/test-output/testng.css
index 3904800f0c..5124ba863b 100644
--- a/selenium/test-output/testng.css
+++ b/selenium/test-output/testng.css
@@ -1,9 +1,9 @@
-.invocation-failed,  .test-failed  { background-color: #DD0000; }
-.invocation-percent, .test-percent { background-color: #006600; }
-.invocation-passed,  .test-passed  { background-color: #00AA00; }
-.invocation-skipped, .test-skipped { background-color: #CCCC00; }
-
-.main-page {
-  font-size: x-large;
-}
-
+.invocation-failed,  .test-failed  { background-color: #DD0000; }
+.invocation-percent, .test-percent { background-color: #006600; }
+.invocation-passed,  .test-passed  { background-color: #00AA00; }
+.invocation-skipped, .test-skipped { background-color: #CCCC00; }
+
+.main-page {
+  font-size: x-large;
+}
+
diff --git a/selenium/test-user-model.owl b/selenium/test-user-model.owl
index a84b137079..4e1da1fdba 100644
--- a/selenium/test-user-model.owl
+++ b/selenium/test-user-model.owl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
          xmlns:owl="http://www.w3.org/2002/07/owl#"
          xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
@@ -14,8 +14,8 @@
     <auth:lastName rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Admin</auth:lastName>
     <auth:md5password rdf:datatype="http://www.w3.org/2001/XMLSchema#string">DC647EB65E6711E155375218212B3964</auth:md5password>
     <auth:status rdf:datatype="http://www.w3.org/2001/XMLSchema#string">ACTIVE</auth:status>
-    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>  
-    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>  
+    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>
+    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>
     <auth:hasPermissionSet rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/authorization#ADMIN"/>
 </auth:UserAccount>
 
@@ -26,8 +26,8 @@
     <auth:lastName rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Curator</auth:lastName>
     <auth:md5password rdf:datatype="http://www.w3.org/2001/XMLSchema#string">DC647EB65E6711E155375218212B3964</auth:md5password>
     <auth:status rdf:datatype="http://www.w3.org/2001/XMLSchema#string">ACTIVE</auth:status>
-    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>  
-    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>  
+    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>
+    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>
     <auth:hasPermissionSet rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/authorization#CURATOR"/>
 </auth:UserAccount>
 
@@ -38,8 +38,8 @@
     <auth:lastName rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Editor</auth:lastName>
     <auth:md5password rdf:datatype="http://www.w3.org/2001/XMLSchema#string">DC647EB65E6711E155375218212B3964</auth:md5password>
     <auth:status rdf:datatype="http://www.w3.org/2001/XMLSchema#string">ACTIVE</auth:status>
-    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>  
-    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>  
+    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>
+    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>
     <auth:hasPermissionSet rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/authorization#EDITOR"/>
 </auth:UserAccount>
 
@@ -50,8 +50,8 @@
     <auth:lastName rdf:datatype="http://www.w3.org/2001/XMLSchema#string">User</auth:lastName>
     <auth:md5password rdf:datatype="http://www.w3.org/2001/XMLSchema#string">DC647EB65E6711E155375218212B3964</auth:md5password>
     <auth:status rdf:datatype="http://www.w3.org/2001/XMLSchema#string">ACTIVE</auth:status>
-    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>  
-    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>  
+    <auth:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</auth:loginCount>
+    <auth:passwordLinkExpires rdf:datatype="http://www.w3.org/2001/XMLSchema#long">0</auth:passwordLinkExpires>
     <auth:hasPermissionSet rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/authorization#SELF_EDITOR"/>
 </auth:UserAccount>
 
diff --git a/webapp/src/main/webapp/WEB-INF/applicationContext.xml b/webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 057a92fe2f..11715102cf 100644
--- a/webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,4 +9,4 @@
     <context:component-scan base-package="edu.cornell.mannlib" />
     <context:component-scan base-package="org.vivoweb" />
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/askUpdated.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/askUpdated.sparql
index 024bfb78f2..41884637b4 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/askUpdated.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/askUpdated.sparql
@@ -1,5 +1,5 @@
-PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> 
-PREFIX owl:   <http://www.w3.org/2002/07/owl#> 
+PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
+PREFIX owl:   <http://www.w3.org/2002/07/owl#>
 PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 
 ASK {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/diff.tab.txt b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/diff.tab.txt
index 4e18a4b7ee..ab423470a3 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/diff.tab.txt
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/diff.tab.txt
@@ -1 +1 @@
-http://purl.org/NET/c4dm/event.owl#agent			Delete	z
http://purl.org/NET/c4dm/event.owl#isAgentIn			Delete	z
http://purl.org/NET/c4dm/event.owl#produced_in	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://purl.org/NET/c4dm/event.owl#product	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://purl.org/dc/elements/1.1/isVersionOf			Delete	z
http://vivoweb.org/ontology/core#administeredBy			Delete	complex construct with grant administrator role
http://purl.org/dc/terms/isReferencedBy			Delete	z
http://purl.org/dc/terms/isVersionOf			Delete	z
http://purl.org/dc/terms/publisher	http://vivoweb.org/ontology/core#publisher	Yes		z
http://purl.org/ontology/bibo/editor			Delete	z
http://vivoweb.org/ontology/core#administers			Delete	complex construct with grant administrator role
http://vivoweb.org/ontology/core#advisee			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#adviseeIn			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#advisingContributionTo			Delete	construct
http://vivoweb.org/ontology/core#advisor			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#advisorIn			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#associatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#associatedWithPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#attendeeRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#authorInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardConferred	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#awardConferredBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonor	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonorFor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#awardsGrant	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#clinicalRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#courseOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#credentialOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#currentMemberOf			Delete	construct MemberRole
http://vivoweb.org/ontology/core#currentlyHeadOf			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#currentlyHeadedBy			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#degreeEarned	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#degreeOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#degreeOutcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#editor			Delete	CC editorship
http://vivoweb.org/ontology/core#editorOf			Delete	CC editorship
http://vivoweb.org/ontology/core#editorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#educationalTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#educationalTrainingOf	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#equipmentInFacility	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#eventWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#geographicLocationOf	http://purl.obolibrary.org/obo/RO_0001015	Yes		"""location of"""
http://vivoweb.org/ontology/core#geographicallyContains	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#geographicallyWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#grantAwardedBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#hasAttendeeRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasAttendeeRoleContext
http://vivoweb.org/ontology/core#hasClinicalRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasClinicalRoleContext
http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasCo-PrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#hasCurrentMember			Delete	construct MemberRole
http://vivoweb.org/ontology/core#hasEditorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasEditorRoleContext
http://vivoweb.org/ontology/core#hasGeographicLocation	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#hasInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasLeaderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasLeaderRoleContext
http://vivoweb.org/ontology/core#hasMemberRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasMemberRoleContext
http://vivoweb.org/ontology/core#hasOrganizerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOrganizerRoleContext
http://vivoweb.org/ontology/core#hasOutreachProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOutreachProviderContext
http://vivoweb.org/ontology/core#hasPart	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasPresenterRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPresenterRoleContext
http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasResearcherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasResearcherRoleContext
http://vivoweb.org/ontology/core#hasReviewerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasReviewerRoleContext
http://vivoweb.org/ontology/core#hasRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#hasRoom	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#hasServiceProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasServiceProviderRoleContext
http://vivoweb.org/ontology/core#hasSubGrant	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasSubOrganization	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasTeacherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#inEventSeries	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#includesEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#informationProduct	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#informationProductOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#informationResourceInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#investigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		"""inheres in"""
http://vivoweb.org/ontology/core#issuanceOfCredential	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#issuedCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#leaderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#linkedAuthor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#linkedInformationResource	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#locationOfEquipment	http://purl.obolibrary.org/obo/RO_0001015	Yes		z
http://vivoweb.org/ontology/core#mailingAddress			Delete	VCard
http://vivoweb.org/ontology/core#mailingAddressFor			Delete	VCard
http://vivoweb.org/ontology/core#memberRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#offersCourse	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#offersDegree	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#organizationForPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#organizationForTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#organizerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#outcome	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#outcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#outreachProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#partOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#personInPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#positionForPerson	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#positionInOrganization	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#presenterRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#principalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#providesService	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#realizedRole	http://purl.obolibrary.org/obo/BFO_0000055	Yes		"""realizes"""
http://vivoweb.org/ontology/core#receipt	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#receiptOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#relatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#researcherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#reviewerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		"""realized in"" (or delete, since there should be subs?)"
http://vivoweb.org/ontology/core#roleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleRealizedIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		z
http://vivoweb.org/ontology/core#roomWithinBuilding	http://purl.obolibrary.org/obo/RO_0001025	Yes		z
http://vivoweb.org/ontology/core#seriesForEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#serviceProvidedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#serviceProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#subGrantOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#subOrganizationWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#teacherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#trainingAtOrganization	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#authorRank	http://vivoweb.org/ontology/core#rank	Yes		z
http://vivoweb.org/ontology/core#preferredTitle			Delete	z
http://vivoweb.org/ontology/core#EducationalTraining	http://vivoweb.org/ontology/core#EducationalProcess	Yes		z
http://vivoweb.org/ontology/core#ServiceProviderRole	http://purl.obolibrary.org/obo/ERO_0000012	Yes		z
http://vivoweb.org/ontology/core#URLLink	http://www.w3.org/2006/vcard/ns#URL	Yes		z
http://vivoweb.org/ontology/core#Agreement			Delete	z
http://vivoweb.org/ontology/core#InformationResource	http://purl.obolibrary.org/obo/IAO_0000030	Yes		z
http://vivoweb.org/ontology/core#Service	http://purl.obolibrary.org/obo/ERO_0000005	Yes		z
http://vivoweb.org/ontology/core#Software	http://purl.obolibrary.org/obo/ERO_0000071	Yes		z
\ No newline at end of file
+http://purl.org/NET/c4dm/event.owl#agent			Delete	z
http://purl.org/NET/c4dm/event.owl#isAgentIn			Delete	z
http://purl.org/NET/c4dm/event.owl#produced_in	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://purl.org/NET/c4dm/event.owl#product	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://purl.org/dc/elements/1.1/isVersionOf			Delete	z
http://vivoweb.org/ontology/core#administeredBy			Delete	complex construct with grant administrator role
http://purl.org/dc/terms/isReferencedBy			Delete	z
http://purl.org/dc/terms/isVersionOf			Delete	z
http://purl.org/dc/terms/publisher	http://vivoweb.org/ontology/core#publisher	Yes		z
http://purl.org/ontology/bibo/editor			Delete	z
http://vivoweb.org/ontology/core#administers			Delete	complex construct with grant administrator role
http://vivoweb.org/ontology/core#advisee			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#adviseeIn			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#advisingContributionTo			Delete	construct
http://vivoweb.org/ontology/core#advisor			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#advisorIn			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#associatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#associatedWithPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#attendeeRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#authorInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardConferred	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#awardConferredBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonor	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonorFor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#awardsGrant	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#clinicalRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#courseOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#credentialOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#currentMemberOf			Delete	construct MemberRole
http://vivoweb.org/ontology/core#currentlyHeadOf			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#currentlyHeadedBy			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#degreeEarned	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#degreeOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#degreeOutcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#editor			Delete	CC editorship
http://vivoweb.org/ontology/core#editorOf			Delete	CC editorship
http://vivoweb.org/ontology/core#editorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#educationalTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#educationalTrainingOf	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#equipmentInFacility	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#eventWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#geographicLocationOf	http://purl.obolibrary.org/obo/RO_0001015	Yes		"""location of"""
http://vivoweb.org/ontology/core#geographicallyContains	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#geographicallyWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#grantAwardedBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#hasAttendeeRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasAttendeeRoleContext
http://vivoweb.org/ontology/core#hasClinicalRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasClinicalRoleContext
http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasCo-PrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#hasCurrentMember			Delete	construct MemberRole
http://vivoweb.org/ontology/core#hasEditorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasEditorRoleContext
http://vivoweb.org/ontology/core#hasGeographicLocation	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#hasInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasLeaderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasLeaderRoleContext
http://vivoweb.org/ontology/core#hasMemberRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasMemberRoleContext
http://vivoweb.org/ontology/core#hasOrganizerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOrganizerRoleContext
http://vivoweb.org/ontology/core#hasOutreachProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOutreachProviderContext
http://vivoweb.org/ontology/core#hasPart	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasPresenterRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPresenterRoleContext
http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasResearcherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasResearcherRoleContext
http://vivoweb.org/ontology/core#hasReviewerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasReviewerRoleContext
http://vivoweb.org/ontology/core#hasRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#hasRoom	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#hasServiceProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasServiceProviderRoleContext
http://vivoweb.org/ontology/core#hasSubGrant	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasSubOrganization	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasTeacherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#inEventSeries	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#includesEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#informationProduct	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#informationProductOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#informationResourceInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#investigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		"""inheres in"""
http://vivoweb.org/ontology/core#issuanceOfCredential	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#issuedCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#leaderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#linkedAuthor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#linkedInformationResource	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#locationOfEquipment	http://purl.obolibrary.org/obo/RO_0001015	Yes		z
http://vivoweb.org/ontology/core#mailingAddress			Delete	VCard
http://vivoweb.org/ontology/core#mailingAddressFor			Delete	VCard
http://vivoweb.org/ontology/core#memberRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#offersCourse	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#offersDegree	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#organizationForPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#organizationForTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#organizerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#outcome	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#outcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#outreachProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#partOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#personInPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#positionForPerson	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#positionInOrganization	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#presenterRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#principalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#providesService	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#realizedRole	http://purl.obolibrary.org/obo/BFO_0000055	Yes		"""realizes"""
http://vivoweb.org/ontology/core#receipt	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#receiptOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#relatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#researcherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#reviewerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		"""realized in"" (or delete, since there should be subs?)"
http://vivoweb.org/ontology/core#roleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleRealizedIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		z
http://vivoweb.org/ontology/core#roomWithinBuilding	http://purl.obolibrary.org/obo/RO_0001025	Yes		z
http://vivoweb.org/ontology/core#seriesForEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#serviceProvidedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#serviceProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#subGrantOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#subOrganizationWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#teacherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#trainingAtOrganization	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#authorRank	http://vivoweb.org/ontology/core#rank	Yes		z
http://vivoweb.org/ontology/core#preferredTitle			Delete	z
http://vivoweb.org/ontology/core#EducationalTraining	http://vivoweb.org/ontology/core#EducationalProcess	Yes		z
http://vivoweb.org/ontology/core#ServiceProviderRole	http://purl.obolibrary.org/obo/ERO_0000012	Yes		z
http://vivoweb.org/ontology/core#URLLink	http://www.w3.org/2006/vcard/ns#URL	Yes		z
http://vivoweb.org/ontology/core#Agreement			Delete	z
http://vivoweb.org/ontology/core#InformationResource	http://purl.obolibrary.org/obo/IAO_0000030	Yes		z
http://vivoweb.org/ontology/core#Service	http://purl.obolibrary.org/obo/ERO_0000005	Yes		z
http://vivoweb.org/ontology/core#Software	http://purl.obolibrary.org/obo/ERO_0000071	Yes		z
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf
index 97282f0543..e2f5506bf4 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf
@@ -20,7 +20,7 @@
     xmlns:dcterms="http://purl.org/dc/terms/"
     xmlns:scires="http://vivoweb.org/ontology/scientific-research#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
   <rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#hasCoordinate">
     <rdfs:label xml:lang="en-US">hasCoordinate</rdfs:label>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf
index 392a90b164..8526926297 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf
@@ -22,7 +22,7 @@
     xmlns:scires="http://vivoweb.org/ontology/scientific-research#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:swrl="http://www.w3.org/2003/11/swrl#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
   <rdf:Description rdf:about="http://www.w3.org/2000/01/rdf-schema#isDefinedBy">
     <rdfs:label xml:lang="en-US">is defined by</rdfs:label>
     <vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:selectFromExistingAnnot>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf
index 3f9f1cdcba..8d9a084a6e 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf
@@ -2,7 +2,7 @@
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
   <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#moniker">
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#editor"/>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#editor"/>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf
index f39f09dd45..99811b419b 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf
@@ -5949,7 +5949,7 @@
     <vitro:fullPropertyNameAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
     >nearestGeographicLocation</vitro:fullPropertyNameAnnot>
     <vitro:publicDescriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-    >This relates something to its geographic location, for example, an organization to its geographic location. 
+    >This relates something to its geographic location, for example, an organization to its geographic location.
 </vitro:publicDescriptionAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#dateFiled">
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
index 37834ae30f..c3b3138fb9 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
@@ -13,7 +13,7 @@
     <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
     >FAO DISCLAIMER:  Information on the FAO Country Profiles portal is provided as and when available. The designations employed and the presentation of information do not imply the expression of any opinion whatsoever on the part of the Food and Agriculture Organization of the United Nations (FAO) concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries. FAO makes every effort to ensure, but does not guarantee, the accuracy or completeness of and declines responsibility for any loss, damage, liability or expense suffered which is claimed to result from its use. </rdfs:comment>
     <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-    >Version 1.1 of the ontology includes a structured description of sources (source creator, source identifier by language, and last updated date on source) . 
+    >Version 1.1 of the ontology includes a structured description of sources (source creator, source identifier by language, and last updated date on source) .
    </rdfs:comment>
     <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
     >FAO's geopolitical ontology version 1.1 was populated with FAO, UN and internationally recognized data sources.    </rdfs:comment>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl
index 7020407faf..28c16c4a8c 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl
@@ -18,7 +18,7 @@
     xmlns:owl="http://www.w3.org/2002/07/owl#"
     xmlns:dcterms="http://purl.org/dc/terms/"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
   <rdf:Description rdf:about="http://www.w3.org/2000/01/rdf-schema#isDefinedBy">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
   </rdf:Description>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl
index 33ccab4699..eb0d79d417 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl
@@ -1214,7 +1214,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
   <owl:DatatypeProperty rdf:about="http://purl.org/ontology/bibo/oclcnum">
     <swvs:term_status>stable</swvs:term_status>
     <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-    >http://info-uri.info/registry/OAIHandler?verb=GetRecord&amp;metadataPrefix=reg&amp;identifier=info:oclcnum/. 
+    >http://info-uri.info/registry/OAIHandler?verb=GetRecord&amp;metadataPrefix=reg&amp;identifier=info:oclcnum/.
 
 
 bibo has the domain of this property set to the union of Collection and Document.</vitro:descriptionAnnot>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl
index f3a8da67be..4b1f11b863 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl
@@ -29,8 +29,8 @@
     <vitro:shortDef rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
     >A verbal or written remark concerning some entity. In written form, a comment is often appended to that entity and termed an annotation. Within computer programs or ontologies, comments are added to enhance human understanding, and are usually prefaced by</vitro:shortDef>
     <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-    >A verbal or written remark concerning some entity. In written form, a comment is often appended to that entity and termed an annotation. Within computer programs or ontologies, comments are added to enhance human understanding, and are usually prefaced by a special syntactic symbol that ensures they are ignored during execution of the program.
-
+    >A verbal or written remark concerning some entity. In written form, a comment is often appended to that entity and termed an annotation. Within computer programs or ontologies, comments are added to enhance human understanding, and are usually prefaced by a special syntactic symbol that ensures they are ignored during execution of the program.
+
 has super-classes</vitro:descriptionAnnot>
   </owl:Class>
   <owl:Class rdf:about="http://purl.org/spar/fabio/Erratum">
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql
index c79d5687e8..e2711e0dd2 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql
index 8a389c0828..dec880580d 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql
index 204664f87a..501b405445 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
@@ -9,12 +9,12 @@ CONSTRUCT {
     _:Editorship vivo:relates ?document .
     ?document vivo:relatedBy _:Editorship .
 } WHERE {
-    { 
+    {
       ?person vivo:editorOf ?document
     } UNION {
       ?document vivo:editor ?person
-      FILTER NOT EXISTS { ?person vivo:editorOf ?document } 
-    } 
+      FILTER NOT EXISTS { ?person vivo:editorOf ?document }
+    }
     FILTER NOT EXISTS {
         ?person vivo:relatedBy ?editorshipNode .
         ?editorshipNode vivo:relates ?document .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql
index 2a09ef278d..bd8d5426b2 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
@@ -10,8 +10,8 @@ CONSTRUCT {
     ?org vivo:contributingRole _:leaderRole .
 } WHERE {
     { ?person vivo:currentlyHeadOf ?org }
-      UNION 
-    { ?org vivo:currentlyHeadedBy ?person 
+      UNION
+    { ?org vivo:currentlyHeadedBy ?person
       FILTER NOT EXISTS { ?person vivo:currentlyHeadOf ?org }
     }
     FILTER NOT EXISTS {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql
index 85a5b275b7..e25f198442 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
@@ -10,8 +10,8 @@ CONSTRUCT {
     ?org vivo:contributingRole _:memberRole .
 } WHERE {
      {  ?person vivo:currentMemberOf ?org }
-       UNION 
-     { ?org vivo:hasCurrentMember ?person 
+       UNION
+     { ?org vivo:hasCurrentMember ?person
        FILTER NOT EXISTS { ?person vivo:currentMemberOf ?org }
      }
      FILTER NOT EXISTS {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql
index 4183699a58..cdf6209c55 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql
index 99c631b63a..ae7e4feebb 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql
@@ -1,10 +1,10 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
     ?role vivo:relatedBy ?grant .
-    ?grant vivo:relates ?role    
+    ?grant vivo:relates ?role
 } WHERE {
     ?role vivo:roleContributesTo ?grant .
     { ?grant a vivo:Grant } UNION { ?grant a vivo:Contract }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql
index 72315e1179..12ba49dbf9 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
@@ -13,8 +13,8 @@ CONSTRUCT {
 } WHERE {
     { ?agent vivo:administers ?grant }
       UNION
-    { ?grant vivo:administeredBy ?agent 
-      FILTER NOT EXISTS { ?agent vivo:administers ?grant } 
+    { ?grant vivo:administeredBy ?agent
+      FILTER NOT EXISTS { ?agent vivo:administers ?grant }
     }
     FILTER NOT EXISTS {
         ?agent <http://purl.obolibrary.org/obo/RO_0000053> ?adminRoleNode .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql
index d53f0db248..f1cd7f424b 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql
@@ -1,11 +1,11 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 
 CONSTRUCT {
     ?s vivo:orcidId ?orcidURI .
     ?orcidURI a owl:Thing .
 } WHERE {
-    ?s vivo:orcidId ?orcidString 
+    ?s vivo:orcidId ?orcidString
     FILTER(isLiteral(?orcidString))
     FILTER (regex(str(?orcidString), "^[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9]([0-9]|X)$"))
     BIND(IRI(concat("http://orcid.org/", str(?orcidString))) AS ?orcidURI)
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql
index 0277868ce1..67df8630ff 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
@@ -9,5 +9,5 @@ CONSTRUCT {
     ?agent <http://purl.obolibrary.org/obo/RO_0000053> ?role .
     ?role vivo:relatedBy ?grant .
     { ?grant a vivo:Grant } UNION { ?grant a vivo:Contract }
-    FILTER NOT EXISTS { ?grant vivo:relates ?agent } 
+    FILTER NOT EXISTS { ?grant vivo:relates ?agent }
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql
index 971b713f85..15e411b334 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql
index 5beaf5a2d2..497e7655fc 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
@@ -19,8 +19,8 @@ CONSTRUCT {
     ?educationalProcess <http://purl.obolibrary.org/obo/RO_0002234> ?degree .
     ?degree a vivo:AcademicDegree .
     OPTIONAL {
-        ?educationalProcess <http://purl.obolibrary.org/obo/RO_0000057> ?org . 
-        ?org a foaf:Organization 
+        ?educationalProcess <http://purl.obolibrary.org/obo/RO_0000057> ?org .
+        ?org a foaf:Organization
     }
     FILTER NOT EXISTS {
         ?educationalProcess <http://purl.obolibrary.org/obo/RO_0002234>  ?awardedDegreeNode .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql
index af1e6871ce..eb30cb3ddb 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql
index 40f24583c8..2a632eec39 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
@@ -10,18 +10,18 @@ CONSTRUCT {
     _:vcard a v:Individual .
 } WHERE {
     ?s a foaf:Person
-    FILTER ( 
+    FILTER (
         EXISTS { ?s foaf:firstName ?firstName } ||
         EXISTS { ?s foaf:lastName ?lastName } ||
         EXISTS { ?s vivo:middleName ?middleName } ||
-        EXISTS { ?s vivo:email ?email } || 
+        EXISTS { ?s vivo:email ?email } ||
         EXISTS { ?s vivo:primaryEmail ?primaryEmail } ||
         EXISTS { ?s vivo:phoneNumber ?phoneNumber } ||
         EXISTS { ?s vivo:primaryPhoneNumber ?primaryPhoneNumber } ||
         EXISTS { ?s vivo:faxNumber ?faxNumber } ||
         EXISTS { ?s vivo:mailingAddress ?address } ||
         EXISTS { ?s vivo:webpage ?webpage } ||
-        EXISTS { ?s vivo:preferredTitle ?preferredTitle } ||  
+        EXISTS { ?s vivo:preferredTitle ?preferredTitle } ||
         EXISTS { ?s bibo:prefixName ?prefixName } ||
         EXISTS { ?s bibo:suffixName ?suffixName }
     )
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql
index 1ff6690f39..1dd5932e28 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?s arg:ARG_2000028 _:vcard .
@@ -9,8 +9,8 @@ CONSTRUCT {
     _:vcard a v:Organization .
 } WHERE {
     ?s a foaf:Organization
-    FILTER ( 
-        EXISTS { ?s vivo:email ?email } || 
+    FILTER (
+        EXISTS { ?s vivo:email ?email } ||
         EXISTS { ?s vivo:primaryEmail ?primaryEmail } ||
         EXISTS { ?s vivo:phoneNumber ?phoneNumber } ||
         EXISTS { ?s vivo:primaryPhoneNumber ?primaryPhoneNumber } ||
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql
index 030704e91c..f56eff0269 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?s arg:ARG_2000028 _:vcard .
@@ -9,14 +9,14 @@ CONSTRUCT {
     _:vcard a v:Group .
 } WHERE {
     ?s a foaf:Group
-    FILTER ( 
-        EXISTS { ?s vivo:email ?email } || 
+    FILTER (
+        EXISTS { ?s vivo:email ?email } ||
         EXISTS { ?s vivo:primaryEmail ?primaryEmail } ||
         EXISTS { ?s vivo:phoneNumber ?phoneNumber } ||
         EXISTS { ?s vivo:primaryPhoneNumber ?primaryPhoneNumber } ||
         EXISTS { ?s vivo:faxNumber ?faxNumber } ||
         EXISTS { ?s vivo:mailingAddress ?address } ||
-        EXISTS { ?s vivo:webpage ?webpage } 
-    ) 
+        EXISTS { ?s vivo:webpage ?webpage }
+    )
     FILTER NOT EXISTS { ?s arg:ARG_2000028 ?vcardNode }
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql
index cb90821486..33560713d0 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX owl: <http://www.w3.org/2002/07/owl#>
 
 CONSTRUCT {
@@ -10,14 +10,14 @@ CONSTRUCT {
     _:vcard a v:Kind .
 } WHERE {
     ?s a owl:Thing
-    FILTER ( 
-        EXISTS { ?s vivo:email ?email } || 
+    FILTER (
+        EXISTS { ?s vivo:email ?email } ||
         EXISTS { ?s vivo:primaryEmail ?primaryEmail } ||
         EXISTS { ?s vivo:phoneNumber ?phoneNumber } ||
         EXISTS { ?s vivo:primaryPhoneNumber ?primaryPhoneNumber } ||
         EXISTS { ?s vivo:faxNumber ?faxNumber } ||
         EXISTS { ?s vivo:mailingAddress ?address } ||
-        EXISTS { ?s vivo:webpage ?webpage } 
-    ) 
+        EXISTS { ?s vivo:webpage ?webpage }
+    )
     FILTER NOT EXISTS { ?s arg:ARG_2000028 ?vcardNode }
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql
index db2f6276e1..94da9683ce 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql
index ef2dc2ba1c..e2306dd7cf 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql
index 646344136d..d630cbfa50 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql
index dbcaf50a72..f646059de3 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
@@ -9,7 +9,7 @@ CONSTRUCT {
     _:name a v:Name .
     _:name vivo:middleName ?middleName .
 } WHERE {
-     ?s vivo:middleName ?middleName . 
+     ?s vivo:middleName ?middleName .
      ?s arg:ARG_2000028 ?vcard .
      FILTER NOT EXISTS {
          ?vcard v:hasName ?name
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql
index cb32f1b93d..de437718ad 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql
@@ -1,13 +1,13 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
     ?name vivo:middleName ?middleName .
 } WHERE {
-     ?s vivo:middleName ?middleName . 
+     ?s vivo:middleName ?middleName .
      ?s a foaf:Person .
      ?s arg:ARG_2000028 ?vcard .
      ?vcard v:hasName ?name
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql
index cfa9ea92cf..9cef123753 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
@@ -9,7 +9,7 @@ CONSTRUCT {
     _:name a v:Name .
     _:name v:familyName ?lastName .
 } WHERE {
-     ?s foaf:lastName ?lastName . 
+     ?s foaf:lastName ?lastName .
      ?s arg:ARG_2000028 ?vcard .
      FILTER NOT EXISTS {
          ?vcard v:hasName ?name
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql
index 4337be4d4e..e1d7822d88 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql
@@ -1,13 +1,13 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
     ?name v:familyName ?lastName .
 } WHERE {
-     ?s foaf:lastName ?lastName . 
+     ?s foaf:lastName ?lastName .
      ?s arg:ARG_2000028 ?vcard .
      ?vcard v:hasName ?name
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql
index 66231ddfa6..8d7b2803b4 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
@@ -9,7 +9,7 @@ CONSTRUCT {
     _:name a v:Name .
     _:name v:honorificPrefix ?prefixName .
 } WHERE {
-     ?s bibo:prefixName ?prefixName . 
+     ?s bibo:prefixName ?prefixName .
      ?s arg:ARG_2000028 ?vcard .
      FILTER NOT EXISTS {
          ?vcard v:hasName ?name
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql
index 1eb06b3bc1..2ae254be3c 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql
@@ -1,13 +1,13 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
     ?name v:honorificPrefix ?prefixName .
 } WHERE {
-     ?s bibo:prefixName ?prefixName . 
+     ?s bibo:prefixName ?prefixName .
      ?s arg:ARG_2000028 ?vcard .
      ?vcard v:hasName ?name
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql
index 5d873f15ac..af3755e809 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
@@ -9,7 +9,7 @@ CONSTRUCT {
     _:name a v:Name .
     _:name v:honorificSuffix ?suffixName .
 } WHERE {
-     ?s bibo:suffixName ?suffixName . 
+     ?s bibo:suffixName ?suffixName .
      ?s arg:ARG_2000028 ?vcard .
      FILTER NOT EXISTS {
          ?vcard v:hasName ?name
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql
index a3abaff96b..735c01a0ef 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql
@@ -1,13 +1,13 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
     ?name v:honorificSuffix ?suffixName .
 } WHERE {
-     ?s bibo:suffixName ?suffixName . 
+     ?s bibo:suffixName ?suffixName .
      ?s arg:ARG_2000028 ?vcard .
      ?vcard v:hasName ?name
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql
index 2952d18261..463ffa323a 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?vcard v:hasEmail _:email .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql
index 8699c70320..51f60c3b17 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql
@@ -1,13 +1,13 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?vcard v:hasEmail _:primaryEmail .
     _:primaryEmail a v:Email .
     _:primaryEmail a v:Work .
-    _:primaryEmail v:email ?primaryEmail . 
+    _:primaryEmail v:email ?primaryEmail .
 } WHERE {
      ?s vivo:primaryEmail ?primaryEmail .
      ?s arg:ARG_2000028 ?vcard .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql
index 26017bc1b4..266d839d18 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?vcard v:hasTelephone _:telephone .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql
index 8bc690a0c1..12d11f0e62 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?vcard v:hasTelephone _:primaryTelephone .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql
index c94a763838..076dd00e6b 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql
@@ -1,13 +1,13 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?vcard v:hasTelephone _:fax .
     _:fax a v:Telephone .
     _:fax a v:Fax.
-    _:fax v:telephone ?faxNumber . 
+    _:fax v:telephone ?faxNumber .
 } WHERE {
     ?s vivo:faxNumber ?faxNumber .
     ?s arg:ARG_2000028 ?vcard .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql
index 48c1fd520b..2942ca5a2b 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql
@@ -1,7 +1,7 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?vcard v:hasAddress ?address .
@@ -25,18 +25,18 @@ CONSTRUCT {
         ?address vivo:address1 ?address1 .
         ?address vivo:address2 ?address2 .
         ?address vivo:address3 ?address3 .
-        BIND (CONCAT(?address1, ", ", ?address2, ", ", ?address3)  AS ?streetAddress) 
-    } 
+        BIND (CONCAT(?address1, ", ", ?address2, ", ", ?address3)  AS ?streetAddress)
+    }
     OPTIONAL {
         ?address vivo:address1 ?address1 .
         ?address vivo:address2 ?address2 .
         FILTER NOT EXISTS { ?address vivo:address3 ?address3 }
-        BIND (CONCAT(?address1, ", ", ?address2)  AS ?streetAddress) 
+        BIND (CONCAT(?address1, ", ", ?address2)  AS ?streetAddress)
     }
     OPTIONAL {
         ?address vivo:address1 ?address1
         BIND(?address1 as ?streetAddress)
-    } 
+    }
     FILTER NOT EXISTS {
         ?vcard v:hasAddress ?addressNode
     }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql
index bf8db27aca..db140fb908 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql
@@ -1,8 +1,8 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX arg: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
     ?vcard v:hasURL ?webpage .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql
index 3bb114bdc4..6f9904ad6a 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql
@@ -1,13 +1,13 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
     ?advisor vivo:advisorIn ?advisingRelationship .
-    ?advisingRelationship vivo:advisor ?advisor 
+    ?advisingRelationship vivo:advisor ?advisor
 } WHERE {
     ?advisor vivo:advisorIn ?advisingRelationship .
     OPTIONAL {
-         ?advisingRelationship vivo:advisor ?advisor 
+         ?advisingRelationship vivo:advisor ?advisor
     }
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql
index 6ef6c59e37..18308d7258 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql
index 2c388daf1d..5c74c4c4b7 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql
@@ -1,12 +1,12 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
     ?person vivo:editorOf ?document .
     ?document vivo:editor ?person
 } WHERE {
-    { 
+    {
       ?person vivo:editorOf ?document
     } UNION {
       ?document vivo:editor ?person
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql
index 3a32aa0069..978b2a015e 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql
index f35cb8bdce..d9b05b9102 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql
@@ -1,9 +1,9 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
-    ?role vivo:roleContributesTo ?grant . 
+    ?role vivo:roleContributesTo ?grant .
     ?grant vivo:contributingRole ?role .
 } WHERE {
     ?role vivo:roleContributesTo ?grant .
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql
index e1aa19cbbe..a9f6a1b43b 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql
@@ -1,10 +1,10 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 
 CONSTRUCT {
     ?s vivo:orcidId ?orcidString .
 } WHERE {
-    ?s vivo:orcidId ?orcidString 
+    ?s vivo:orcidId ?orcidString
     FILTER(isLiteral(?orcidString))
     FILTER (regex(str(?orcidString), "^[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9]([0-9]|X)$"))
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql
index f3dd1a5ad9..73f463ae6b 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql
index 4d622fffa3..611e00843d 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql
@@ -1,5 +1,5 @@
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql
index 619bf855ce..6c2f3ef011 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql
@@ -2,7 +2,7 @@ PREFIX arg: <http://purl.obolibrary.org/obo/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
 PREFIX vivo: <http://vivoweb.org/ontology/core#>
-PREFIX bibo: <http://purl.org/ontology/bibo/> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
         ?s foaf:firstName ?firstName .
@@ -11,7 +11,7 @@ CONSTRUCT {
         ?s bibo:prefixName ?prefix .
         ?s bibo:suffixName ?suffix .
         ?s vivo:email ?email .
-        ?s vivo:primaryEmail ?primaryEmail . 
+        ?s vivo:primaryEmail ?primaryEmail .
         ?s vivo:phoneNumber ?phoneNumber .
         ?s vivo:primaryPhoneNumber ?primaryPhoneNumber .
         ?s vivo:faxNumber ?faxNumber .
@@ -35,35 +35,35 @@ CONSTRUCT {
 } WHERE {
     {
         ?s foaf:firstName ?firstName .
-    } 
+    }
     UNION {
         ?s foaf:lastName ?lastName .
-    } 
+    }
     UNION {
         ?s vivo:middleName ?middleName .
         ?s a foaf:Person .
     }
     UNION {
-        ?s bibo:prefixName ?prefix 
-    } 
+        ?s bibo:prefixName ?prefix
+    }
     UNION {
         ?s bibo:suffixName ?suffix
-    } 
+    }
     UNION {
         ?s vivo:email ?email
-    } 
+    }
     UNION {
-        ?s vivo:primaryEmail ?primaryEmail 
-    } 
+        ?s vivo:primaryEmail ?primaryEmail
+    }
     UNION {
-        ?s vivo:phoneNumber ?phoneNumber 
-    } 
+        ?s vivo:phoneNumber ?phoneNumber
+    }
     UNION {
         ?s vivo:primaryPhoneNumber ?primaryPhoneNumber
-    } 
+    }
     UNION {
         ?s vivo:faxNumber ?faxNumber
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
     }
@@ -72,60 +72,60 @@ CONSTRUCT {
     }
     UNION {
         ?s vivo:mailingAddress ?address .
-        ?address a ?addressType 
+        ?address a ?addressType
         FILTER(regex(str(?addressType),"vivoweb.org/ontology/core"))
     }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:address1 ?address1 .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:address2 ?address2 .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:address3 ?address3 .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:addressCity ?city .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:addressState ?state .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:addressPostalCode ?postalCode .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:addressCountry ?country .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?address vivo:hasGeographicLocation ?location .
-    } 
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
         ?location vivo:geographicLocationOf ?address .
-    } 
+    }
     UNION {
-        ?s vivo:webpage ?webpage 
+        ?s vivo:webpage ?webpage
     }
     UNION {
         ?webpage vivo:webpageOf ?s
     }
     UNION {
-        ?s vivo:webpage ?webpage 
-    } 
+        ?s vivo:webpage ?webpage
+    }
     UNION {
         ?s vivo:webpage ?webpage .
-        ?webpage vivo:linkURI ?linkURI 
-    } 
+        ?webpage vivo:linkURI ?linkURI
+    }
     UNION {
         ?s vivo:webpage ?webpage .
-        ?webpage vivo:linkAnchorText ?linkAnchorText 
+        ?webpage vivo:linkAnchorText ?linkAnchorText
     }
 }
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/success.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/success.n3
index d24d34f6c1..3ab3b53e2d 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/success.n3
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/success.n3
@@ -7,4 +7,4 @@
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:updatedOntology <http://vivoweb.org/ontology/core> .
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:fromOntologyVersion "1.5" .
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:toOntologyVersion "1.6" .
- 
+
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/askUpdated.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/askUpdated.sparql
index 96249c5563..e04548418d 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/askUpdated.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/askUpdated.sparql
@@ -1,5 +1,5 @@
-PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> 
-PREFIX owl:   <http://www.w3.org/2002/07/owl#> 
+PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
+PREFIX owl:   <http://www.w3.org/2002/07/owl#>
 PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 
 ASK {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3
index cbeb39207e..5188ef0012 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3
@@ -8,34 +8,34 @@
 @prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
 @prefix role:  <http://vitro.mannlib.cornell.edu/ns/vitro/role#> .
 @prefix local: <http://vitro.mannlib.cornell.edu/ns/vitro/siteConfig/> .
-@prefix vivo: <http://vivoweb.org/ontology/core#> . 
+@prefix vivo: <http://vivoweb.org/ontology/core#> .
 
 @base <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration> .
 
 
 # warning: don't use blank nodes; the display model doesn't currently support them.
 
-<http://purl.obolibrary.org/obo/RO_0000053> 
+<http://purl.obolibrary.org/obo/RO_0000053>
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-<http://purl.obolibrary.org/obo/ARG_2000028> 
+<http://purl.obolibrary.org/obo/ARG_2000028>
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
-  
-vivo:relates 
+
+vivo:relates
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-vivo:relatedBy 
+vivo:relatedBy
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-vivo:assigns 
+vivo:assigns
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-vivo:assignedBy 
+vivo:assignedBy
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3
index abdb9255dd..320f0bcdef 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3
@@ -2901,7 +2901,7 @@ obo:ERO_0000044
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-              
+
 obo:ERO_0001261
       rdfs:label "Analysis Service"@en-US ;
       vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGroupactivities> .
@@ -3097,7 +3097,7 @@ obo:ERO_0000045
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
- 
+
 vivo:Division
       rdfs:label "Division"@en-US ;
       vitro:displayLimitAnnot
@@ -5432,7 +5432,7 @@ obo:ERO_0000482 # deprecated
 #              "true"^^xsd:boolean ;
 #      vitro:inPropertyGroupAnnot
 #              <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-              
+
 vivo:ResearchProposal
       rdfs:label "Research Proposal"@en-US ;
       vitro:displayLimitAnnot
@@ -6134,7 +6134,7 @@ vivo:abbreviation
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-      
+
 
 vcard:postalCode
       rdfs:label "postal code"@en-US .
@@ -6242,7 +6242,7 @@ obo:  rdfs:label "OBO Foundry"@en-US ;
 <http://purl.org/spar/cito/>
     vitro:ontologyPrefixAnnot "cito"^^xsd:string ;
     rdfs:label "CiTO (Citation Typing Ontology)"@en-US .
-        
+
 vivo:providesFundingThrough
       rdfs:label "provides funding through"@en-US ;
       vitro:displayLimitAnnot
@@ -7013,7 +7013,7 @@ vivo:Room
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
 vivo:eRACommonsId
-      rdfs:label "eRA Commons ID"@en-US ; 
+      rdfs:label "eRA Commons ID"@en-US ;
       vitro:displayRankAnnot
               "15"^^xsd:int ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
@@ -7271,7 +7271,7 @@ obo:ERO_0000033
               "true"^^xsd:boolean ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
-              
+
 obo:ERO_0000397
       rdfs:label "performs technique"@en-US ;
       vitro:displayLimitAnnot
@@ -8778,7 +8778,7 @@ obo:ERO_0000919
               "true"^^xsd:boolean ;
       vitro:offerCreateNewOptionAnnot
               "true"^^xsd:boolean .
-              
+
 bibo:status
       rdfs:label "status"@en-US ;
       vitro:displayLimitAnnot
@@ -8867,7 +8867,7 @@ geo:validUntil
       vitro:hiddenFromPublishBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
 
- 
+
 vivo:hasEquipment
       rdfs:label "has equipment"@en-US ;
       vitro:displayRankAnnot
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldVersion/empty.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldVersion/empty.owl
index 64212d5c03..e91796a350 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldVersion/empty.owl
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldVersion/empty.owl
@@ -20,5 +20,5 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:swrl="http://www.w3.org/2003/11/swrl#"
     xmlns:fabio="http://purl.org/spar/fabio/"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
 </rdf:RDF>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/success.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/success.n3
index 53713858c5..70c23f0a1f 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/success.n3
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/success.n3
@@ -7,4 +7,4 @@
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:updatedOntology <http://vivoweb.org/ontology/core> .
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:fromOntologyVersion "1.6" .
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:toOntologyVersion "1.7" .
- 
+
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/askUpdated.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/askUpdated.sparql
index 96249c5563..e04548418d 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/askUpdated.sparql
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/askUpdated.sparql
@@ -1,5 +1,5 @@
-PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> 
-PREFIX owl:   <http://www.w3.org/2002/07/owl#> 
+PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
+PREFIX owl:   <http://www.w3.org/2002/07/owl#>
 PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 
 ASK {
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3
index cbeb39207e..5188ef0012 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3
@@ -8,34 +8,34 @@
 @prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
 @prefix role:  <http://vitro.mannlib.cornell.edu/ns/vitro/role#> .
 @prefix local: <http://vitro.mannlib.cornell.edu/ns/vitro/siteConfig/> .
-@prefix vivo: <http://vivoweb.org/ontology/core#> . 
+@prefix vivo: <http://vivoweb.org/ontology/core#> .
 
 @base <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration> .
 
 
 # warning: don't use blank nodes; the display model doesn't currently support them.
 
-<http://purl.obolibrary.org/obo/RO_0000053> 
+<http://purl.obolibrary.org/obo/RO_0000053>
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-<http://purl.obolibrary.org/obo/ARG_2000028> 
+<http://purl.obolibrary.org/obo/ARG_2000028>
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
-  
-vivo:relates 
+
+vivo:relates
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-vivo:relatedBy 
+vivo:relatedBy
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-vivo:assigns 
+vivo:assigns
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
-vivo:assignedBy 
+vivo:assignedBy
    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody .
 
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3
index abdb9255dd..320f0bcdef 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3
@@ -2901,7 +2901,7 @@ obo:ERO_0000044
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-              
+
 obo:ERO_0001261
       rdfs:label "Analysis Service"@en-US ;
       vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGroupactivities> .
@@ -3097,7 +3097,7 @@ obo:ERO_0000045
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
- 
+
 vivo:Division
       rdfs:label "Division"@en-US ;
       vitro:displayLimitAnnot
@@ -5432,7 +5432,7 @@ obo:ERO_0000482 # deprecated
 #              "true"^^xsd:boolean ;
 #      vitro:inPropertyGroupAnnot
 #              <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-              
+
 vivo:ResearchProposal
       rdfs:label "Research Proposal"@en-US ;
       vitro:displayLimitAnnot
@@ -6134,7 +6134,7 @@ vivo:abbreviation
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
-      
+
 
 vcard:postalCode
       rdfs:label "postal code"@en-US .
@@ -6242,7 +6242,7 @@ obo:  rdfs:label "OBO Foundry"@en-US ;
 <http://purl.org/spar/cito/>
     vitro:ontologyPrefixAnnot "cito"^^xsd:string ;
     rdfs:label "CiTO (Citation Typing Ontology)"@en-US .
-        
+
 vivo:providesFundingThrough
       rdfs:label "provides funding through"@en-US ;
       vitro:displayLimitAnnot
@@ -7013,7 +7013,7 @@ vivo:Room
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
 vivo:eRACommonsId
-      rdfs:label "eRA Commons ID"@en-US ; 
+      rdfs:label "eRA Commons ID"@en-US ;
       vitro:displayRankAnnot
               "15"^^xsd:int ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
@@ -7271,7 +7271,7 @@ obo:ERO_0000033
               "true"^^xsd:boolean ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
-              
+
 obo:ERO_0000397
       rdfs:label "performs technique"@en-US ;
       vitro:displayLimitAnnot
@@ -8778,7 +8778,7 @@ obo:ERO_0000919
               "true"^^xsd:boolean ;
       vitro:offerCreateNewOptionAnnot
               "true"^^xsd:boolean .
-              
+
 bibo:status
       rdfs:label "status"@en-US ;
       vitro:displayLimitAnnot
@@ -8867,7 +8867,7 @@ geo:validUntil
       vitro:hiddenFromPublishBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
 
- 
+
 vivo:hasEquipment
       rdfs:label "has equipment"@en-US ;
       vitro:displayRankAnnot
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldVersion/empty.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldVersion/empty.owl
index 64212d5c03..e91796a350 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldVersion/empty.owl
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldVersion/empty.owl
@@ -20,5 +20,5 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
     xmlns:swrl="http://www.w3.org/2003/11/swrl#"
     xmlns:fabio="http://purl.org/spar/fabio/"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
 </rdf:RDF>
diff --git a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/success.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/success.n3
index 53713858c5..70c23f0a1f 100644
--- a/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/success.n3
+++ b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/success.n3
@@ -7,4 +7,4 @@
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:updatedOntology <http://vivoweb.org/ontology/core> .
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:fromOntologyVersion "1.6" .
 <http://vitro.mannlib.cornell.edu/ns/vitro/metadata/migration/v1.6> vitro:toOntologyVersion "1.7" .
- 
+
diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
index e7bdfa8864..c4bb43e5c8 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -1,92 +1,92 @@
-#
-# ServletContextListeners for VIVO, to be instantiated and run by the StartupManager.
-# 
-# For more information, 
-#     https://sourceforge.net/apps/mediawiki/vivo/index.php?title=The_StartupManager
-#
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.JvmSmokeTests
-
-edu.cornell.mannlib.vitro.webapp.application.ApplicationSetup
-
-edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
-
-edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests
-
-edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings$Setup
-
-edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ComponentsSetup
-
-edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup
-
-edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.ConfigurationModelsSetup
-edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup
-
-edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil$Setup
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
-
-# Invokes process to perform updates to align with ontology changes if needed -->
-# edu.cornell.mannlib.vitro.webapp.migration.rel16.Release16Migrator
-# edu.cornell.mannlib.vitro.webapp.migration.rel17.Release17Migrator
-edu.cornell.mannlib.vitro.webapp.migration.rel18.Release18Migrator
-
-edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ReasonersSetup
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
-
-# Must run after JenaDataSourceSetup
-edu.cornell.mannlib.vitro.webapp.servlet.setup.ThemeInfoSetup
-
-edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry$Setup
-
-edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsSmokeTest
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean$Setup
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CommonPolicyFamilySetup
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.RootUserPolicy$Setup
-
-edu.cornell.mannlib.vivo.auth.policy.SelfEditorRelationshipPolicy$Setup
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.RestrictHomeMenuItemEditingPolicy$Setup
-
-edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup
-
-edu.cornell.mannlib.vitro.webapp.visualization.setup.VisualizationSetup
-
-org.vivoweb.webapp.startup.DataGetterN3Setup
-org.vivoweb.webapp.startup.GeneratorSetup
-org.vivoweb.webapp.startup.JSONWrapperSetup
-org.vivoweb.webapp.startup.MenuManagementSetup
-org.vivoweb.webapp.startup.SiteAdminSetup
-org.vivoweb.webapp.startup.TemplateModelSetup
-org.vivoweb.webapp.startup.SearchResultTemplateModelSetup
-
-edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
-
-# For multiple language support
-edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
-
-# The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper 
-#   and the PermissionRegistry must already be set up.
-edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerSetup
-
-edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
-edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration$Setup
-
-# On shutdown, this will kill the background thread started by Apache Commons File Upload
-org.apache.commons.fileupload.servlet.FileCleanerCleanup
-
-# The VClassGroupCache index uses a "public" permission, so the PropertyRestrictionPolicyHelper 
-#   and the PermissionRegistry must already be set up.
-edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
-
-edu.cornell.mannlib.vivo.orcid.OrcidContextSetup
-
-# This should be near the end, because it will issue a warning if the connection to Solr times out.
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
-
-org.vivoweb.webapp.startup.i18nSetup
+#
+# ServletContextListeners for VIVO, to be instantiated and run by the StartupManager.
+#
+# For more information,
+#     https://sourceforge.net/apps/mediawiki/vivo/index.php?title=The_StartupManager
+#
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.JvmSmokeTests
+
+edu.cornell.mannlib.vitro.webapp.application.ApplicationSetup
+
+edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
+
+edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests
+
+edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings$Setup
+
+edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ComponentsSetup
+
+edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup
+
+edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ConfigurationModelsSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup
+
+edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil$Setup
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
+
+# Invokes process to perform updates to align with ontology changes if needed -->
+# edu.cornell.mannlib.vitro.webapp.migration.rel16.Release16Migrator
+# edu.cornell.mannlib.vitro.webapp.migration.rel17.Release17Migrator
+edu.cornell.mannlib.vitro.webapp.migration.rel18.Release18Migrator
+
+edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ReasonersSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
+
+# Must run after JenaDataSourceSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ThemeInfoSetup
+
+edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry$Setup
+
+edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsSmokeTest
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean$Setup
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CommonPolicyFamilySetup
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.RootUserPolicy$Setup
+
+edu.cornell.mannlib.vivo.auth.policy.SelfEditorRelationshipPolicy$Setup
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.RestrictHomeMenuItemEditingPolicy$Setup
+
+edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup
+
+edu.cornell.mannlib.vitro.webapp.visualization.setup.VisualizationSetup
+
+org.vivoweb.webapp.startup.DataGetterN3Setup
+org.vivoweb.webapp.startup.GeneratorSetup
+org.vivoweb.webapp.startup.JSONWrapperSetup
+org.vivoweb.webapp.startup.MenuManagementSetup
+org.vivoweb.webapp.startup.SiteAdminSetup
+org.vivoweb.webapp.startup.TemplateModelSetup
+org.vivoweb.webapp.startup.SearchResultTemplateModelSetup
+
+edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
+
+# For multiple language support
+edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
+
+# The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper
+#   and the PermissionRegistry must already be set up.
+edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerSetup
+
+edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
+edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration$Setup
+
+# On shutdown, this will kill the background thread started by Apache Commons File Upload
+org.apache.commons.fileupload.servlet.FileCleanerCleanup
+
+# The VClassGroupCache index uses a "public" permission, so the PropertyRestrictionPolicyHelper
+#   and the PermissionRegistry must already be set up.
+edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
+
+edu.cornell.mannlib.vivo.orcid.OrcidContextSetup
+
+# This should be near the end, because it will issue a warning if the connection to Solr times out.
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
+
+org.vivoweb.webapp.startup.i18nSetup
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/address/address.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/address/address.sparql
index 5fb4a5c638..2660ebcd0c 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/address/address.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/address/address.sparql
@@ -9,4 +9,4 @@ CONSTRUCT {
      PERSON_URI obo:ARG_2000028 ?vcard .
      ?vcard vcard:hasAddress ?address .
      ?address ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/address/locationOfAddress.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/address/locationOfAddress.sparql
index 5bfba01914..77dd0421c9 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/address/locationOfAddress.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/address/locationOfAddress.sparql
@@ -9,4 +9,4 @@ CONSTRUCT {
      ?vcard vcard:hasAddress ?address .
      ?address obo:RO_0001025 ?geographicLocation .
      ?geographicLocation ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/advising/advisee.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/advisee.sparql
index ba5e8ab6d4..3d0f2e9c89 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/advising/advisee.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/advising/advisee.sparql
@@ -13,4 +13,4 @@ CONSTRUCT {
      ?adviseeRole a core:AdviseeRole .
      ?adviseeRole core:relatedBy ?advisingRelationship .
      ?advisee ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql
index 8311752974..e69b4e418c 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql
@@ -18,4 +18,4 @@ CONSTRUCT {
      ?awardedDegree core:relates ?degree .
      ?degree a core:AcademicDegree .
      ?degree ?property ?object
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql
index ccc4acd426..e764a452ff 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql
@@ -17,4 +17,4 @@ CONSTRUCT {
      ?educationalTraining core:dateTimeInterval ?dateTimeInterval .
      ?dateTimeInterval core:end ?dateTimeValue .
      ?dateTimeValue ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql
index 5332ca7154..ce8d89bc93 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql
@@ -18,4 +18,4 @@ CONSTRUCT {
      ?educationalTraining obo:RO_0000057 ?educationalInstitution .
      ?educationalInstitution a foaf:Organization .
      ?educationalInstitution rdfs:label ?label
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedDegree.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedDegree.sparql
index e3ba5b832e..2573fad332 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedDegree.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedDegree.sparql
@@ -8,4 +8,4 @@ CONSTRUCT {
      ?advisingRelationship a core:AdvisingRelationship .
      ?advisingRelationship core:degreeCandidacy ?degree .
      ?degree ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql
index e417d74fb5..7578b37444 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql
@@ -7,4 +7,4 @@ CONSTRUCT {
      ?advisingRelationship a core:AdvisingRelationship .
      ?advisingRelationship core:advisingContributionTo ?educationalTraining .
      ?educationalTraining ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql
index a0a60c333f..52b893f968 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql
@@ -15,4 +15,4 @@ CONSTRUCT {
      ?advisee core:relates ?educationalTraining .
      ?educationalTraining a core:EducationalProcess .
      ?educationalTraining ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/award/award.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/award/award.sparql
index 353e143fd3..dcfe941dad 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/award/award.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/award/award.sparql
@@ -5,7 +5,7 @@ CONSTRUCT {
 } WHERE {
      PERSON_URI core:relatedBy ?awardReceipt .
      ?awardReceipt a core:AwardReceipt .
-     ?awardReceipt core:relates ?award . 
+     ?awardReceipt core:relates ?award .
      ?award a core:Award .
      ?award ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/award/conferringOrganization.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/award/conferringOrganization.sparql
index 2c735ba4ec..6c95f368b3 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/award/conferringOrganization.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/award/conferringOrganization.sparql
@@ -6,7 +6,7 @@ CONSTRUCT {
 } WHERE {
      PERSON_URI core:relatedBy ?awardReceipt .
      ?awardReceipt a core:AwardReceipt .
-     ?awardReceipt core:assignedBy ?organization . 
+     ?awardReceipt core:assignedBy ?organization .
      ?organization a foaf:Organization .
      ?organization ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/award/sponsoringOrganization.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/award/sponsoringOrganization.sparql
index e686fa86be..c2e3730796 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/award/sponsoringOrganization.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/award/sponsoringOrganization.sparql
@@ -6,8 +6,8 @@ CONSTRUCT {
 } WHERE {
      PERSON_URI core:relatedBy ?awardReceipt .
      ?awardReceipt a core:AwardReceipt .
-     ?awardReceipt core:relates ?award . 
+     ?awardReceipt core:relates ?award .
      ?award a core:Award .
      ?award core:sponsoredBy ?organization .
      ?organization ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/credential/credential.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/credential.sparql
index 124317f08c..e68d14c985 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/credential/credential.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/credential/credential.sparql
@@ -3,9 +3,9 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?credential ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential a core:IssuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential .
+     ?issuedCredential a core:IssuedCredential .
      ?issuedCredential core:relates ?credential .
      ?credential a core:Credential .
      ?credential ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql
index 79bb6cb2fa..6e77b1d123 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql
@@ -3,10 +3,10 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?organization ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential a core:IssuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential .
+     ?issuedCredential a core:IssuedCredential .
      ?issuedCredential core:relates ?credential .
      ?credential a core:Credential .
      ?credential core:hasGoverningAuthority ?organization .
      ?organization ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/credential/eligibleForCredential.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/eligibleForCredential.sparql
index bd8ae3ef1c..15a73fefb5 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/credential/eligibleForCredential.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/credential/eligibleForCredential.sparql
@@ -3,6 +3,6 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?credential ?property ?object .
 } WHERE {
-     PERSON_URI core:eligibleFor ?credential . 
+     PERSON_URI core:eligibleFor ?credential .
      ?credential ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredential.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredential.sparql
index e055c15320..f68d58a3c6 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredential.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredential.sparql
@@ -3,7 +3,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?issuedCredential ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential a core:IssuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential .
+     ?issuedCredential a core:IssuedCredential .
      ?issuedCredential ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql
index d59f511986..aff19623cd 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql
@@ -4,10 +4,10 @@ CONSTRUCT {
      ?date ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential a core:IssuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential .
+     ?issuedCredential a core:IssuedCredential .
      ?issuedCredential core:expirationDate ?date .
      ?date ?property ?object .
      ?date core:dateTimePrecision ?precision .
      ?precision ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql
index 22a41b166c..6794a03236 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql
@@ -4,10 +4,10 @@ CONSTRUCT {
      ?date ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential a core:IssuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential .
+     ?issuedCredential a core:IssuedCredential .
      ?issuedCredential core:dateIssued ?date .
      ?date ?property ?object .
      ?date core:dateTimePrecision ?precision .
      ?precision ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql
index afc265c93e..cda40d7ab9 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql
@@ -3,8 +3,8 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?subjectArea ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential a core:IssuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential .
+     ?issuedCredential a core:IssuedCredential .
      ?issuedCredential core:hasSubjectArea ?subjectArea .
      ?subjectArea ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql
index 2b43a303bd..dc4836a00a 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql
@@ -4,7 +4,7 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?educationalTraining ?property ?object .
 } WHERE {
-     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining a core:EducationalProcess . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql
index 27fb75083c..931b2faf7c 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql
@@ -4,11 +4,11 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?degree ?property ?object .
 } WHERE {
-     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining a core:EducationalProcess . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining obo:RO_0002234 ?awardedDegree .
      ?awardedDegree a core:AwardedDegree .
      ?awardedDegree core:relates ?degree .
      ?degree a core:AcademicDegree .
      ?degree ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql
index 1ccdd587ba..524bf24aee 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql
@@ -5,9 +5,9 @@ CONSTRUCT {
      ?dateTimeInterval core:end ?date .
      ?date ?property ?object .
 } WHERE {
-     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining a core:EducationalProcess . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining core:dateTimeInterval ?dateTimeInterval .
      ?dateTimeInterval core:end ?date .
      ?date ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql
index 2edff7fe6c..9b149ea83a 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql
@@ -5,11 +5,11 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 CONSTRUCT {
      ?geographicLocation ?property ?object .
 } WHERE {
-     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining a core:EducationalProcess . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining obo:RO_0000057 ?organization .
      ?organization a foaf:Organization .
      ?organization obo:RO_0001025 ?geographicLocation .
      ?geographicLocation a core:GeographicLocation .
      ?geographicLocation ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql
index 188ea66129..e8f317c31d 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql
@@ -5,9 +5,9 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 CONSTRUCT {
      ?organization ?property ?object .
 } WHERE {
-     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining a core:EducationalProcess . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining obo:RO_0000057 ?organization .
      ?organization a foaf:Organization .
      ?organization ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql
index f7ed31f41e..736a30d430 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql
@@ -4,9 +4,9 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?date ?property ?object .
 } WHERE {
-     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining a core:EducationalProcess . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining core:dateTimeInterval ?dateTimeInterval .
      ?dateTimeInterval core:start ?date .
      ?date ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/funding/grantAwardedBy.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/funding/grantAwardedBy.sparql
index 8b03e590f0..5bd717de6f 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/funding/grantAwardedBy.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/funding/grantAwardedBy.sparql
@@ -3,7 +3,7 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
-     ?awardingOrganization rdfs:label ?label 
+     ?awardingOrganization rdfs:label ?label
 } WHERE {
     {
       {PERSON_URI core:relatedBy ?investigatorRole .
@@ -12,12 +12,12 @@ CONSTRUCT {
         union
       {PERSON_URI core:relatedBy ?investigatorRole .
        ?investigatorRole a core:CoPrincipalInvestigatorRole
-      }   
+      }
      }
-     
+
      ?investigatorRole core:relatedBy ?grant .
      ?grant a core:Grant .
      ?grant core:assignedBy ?awardingOrganization .
      ?awardingOrganization a foaf:Organization .
-     ?awardingOrganization rdfs:label ?label 
-}
\ No newline at end of file
+     ?awardingOrganization rdfs:label ?label
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/funding/grants.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/funding/grants.sparql
index 3d0df166bb..5c701b698f 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/funding/grants.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/funding/grants.sparql
@@ -12,10 +12,10 @@ CONSTRUCT {
          union
        { PERSON_URI core:relatedBy ?investigatorRole .
          ?investigatorRole a core:CoPrincipalInvestigatorRole
-       }   
+       }
      }
-     
+
      ?investigatorRole core:relatedBy ?grant .
      ?grant a core:Grant .
-     ?grant ?property ?object 
-}
\ No newline at end of file
+     ?grant ?property ?object
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/membership/memberRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/membership/memberRoleIn.sparql
index 165c83c8cc..eda869b74b 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/membership/memberRoleIn.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/membership/memberRoleIn.sparql
@@ -8,4 +8,4 @@ CONSTRUCT {
      ?memberRole a core:MemberRole .
      ?memberRole core:roleContributesTo ?endeavor .
      ?endeavor ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/outreach/outreachRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/outreach/outreachRoleIn.sparql
index c0c6e60a45..c05fc791a1 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/outreach/outreachRoleIn.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/outreach/outreachRoleIn.sparql
@@ -8,4 +8,4 @@ CONSTRUCT {
      ?outreachRole a core:OutreachProviderRole .
      ?outreachRole core:roleContributesTo ?endeavor .
      ?endeavor ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/patent/assignee.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/assignee.sparql
index 48c11d3027..1fbea85543 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/patent/assignee.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/patent/assignee.sparql
@@ -3,12 +3,12 @@ PREFIX rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
 
 CONSTRUCT {
-     ?assignee ?property ?object .   
+     ?assignee ?property ?object .
 } WHERE {
      PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
-     ?authorship core:relates ?patent . 
+     ?authorship core:relates ?patent .
      ?patent rdf:type bibo:Patent .
      ?patent core:assignee ?assignee .
-     ?assignee ?property ?object .   
-}
\ No newline at end of file
+     ?assignee ?property ?object .
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/patent/inventors.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/inventors.sparql
index f14a7994fe..e9068d0b53 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/patent/inventors.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/patent/inventors.sparql
@@ -4,13 +4,13 @@ PREFIX bibo: <http://purl.org/ontology/bibo/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
-     ?person ?property ?object .   
+     ?person ?property ?object .
 } WHERE {
      PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
-     ?authorship core:relates ?patent . 
+     ?authorship core:relates ?patent .
      ?patent rdf:type bibo:Patent .
      ?authorship core:relates ?person .
      ?person a foaf:Person .
-     ?person ?property ?object .   
-}
\ No newline at end of file
+     ?person ?property ?object .
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/patent/patent.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patent.sparql
index 2cd24159ce..3d76a50017 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/patent/patent.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patent.sparql
@@ -5,9 +5,9 @@ PREFIX bibo: <http://purl.org/ontology/bibo/>
 CONSTRUCT {
      ?patent ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?patent .
      ?patent rdf:type bibo:Patent .
      ?patent ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentFiledDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentFiledDate.sparql
index 13dd7506da..f47fe12d8f 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentFiledDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentFiledDate.sparql
@@ -14,4 +14,4 @@ CONSTRUCT {
      ?date ?property ?object .
      ?date core:dateTimePrecision ?precision .
      ?precision ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentIssuedDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentIssuedDate.sparql
index 16785dc440..7d1689b3ca 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentIssuedDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentIssuedDate.sparql
@@ -14,4 +14,4 @@ CONSTRUCT {
      ?date ?property ?object .
      ?date core:dateTimePrecision ?precision .
      ?precision ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/position/locationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/locationForPosition.sparql
index e1ad43bc22..1b2cd38692 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/position/locationForPosition.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/position/locationForPosition.sparql
@@ -7,10 +7,10 @@ CONSTRUCT {
      ?organization core:hasGeographicLocation ?geographicLocation .
      ?geographicLocation rdfs:label ?label .
 } WHERE {
-     PERSON_URI core:relatedBy ?position . 
+     PERSON_URI core:relatedBy ?position .
      ?position a core:Position .
      ?position core:relates ?organization .
-     ?organization a foaf:Organization . 
+     ?organization a foaf:Organization .
      ?organization obo:RO_0001025 ?geographicLocation .
      ?geographicLocation rdfs:label ?label .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/position/organizationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/organizationForPosition.sparql
index dd9d5e0d1a..164c65f01d 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/position/organizationForPosition.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/position/organizationForPosition.sparql
@@ -6,9 +6,9 @@ CONSTRUCT {
      ?position core:positionInOrganization ?organization .
      ?organization rdfs:label ?label .
 } WHERE {
-     PERSON_URI core:relatedBy ?position . 
+     PERSON_URI core:relatedBy ?position .
      ?position a core:Position .
      ?position core:relates ?organization .
-     ?organization a foaf:Organization . 
+     ?organization a foaf:Organization .
      ?organization rdfs:label ?label .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/position/subOrganizationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/subOrganizationForPosition.sparql
index 6748f690f0..ae08da7cb5 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/position/subOrganizationForPosition.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/position/subOrganizationForPosition.sparql
@@ -7,10 +7,10 @@ CONSTRUCT {
      ?organization core:hasSubOrganization ?subOrganization .
      ?subOrganization rdfs:label ?label .
 } WHERE {
-     PERSON_URI core:relatedBy ?position . 
+     PERSON_URI core:relatedBy ?position .
      ?position a core:Position .
      ?position core:relates ?organization .
-     ?organization a foaf:Organization . 
+     ?organization a foaf:Organization .
      ?organization obo:BFO_0000050 ?subOrganization .
      ?subOrganization rdfs:label ?label .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/position/superOrganizationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/superOrganizationForPosition.sparql
index 83f531475f..3e5944b8d2 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/position/superOrganizationForPosition.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/position/superOrganizationForPosition.sparql
@@ -5,10 +5,10 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?superOrganization ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?position . 
+     PERSON_URI core:relatedBy ?position .
      ?position a core:Position .
      ?position core:relates ?organization .
-     ?organization a foaf:Organization . 
+     ?organization a foaf:Organization .
      ?organization obo:BFO_0000051 ?superOrganization .
      ?superOrganization ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingName.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingName.sparql
index cb0c8b06d8..94c35fdb23 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingName.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingName.sparql
@@ -10,4 +10,4 @@ CONSTRUCT {
      ?presenterRole obo:BFO_0000054 ?presentation .
      ?presentation obo:BFO_0000050 ?containingEvent .
      ?containingEvent rdfs:label ?containingEventName
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/presentation/presenterRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
index b4b46ff6ea..6ae4ae5614 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
@@ -3,12 +3,12 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
-     ?presentation rdfs:label ?presentationTitle . 
+     ?presentation rdfs:label ?presentationTitle .
      ?presenterRole rdfs:label ?roleLabel .
 } WHERE {
      PERSON_URI obo:RO_0000053 ?presenterRole .
      ?presenterRole a core:PresenterRole .
      ?presenterRole rdfs:label ?roleLAbel .
-     ?presenterRole obo:BFO_0000054 ?presentation .     
+     ?presenterRole obo:BFO_0000054 ?presentation .
      ?presentation rdfs:label ?presentationTitle .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/associatedJournal.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/associatedJournal.sparql
index bf2582cbc9..36f977ed25 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/associatedJournal.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/associatedJournal.sparql
@@ -2,12 +2,12 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
-     ?publicationVenue ?property ?object .   
+     ?publicationVenue ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication core:hasPublicationVenue ?publicationVenue .
-     ?publicationVenue ?property ?object .   
-}
\ No newline at end of file
+     ?publicationVenue ?property ?object .
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/authors.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/authors.sparql
index bc1105b12b..06f0a5103c 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/authors.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/authors.sparql
@@ -4,9 +4,9 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?coAuthorship ?property1 ?object1 .
-     ?person ?property2 ?object2 .   
+     ?person ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
@@ -16,4 +16,4 @@ CONSTRUCT {
      ?coAuthorship core:relates ?person .
      ?person a foaf:Person .
      ?person ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEvent.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEvent.sparql
index a7e4bb3426..20cbb17770 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEvent.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEvent.sparql
@@ -6,10 +6,10 @@ PREFIX bibo: <http://purl.org/ontology/bibo/>
 CONSTRUCT {
      ?event ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication bibo:presentedAt ?event .
      ?event ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql
index 6e3cfd9472..439e8c73c9 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql
@@ -6,7 +6,7 @@ CONSTRUCT {
      ?endDate ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
@@ -16,4 +16,4 @@ CONSTRUCT {
      ?dateTimeInterval core:end ?endDate .
      ?endDate core:dateTimePrecision ?precision .
      ?precision ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql
index ebddb52eea..fdf1e0483e 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql
@@ -6,11 +6,11 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?location rdfs:label ?locationName .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication bibo:presentedAt ?event .
      ?event obo:RO_0001025 ?location .
      ?location rdfs:label ?locationName .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql
index 3a85c078d8..2253b21b7d 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql
@@ -6,7 +6,7 @@ CONSTRUCT {
      ?startDate ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
@@ -16,4 +16,4 @@ CONSTRUCT {
      ?dateTimeInterval core:start ?startDate .
      ?startDate core:dateTimePrecision ?precision .
      ?precision ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publication.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publication.sparql
index 1ab4318aa6..80e84f9388 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publication.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publication.sparql
@@ -4,9 +4,9 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?publication ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationDate.sparql
index 0f2fb63d77..05b3c6a566 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationDate.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationDate.sparql
@@ -5,7 +5,7 @@ CONSTRUCT {
      ?date ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
@@ -13,4 +13,4 @@ CONSTRUCT {
      ?date ?property ?object .
      ?date core:dateTimePrecision ?precision .
      ?precision ?property2 ?object2 .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql
index f37a43dc28..52651230dd 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql
@@ -4,10 +4,10 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?informationResource ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication obo:BFO_0000050 ?informationResource .
      ?informationResource ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationReproducedIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationReproducedIn.sparql
index 3b751a9e4e..529a953ac6 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationReproducedIn.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationReproducedIn.sparql
@@ -3,12 +3,12 @@ PREFIX bibo: <http://purl.org/ontology/bibo/>
 PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
-     ?informationResource ?property ?object .   
+     ?informationResource ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication bibo:reproducedIn ?informationResource .
-     ?informationResource ?property ?object .   
-}
\ No newline at end of file
+     ?informationResource ?property ?object .
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationStatus.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationStatus.sparql
index e1cb2f2554..d2eb5bf29b 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationStatus.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationStatus.sparql
@@ -5,10 +5,10 @@ PREFIX obo: <http://purl.obolibrary.org/obo/>
 CONSTRUCT {
      ?publicationStatus ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication bibo:status ?publicationStatus .
      ?publicationStatus ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationURL.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationURL.sparql
index 47f0de80da..b44632808a 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationURL.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationURL.sparql
@@ -5,11 +5,11 @@ PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
 CONSTRUCT {
      ?urllink ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication obo:ARG_2000028 ?vcard .
      ?vcard vcard:hasURL ?urllink .
      ?urllink ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant1.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant1.sparql
index 4ae35fd063..f2f599b16e 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant1.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant1.sparql
@@ -2,13 +2,13 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
-     ?publisher ?property ?object .   
+     ?publisher ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
      ?publication core:hasPublicationVenue ?publicationVenue .
-     ?publicationVenue core:publisher ?publisher . 
-     ?publisher ?property ?object .  
-}
\ No newline at end of file
+     ?publicationVenue core:publisher ?publisher .
+     ?publisher ?property ?object .
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant2.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant2.sparql
index 6d55262503..621503135e 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant2.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant2.sparql
@@ -2,12 +2,12 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
-     ?publisher ?property ?object .   
+     ?publisher ?property ?object .
 } WHERE {
-     PERSON_URI core:relatedBy ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
      ?authorship a core:Authorship .
      ?authorship core:relates ?publication .
      ?publication a obo:IAO_0000030 .
-     ?publication core:publisher ?publisher . 
-     ?publisher ?property ?object .  
-}
\ No newline at end of file
+     ?publication core:publisher ?publisher .
+     ?publisher ?property ?object .
+}
diff --git a/webapp/src/main/webapp/WEB-INF/rich-export/teaching/teacherRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/teaching/teacherRoleIn.sparql
index 76ec8cdd4a..adc06cd4ad 100644
--- a/webapp/src/main/webapp/WEB-INF/rich-export/teaching/teacherRoleIn.sparql
+++ b/webapp/src/main/webapp/WEB-INF/rich-export/teaching/teacherRoleIn.sparql
@@ -8,4 +8,4 @@ CONSTRUCT {
      ?teacherRole a core:TeacherRole .
      ?teacherRole obo:BFO_0000054  ?course .
      ?course ?property ?object .
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/WEB-INF/springmvc-beans.xml b/webapp/src/main/webapp/WEB-INF/springmvc-beans.xml
index 057a92fe2f..11715102cf 100644
--- a/webapp/src/main/webapp/WEB-INF/springmvc-beans.xml
+++ b/webapp/src/main/webapp/WEB-INF/springmvc-beans.xml
@@ -9,4 +9,4 @@
     <context:component-scan base-package="edu.cornell.mannlib" />
     <context:component-scan base-package="org.vivoweb" />
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml b/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml
index acc2e5a7fb..ea5f11d5ad 100644
--- a/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml
+++ b/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml
@@ -1,142 +1,142 @@
-<!-- $This file is distributed under the terms of the license in LICENSE$ -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-           http://www.springframework.org/schema/aop
-           http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
-	<bean id="capability_map"
-		  class="edu.cornell.mannlib.vitro.webapp.visualization.capabilitymap.CapabilityMapRequestHandler" />
-
-	<bean id="cumulative_pub_count"
-		  class="edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.CumulativeCountRequestHandler" />
-
-	<bean id="person_pub_count"
-		class="edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountRequestHandler" />
-	
-	<bean id="utilities"
-		class="edu.cornell.mannlib.vitro.webapp.visualization.utilities.UtilitiesRequestHandler" />
-	
-	<bean id="coauthorship"
-		class="edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipRequestHandler" />
-		
-	<bean id="person_grant_count"
-		class="edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountRequestHandler" />
-	
-	<bean id="person_level"
-		class="edu.cornell.mannlib.vitro.webapp.visualization.personlevel.PersonLevelRequestHandler" />
-
-	<bean id="coprincipalinvestigator"
-		class="edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountRequestHandler" />
-
-    <bean id="pub_temporal"
-        class="edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph.TemporalPublicationVisualizationRequestHandler" />		
-
-    <bean id="grant_temporal"
-        class="edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph.TemporalGrantVisualizationRequestHandler" />	
-	
-    <bean id="map_of_science"
-        class="edu.cornell.mannlib.vitro.webapp.visualization.mapofscience.MapOfScienceVisualizationRequestHandler" />
-	
-	<bean id="regenerate_vis_models"
-        class="edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.ModelConstructorRequestHandler" />
-        
-	<bean id="tools"
-        class="edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler" />
-        
-	<bean id="visualizationInjector"
-		class="edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationInjector">
-		<property name="visualizations">
-			<map>
-				<entry key="capabilitymap">
-					<ref bean="capability_map"></ref>
-				</entry>
-
-				<entry key="cumulative_pub_count">
-					<ref bean="cumulative_pub_count"></ref>
-				</entry>
-
-				<entry key="person_pub_count">
-					<ref bean="person_pub_count"></ref>
-				</entry>
-				
-				<entry key="utilities">
-					<ref bean="utilities"></ref>
-				</entry>
-				
-				<entry key="coauthorship">
-					<ref bean="coauthorship"></ref>
-				</entry>
-				
-				<entry key="person_grant_count">
-					<ref bean="person_grant_count"></ref>
-				</entry>
-				
-				<entry key="person_level">
-					<ref bean="person_level"></ref>
-				</entry>
-				
-				<entry key="author-network">
-					<ref bean="person_level"></ref>
-				</entry>
-				
-				<entry key="investigator-network">
-					<ref bean="person_level"></ref>
-				</entry>
-                
-                <!-- 
-                <entry key="entity_comparison">
-                    <ref bean="entity_comparison"></ref>
-                </entry>
-                -->
-                
-                <entry key="entity_comparison">
-                    <ref bean="pub_temporal"></ref>
-                </entry>
-                                
-                <entry key="pub_temporal">
-                    <ref bean="pub_temporal"></ref>
-                </entry>
-                
-                <entry key="publication-graph">
-                    <ref bean="pub_temporal"></ref>
-                </entry>
-
-				<entry key="coprincipalinvestigator">
-					<ref bean="coprincipalinvestigator"></ref>
-				</entry>
-				
-				<entry key="entity_grant_count">
-					<ref bean="grant_temporal"></ref>
-				</entry>	
-				                                
-                <entry key="grant_temporal">
-                    <ref bean="grant_temporal"></ref>
-                </entry>
-                
-                <entry key="grant-graph">
-                    <ref bean="grant_temporal"></ref>
-                </entry>                			
-				 
-                <entry key="map-of-science">
-                    <ref bean="map_of_science"></ref>
-                </entry>    
-                
-				<entry key="refresh-cache">
-                    <ref bean="regenerate_vis_models"></ref>
-                </entry>
-                
-                <entry key="tools">
-                    <ref bean="tools"></ref>
-                </entry>    				 
-				 
-			</map>
-		</property>
-
-	</bean>
-
+<!-- $This file is distributed under the terms of the license in LICENSE$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/aop
+           http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+	<bean id="capability_map"
+		  class="edu.cornell.mannlib.vitro.webapp.visualization.capabilitymap.CapabilityMapRequestHandler" />
+
+	<bean id="cumulative_pub_count"
+		  class="edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.CumulativeCountRequestHandler" />
+
+	<bean id="person_pub_count"
+		class="edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountRequestHandler" />
+
+	<bean id="utilities"
+		class="edu.cornell.mannlib.vitro.webapp.visualization.utilities.UtilitiesRequestHandler" />
+
+	<bean id="coauthorship"
+		class="edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipRequestHandler" />
+
+	<bean id="person_grant_count"
+		class="edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountRequestHandler" />
+
+	<bean id="person_level"
+		class="edu.cornell.mannlib.vitro.webapp.visualization.personlevel.PersonLevelRequestHandler" />
+
+	<bean id="coprincipalinvestigator"
+		class="edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountRequestHandler" />
+
+    <bean id="pub_temporal"
+        class="edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph.TemporalPublicationVisualizationRequestHandler" />
+
+    <bean id="grant_temporal"
+        class="edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph.TemporalGrantVisualizationRequestHandler" />
+
+    <bean id="map_of_science"
+        class="edu.cornell.mannlib.vitro.webapp.visualization.mapofscience.MapOfScienceVisualizationRequestHandler" />
+
+	<bean id="regenerate_vis_models"
+        class="edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.ModelConstructorRequestHandler" />
+
+	<bean id="tools"
+        class="edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler" />
+
+	<bean id="visualizationInjector"
+		class="edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationInjector">
+		<property name="visualizations">
+			<map>
+				<entry key="capabilitymap">
+					<ref bean="capability_map"></ref>
+				</entry>
+
+				<entry key="cumulative_pub_count">
+					<ref bean="cumulative_pub_count"></ref>
+				</entry>
+
+				<entry key="person_pub_count">
+					<ref bean="person_pub_count"></ref>
+				</entry>
+
+				<entry key="utilities">
+					<ref bean="utilities"></ref>
+				</entry>
+
+				<entry key="coauthorship">
+					<ref bean="coauthorship"></ref>
+				</entry>
+
+				<entry key="person_grant_count">
+					<ref bean="person_grant_count"></ref>
+				</entry>
+
+				<entry key="person_level">
+					<ref bean="person_level"></ref>
+				</entry>
+
+				<entry key="author-network">
+					<ref bean="person_level"></ref>
+				</entry>
+
+				<entry key="investigator-network">
+					<ref bean="person_level"></ref>
+				</entry>
+
+                <!--
+                <entry key="entity_comparison">
+                    <ref bean="entity_comparison"></ref>
+                </entry>
+                -->
+
+                <entry key="entity_comparison">
+                    <ref bean="pub_temporal"></ref>
+                </entry>
+
+                <entry key="pub_temporal">
+                    <ref bean="pub_temporal"></ref>
+                </entry>
+
+                <entry key="publication-graph">
+                    <ref bean="pub_temporal"></ref>
+                </entry>
+
+				<entry key="coprincipalinvestigator">
+					<ref bean="coprincipalinvestigator"></ref>
+				</entry>
+
+				<entry key="entity_grant_count">
+					<ref bean="grant_temporal"></ref>
+				</entry>
+
+                <entry key="grant_temporal">
+                    <ref bean="grant_temporal"></ref>
+                </entry>
+
+                <entry key="grant-graph">
+                    <ref bean="grant_temporal"></ref>
+                </entry>
+
+                <entry key="map-of-science">
+                    <ref bean="map_of_science"></ref>
+                </entry>
+
+				<entry key="refresh-cache">
+                    <ref bean="regenerate_vis_models"></ref>
+                </entry>
+
+                <entry key="tools">
+                    <ref bean="tools"></ref>
+                </entry>
+
+			</map>
+		</property>
+
+	</bean>
+
 </beans>
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
index 3297931eca..706e999d60 100644
--- a/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -42,9 +42,9 @@
 
   <!-- Listeners ****************************************************** -->
 
-  <!-- 
-      StartupManager instantiates and runs the listeners from startup_listeners.txt 
-      All ServletContextListeners should be listed there, not here.           
+  <!--
+      StartupManager instantiates and runs the listeners from startup_listeners.txt
+      All ServletContextListeners should be listed there, not here.
   -->
   <listener>
     <listener-class>edu.cornell.mannlib.vitro.webapp.startup.StartupManager</listener-class>
@@ -159,7 +159,7 @@
 -->
 
   <!-- ==================== mime types ============================== -->
-  
+
   <mime-mapping>
     <extension>css</extension>
     <mime-type>text/css</mime-type>
@@ -212,7 +212,7 @@
     <extension>xml</extension>
     <mime-type>application/xml</mime-type>
   </mime-mapping>
-    
+
   <!-- ==================== tag libraries ============================== -->
   <jsp-config>
     <taglib>
diff --git a/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml b/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml
index dbb8f48d48..ecc565ca4f 100644
--- a/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml
@@ -4,10 +4,10 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        
-        SELECT DISTINCT ?vcard 
+
+        SELECT DISTINCT ?vcard
                         ?email
                         ?emailAddress
         WHERE {
@@ -19,7 +19,7 @@
                 ?vcard vcard:hasEmail ?email .</precise-subquery>
                 ?email a vcard:Work .
             }
-        } 
+        }
     </query-select>
 
     <template>propStatement-emailAddress.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
index 57320ed9d8..9acb938c87 100644
--- a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
@@ -6,7 +6,7 @@
 <list-view-config>
     <query-select>
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
-        
+
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
index cc614d4c7b..211f5c7e3f 100644
--- a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
@@ -7,7 +7,7 @@
     <query-select>
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        
+
 
         SELECT DISTINCT ?dateTimeInterval ?label
             ?valueStart ?valueStartName
diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
index 59c77030fd..d2eae7b82f 100644
--- a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
@@ -4,13 +4,13 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>     
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
+    <query-select>
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        
-        
-        SELECT DISTINCT ?dateTimeValue 
-                        (REPLACE(STR(?dateTimePrecision),"^.*(#)(.*)$", "$2") AS ?precision) 
+
+
+        SELECT DISTINCT ?dateTimeValue
+                        (REPLACE(STR(?dateTimePrecision),"^.*(#)(.*)$", "$2") AS ?precision)
                         ?dateTime
         WHERE {
             ?subject ?property ?dateTimeValue .
@@ -25,7 +25,7 @@
             <critical-data-required>
             FILTER ( bound(?dateTime) )
             </critical-data-required>
-        }  
+        }
     </query-select>
 
     <template>propStatement-dateTimeValue.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-default.xml b/webapp/src/main/webapp/config/listViewConfig-default.xml
index 46d9825f66..b497c41fd4 100644
--- a/webapp/src/main/webapp/config/listViewConfig-default.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-default.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- VIVO-specific default list view config file for object properties 
-    
+<!-- VIVO-specific default list view config file for object properties
+
      See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
     <query-select>
-        
+
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml b/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml
index 6dd9e47816..5245714e00 100644
--- a/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml
@@ -4,15 +4,15 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;   
+    <query-select>
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT DISTINCT ?awardedDegree
                         ?degree
-                        ?degreeName 
-                        ?degreeAbbr 
+                        ?degreeName
+                        ?degreeAbbr
             WHERE {
                 ?subject ?property ?awardedDegree .
                 ?awardedDegree a core:AwardedDegree .
@@ -26,7 +26,7 @@
                     ?degree a core:AcademicDegree .
                     ?degree core:abbreviation ?degreeAbbr .
                 }
-            }  
+            }
     </query-select>
 
     <template>propStatement-degreeEarned.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-doi.xml b/webapp/src/main/webapp/config/listViewConfig-doi.xml
index 5df4045c28..3cd5e6ae90 100644
--- a/webapp/src/main/webapp/config/listViewConfig-doi.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-doi.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- VIVO-specific default list view config file for object properties 
-    
+<!-- VIVO-specific default list view config file for object properties
+
      See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
-          
+    <query-select>
+
         SELECT ?value
         WHERE {
             ?subject ?property ?value .
diff --git a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
index c7ede94f5e..dec4749722 100644
--- a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- VIVO-specific default list view config file for object properties 
-    
+<!-- VIVO-specific default list view config file for object properties
+
      See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
     <query-select>
-        
+
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml b/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml
index f6ec1fda26..5b6a5a96c3 100644
--- a/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml
@@ -4,9 +4,9 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        
+
         SELECT DISTINCT ?vcard ?phone
                         ?number
         WHERE {
@@ -14,7 +14,7 @@
             ?vcard vcard:hasTelephone ?phone .
             ?phone a vcard:Fax .
             ?phone vcard:telephone ?number .
-        } 
+        }
     </query-select>
 
     <template>propStatement-phoneFaxNumber.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-fullName.xml b/webapp/src/main/webapp/config/listViewConfig-fullName.xml
index fac875a02f..1c5df79bf7 100644
--- a/webapp/src/main/webapp/config/listViewConfig-fullName.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-fullName.xml
@@ -4,10 +4,10 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        
+
         SELECT DISTINCT ?vcard ?fullName
                         ?firstName
                         ?middleName
@@ -42,7 +42,7 @@
                 ?vcard vcard:hasName ?fullName .</precise-subquery>
                 ?fullName vcard:honorificPrefix ?prefix .
             }
-        } 
+        }
     </query-select>
 
     <template>propStatement-fullName.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml b/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml
index d2254f7375..c3a05ebaec 100644
--- a/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml
@@ -4,7 +4,7 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
index c7c036f2f2..9d563cc6b0 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
-
-<list-view-config>
-    <query-select>    
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
-        PREFIX vivo: &lt;http://vivoweb.org/ontology/core#&gt;
-        PREFIX rdf:  &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&gt;
-        
-        
-        SELECT ?concept ?conceptLabel ?conceptName ?vocabularySource ?vocabularySourceName
-        WHERE {
-         	?subject ?property ?concept .
-         	LET (?conceptName := REPLACE(STR(?concept),"^.*(#)(.*)$", "$2")) 
-         	OPTIONAL {
-                <precise-subquery>?subject ?property ?concept .</precise-subquery>
-                ?concept rdfs:label ?conceptLabel .
-            }
-         	OPTIONAL {
-                <precise-subquery>?subject ?property ?concept .</precise-subquery>
-                ?concept rdfs:isDefinedBy ?vocabularySource .
-                OPTIONAL {
-                    <precise-subquery>?subject ?property ?concept .
-                    ?concept rdfs:isDefinedBy ?vocabularySource .</precise-subquery>
-                    ?vocabularySource rdfs:label ?vocabularySourceName .
-                }
-            }
-        } ORDER BY ?conceptLabel ?conceptName 
-    </query-select>
-
-    <template>propStatement-hasAssociatedConcept.ftl</template>
-</list-view-config>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
+
+<list-view-config>
+    <query-select>
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
+        PREFIX vivo: &lt;http://vivoweb.org/ontology/core#&gt;
+        PREFIX rdf:  &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&gt;
+
+
+        SELECT ?concept ?conceptLabel ?conceptName ?vocabularySource ?vocabularySourceName
+        WHERE {
+         	?subject ?property ?concept .
+         	LET (?conceptName := REPLACE(STR(?concept),"^.*(#)(.*)$", "$2"))
+         	OPTIONAL {
+                <precise-subquery>?subject ?property ?concept .</precise-subquery>
+                ?concept rdfs:label ?conceptLabel .
+            }
+         	OPTIONAL {
+                <precise-subquery>?subject ?property ?concept .</precise-subquery>
+                ?concept rdfs:isDefinedBy ?vocabularySource .
+                OPTIONAL {
+                    <precise-subquery>?subject ?property ?concept .
+                    ?concept rdfs:isDefinedBy ?vocabularySource .</precise-subquery>
+                    ?vocabularySource rdfs:label ?vocabularySourceName .
+                }
+            }
+        } ORDER BY ?conceptLabel ?conceptName
+    </query-select>
+
+    <template>propStatement-hasAssociatedConcept.ftl</template>
+</list-view-config>
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
index 4bc8616fd1..3b7bc325de 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        
+
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX vivo:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
index 5c53b02979..b6442841c6 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        
+
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
index f5a204df6a..c87854f040 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
@@ -4,20 +4,20 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
-        
+    <query-select>
+
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT DISTINCT <collated> ?subclass </collated>
                         ?role
                         ?subclassLabel
-                        ?activity 
+                        ?activity
                         (REPLACE(STR(?activity),"^.*(#)(.*)$", "$2") AS ?activityLocal)
                         ?activityName
-                        ?dateTimeStart 
-                        ?dateTimeEnd 
+                        ?dateTimeStart
+                        ?dateTimeEnd
         WHERE {
             ?subject ?property ?role .
             ?role a core:EditorRole .
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
index e6e6eac48d..df031ec96d 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        
+
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
index c14ca95135..7d0aa24fff 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
@@ -7,22 +7,22 @@
 <!-- a conference, such as a workshop or session or exhibit.  tlw72 -->
 
 <list-view-config>
-    <query-select>    
-        
+    <query-select>
+
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX vivo:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT DISTINCT <collated>?subclass</collated>
-                        ?role ?roleLabel                         
+                        ?role ?roleLabel
                         ?presentation ?presentationName ?presentationLabel
                         ?conference ?conferenceLabel
                         ?series ?seriesLabel
-                        ?workshop 
+                        ?workshop
                         ?dateTime
-                        
+
         WHERE {
             ?subject ?property ?role .
             ?role a vivo:PresenterRole .
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
index d774208240..9a0fab664d 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
@@ -5,7 +5,7 @@
 
 <list-view-config>
     <query-select>
-        
+
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
index 81e587c212..403f86d535 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
@@ -4,20 +4,20 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
-        
+    <query-select>
+
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT DISTINCT <collated> ?subclass </collated>
                         ?role
                         ?subclassLabel
-                        ?activity 
+                        ?activity
                         (REPLACE(STR(?activity),"^.*(#)(.*)$", "$2") AS ?activityLocal)
                         ?activityName
-                        ?dateTimeStart 
-                        ?dateTimeEnd 
+                        ?dateTimeStart
+                        ?dateTimeEnd
         WHERE {
             ?subject ?property ?role .
             ?role a core:ReviewerRole .
@@ -49,7 +49,7 @@
                 ?dateTimeInterval core:end ?dateTimeEndValue .
                 ?dateTimeEndValue core:dateTime ?dateTimeEnd .
             }
-                     
+
         } ORDER BY <collated> ?subclass </collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityName
     </query-select>
 
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasRole.xml
index 1b9bbbe50a..51bf20ecb1 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasRole.xml
@@ -4,25 +4,25 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT DISTINCT <collated>?subclass</collated>
                         # send the property to the template, since this view supports multiple role properties
                         ?property
-                        ?role 
-                        ?roleLabel 
-                        ?activity ?activityName 
+                        ?role
+                        ?roleLabel
+                        ?activity ?activityName
                         ?activityLabel
-                        ?dateTimeStart ?dateTimeEnd 
+                        ?dateTimeStart ?dateTimeEnd
                         ?hideThis
                         ?objectType
-        WHERE {                
+        WHERE {
             ?subject ?property ?role .
             ?role a ?objectType .
-            
+
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
                 ?role a ?objectType .</precise-subquery>
@@ -31,17 +31,17 @@
                 <collated>
                 ?activity vitro:mostSpecificType ?subclass .
                 </collated>
-            }           
+            }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
                 ?role a ?objectType .</precise-subquery>
                 ?role core:roleContributesTo ?activity .
                 ?activity rdfs:label ?activityLabel .
-                        
+
                 <collated>
                 ?activity vitro:mostSpecificType ?subclass .
                 </collated>
-            }           
+            }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
                 ?role a ?objectType .</precise-subquery>
diff --git a/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml
index 1b3ef35f17..11d43f4ac7 100644
--- a/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml
@@ -4,16 +4,16 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
-        PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
+    <query-select>
+        PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
         PREFIX fn:   &lt;http://www.w3.org/2005/xpath-functions#&gt;
-        
+
         SELECT DISTINCT <collated> ?subclass </collated>
                         ?editorship
-                        ?person ?personName 
+                        ?person ?personName
         WHERE {
             ?subject ?property ?editorship .
             ?editorship a core:Editorship .
@@ -42,7 +42,7 @@
             <critical-data-required>
             FILTER ( bound(?person) )
             </critical-data-required>
-        } ORDER BY <collated> ?subclass </collated> ?rank (fn:lower-case(?personName))   
+        } ORDER BY <collated> ?subclass </collated> ?rank (fn:lower-case(?personName))
     </query-select>
 
     <template>propStatement-informationResourceInEditorship.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
index 0cc27b44ff..1e741ae9e1 100644
--- a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
@@ -4,9 +4,9 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
-        
+
         PREFIX bibo:  &lt;http://purl.org/ontology/bibo/&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml b/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml
index ac9e40b651..1a5bd4f9a3 100644
--- a/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml
@@ -4,16 +4,16 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        
+
         SELECT DISTINCT ?vcard ?address
                         ?street
-                        ?locality 
+                        ?locality
                         ?region
                         ?postalCode
-                        ?country   
-                        
+                        ?country
+
         WHERE {
             ?subject ?property ?vcard .
             ?vcard vcard:hasAddress ?address .
@@ -42,7 +42,7 @@
                 ?vcard vcard:hasAddress ?address .</precise-subquery>
                 ?address vcard:country ?country .
             }
-            
+
         } ORDER BY ?country ?region ?street
     </query-select>
 
diff --git a/webapp/src/main/webapp/config/listViewConfig-orcidId.xml b/webapp/src/main/webapp/config/listViewConfig-orcidId.xml
index e9bd44dd8b..67686c274b 100644
--- a/webapp/src/main/webapp/config/listViewConfig-orcidId.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-orcidId.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- VIVO-specific default list view config file for object properties 
-    
+<!-- VIVO-specific default list view config file for object properties
+
      See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         SELECT ?value
         WHERE {
                 ?subject ?property ?value .
diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml b/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml
index fb960762f9..fcc09d57d7 100644
--- a/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml
@@ -4,7 +4,7 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml b/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml
index fd6d254721..522179de32 100644
--- a/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml
@@ -4,7 +4,7 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml b/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml
index 45265b9e71..4763c9d321 100644
--- a/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml
@@ -4,20 +4,20 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw  -->
 
 <list-view-config>
-    <query-select>    
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;   
+    <query-select>
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf:  &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
-        SELECT DISTINCT ?subclass  
-                        ?edTraining 
-                        ?person ?personName 
+
+        SELECT DISTINCT ?subclass
+                        ?edTraining
+                        ?person ?personName
                         ?awardedDegree
                         ?degree
-                        ?degreeName ?degreeAbbr 
-                        ?majorField ?info 
-                        ?dateTimeStart ?dateTimeEnd 
+                        ?degreeName ?degreeAbbr
+                        ?majorField ?info
+                        ?dateTimeStart ?dateTimeEnd
         WHERE {
             ?subject ?property ?edTraining .
             ?edTraining a core:EducationalProcess .
diff --git a/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml b/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml
index 8f79c172ee..9cdaa46aa4 100644
--- a/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml
@@ -4,18 +4,18 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        
-        SELECT DISTINCT ?vcard 
+
+        SELECT DISTINCT ?vcard
                         ?title
                         ?preferredTitle
         WHERE {
             ?subject ?property ?vcard .
             ?vcard vcard:hasTitle ?title .
             ?title vcard:title ?preferredTitle .
-            
-        } 
+
+        }
     </query-select>
 
     <template>propStatement-preferredTitle.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml b/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml
index 0a34cd09e6..32a26ebee5 100644
--- a/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml
@@ -4,9 +4,9 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        
+
         SELECT DISTINCT ?vcard ?email
                         ?emailAddress
         WHERE {
@@ -14,8 +14,8 @@
             ?vcard vcard:hasEmail ?email .
             ?email a vcard:Work .
             ?email vcard:email ?emailAddress .
-            
-        } 
+
+        }
     </query-select>
 
     <template>propStatement-emailAddress.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
index 236fde8074..acca40d323 100644
--- a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- VIVO-specific default list view config file for object properties 
-    
+<!-- VIVO-specific default list view config file for object properties
+
      See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
     <query-select>
-        
+
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
diff --git a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
index 55bbe9b709..193fa9517b 100644
--- a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
@@ -5,24 +5,24 @@
 
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        
+
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
         PREFIX vcard:  &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        
+
         SELECT DISTINCT <collated>?subclass</collated>
 						?vSubclass
                         # send the property to the template, since this view supports multiple role properties
                         ?property
-                        ?role   
-                        ?roleLabel ?roleTypeLabel                          
+                        ?role
+                        ?roleLabel ?roleTypeLabel
                         ?indivInRole (REPLACE(STR(?indivInRole),"^.*(#)(.*)$", "$2") AS ?indivName)
                         ?indivLabel
                         ?dateTimeInterval ?dateTimeStart ?dateTimeEnd ?objectType
         WHERE {
-                        
+
             ?subject ?property ?role .
             ?role a ?objectType .
 
@@ -32,7 +32,7 @@
                 ?role rdfs:label ?roleLabel .
             }
 
-            # We need ?subclass in the uncollated query to get the roleTypeLabel  
+            # We need ?subclass in the uncollated query to get the roleTypeLabel
             # for roles that have no label.
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
@@ -83,7 +83,7 @@
                 bind ( COALESCE(?middleName, "") As ?middleName1) .
                 bind ( COALESCE(?lastName, "") As ?lastName1) .
                 bind (concat(str(?lastName1 + ", "),str(?firstName1 + " "),str(?middleName1)) as ?indivLabel) .
-             
+
                 OPTIONAL {
                     <precise-subquery>?subject ?property ?role .
                     ?role a ?objectType .
@@ -109,7 +109,7 @@
             }
             <critical-data-required>
             FILTER ( bound(?indivInRole) )
-            </critical-data-required>     
+            </critical-data-required>
         } ORDER BY <collated>?subclass</collated> ?indivLabel ?roleLabel ?roleTypeLabel ?indivName
     </query-select>
 
diff --git a/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml b/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml
index 79a217e789..549c41d051 100644
--- a/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- VIVO-specific default list view config file for object properties 
-    
+<!-- VIVO-specific default list view config file for object properties
+
      See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; 
-        PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt; 
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
+        PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
         PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
         PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        PREFIX fn:   &lt;http://www.w3.org/2005/xpath-functions#&gt;  
+        PREFIX fn:   &lt;http://www.w3.org/2005/xpath-functions#&gt;
 
         SELECT DISTINCT
-                       ?person 
+                       ?person
                        ?personName
                        ?posnLabel
                        ?org
                        ?orgLabel
-                       ?title 
+                       ?title
                        ?dateTimeEnd
-        WHERE { 
+        WHERE {
              ?subject ?property ?person .
              OPTIONAL {
                 <precise-subquery>?subject ?property ?person .</precise-subquery>
@@ -61,7 +61,7 @@
                 ?dateTimeEndValue core:dateTime ?dateTimeEnd .
                 FILTER ( ?dateTimeEnd &lt; now() )
              }
-        } 
+        }
         ORDER BY (fn:lower-case(?personName)) (bound(?dateTimeEnd)) desc(?dateTimeEnd)
     </query-select>
 
diff --git a/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml b/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml
index 7353486c0d..dd87a5293c 100644
--- a/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw 
+<!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw
      This list view used for both roleContributesTo and BFO_0000054, which
      is for events.
 -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT DISTINCT <collated>?subclass</collated>
                         # send the property to the template, since this view supports multiple role properties
                         ?property
-                        ?role 
-                        ?roleLabel 
-                        ?activity ?activityName 
+                        ?role
+                        ?roleLabel
+                        ?activity ?activityName
                         ?activityLabel
-                        ?dateTimeStart ?dateTimeEnd 
+                        ?dateTimeStart ?dateTimeEnd
                         ?hideThis
                         ?objectType
-        WHERE {                
+        WHERE {
             ?subject ?property ?role .
             ?role a ?objectType .
-            
+
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
                 ?role a ?objectType .</precise-subquery>
                 ?role core:roleContributesTo ?activity .
                 ?activity rdfs:label ?activityLabel .
-                        
+
                 <collated>
                 ?activity vitro:mostSpecificType ?subclass .
                 </collated>
-            }           
+            }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
                 ?role a ?objectType .</precise-subquery>
                 ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
                 ?activity rdfs:label ?activityLabel .
-                        
+
                 <collated>
                 ?activity vitro:mostSpecificType ?subclass .
                 </collated>
-            }           
+            }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
                 ?role a ?objectType .</precise-subquery>
diff --git a/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml b/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml
index 8933676d72..4aef99e633 100644
--- a/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml
@@ -4,22 +4,22 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX core:  &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs:  &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT DISTINCT <collated>?subclass</collated>
                         # send the property to the template, since this view supports multiple role properties
                         ?property
-                        ?role 
-                        ?roleLabel 
-                        ?activity ?activityName 
+                        ?role
+                        ?roleLabel
+                        ?activity ?activityName
                         ?activityLabel
-                        ?dateTimeStart ?dateTimeEnd 
+                        ?dateTimeStart ?dateTimeEnd
                         ?hideThis
                         ?objectType
-        WHERE {                
+        WHERE {
             ?subject ?property ?role .
             ?role a ?objectType .
 
@@ -47,7 +47,7 @@
                 <collated>
                 ?activity vitro:mostSpecificType ?subclass .
                 </collated>
-            }           
+            }
             OPTIONAL {
                 <precise-subquery>?subject ?property ?role .
                 ?role a ?objectType .</precise-subquery>
diff --git a/webapp/src/main/webapp/config/listViewConfig-scopusId.xml b/webapp/src/main/webapp/config/listViewConfig-scopusId.xml
index a508574ef8..e910dc9e06 100644
--- a/webapp/src/main/webapp/config/listViewConfig-scopusId.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-scopusId.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- VIVO-specific default list view config file for object properties 
-    
+<!-- VIVO-specific default list view config file for object properties
+
      See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
-          
+    <query-select>
+
         SELECT ?value
         WHERE {
-  
+
                 ?subject ?property ?value .
-                FILTER isLiteral(?value) 
-            
+                FILTER isLiteral(?value)
+
         } ORDER BY ?value
     </query-select>
 
diff --git a/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml b/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml
index e4cd4a3f12..97ac599133 100644
--- a/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml
@@ -4,21 +4,21 @@
 <!-- See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>    
+    <query-select>
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
-        
+
         SELECT DISTINCT ?vcard ?phone
                         ?number
         WHERE {
             ?subject ?property ?vcard .
-            ?vcard vcard:hasTelephone ?phone . 
+            ?vcard vcard:hasTelephone ?phone .
             ?phone vcard:telephone ?number .
             MINUS {
                 <precise-subquery>?subject ?property ?vcard .
                 ?vcard vcard:hasTelephone ?phone .</precise-subquery>
                 ?phone a vcard:Fax .
             }
-        } 
+        }
     </query-select>
 
     <template>propStatement-phoneFaxNumber.ftl</template>
diff --git a/webapp/src/main/webapp/config/listViewConfig-webpage.xml b/webapp/src/main/webapp/config/listViewConfig-webpage.xml
index 9fb759017e..d6d4a5c2fd 100644
--- a/webapp/src/main/webapp/config/listViewConfig-webpage.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-webpage.xml
@@ -2,20 +2,20 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!-- Custom list view config file for core:webpage
-    
-     See guidelines at https://wiki.duraspace.org/x/eYXVAw --> 
+
+     See guidelines at https://wiki.duraspace.org/x/eYXVAw -->
 
 <list-view-config>
-    <query-select>            
-        
+    <query-select>
+
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
 
-        SELECT ?vcard ?link 
-               (REPLACE(STR(?link),"^.*(#)(.*)$", "$2") AS ?linkName) 
+        SELECT ?vcard ?link
+               (REPLACE(STR(?link),"^.*(#)(.*)$", "$2") AS ?linkName)
                (group_concat(distinct ?linkLabel;separator="/") as ?label)
-               ?url 
+               ?url
                ?rank
         WHERE {
             ?subject ?property ?vcard .
@@ -36,8 +36,8 @@
                 ?link core:rank ?rank .
             }
         <critical-data-required>
-        FILTER ( bound(?link) )    
-        </critical-data-required>  
+        FILTER ( bound(?link) )
+        </critical-data-required>
         } GROUP BY ?vcard ?link ?url ?rank
           ORDER BY ?rank ?linkLabel
     </query-select>
diff --git a/webapp/src/main/webapp/css/home-page-maps.css b/webapp/src/main/webapp/css/home-page-maps.css
index 5a78685e00..9e004e0301 100644
--- a/webapp/src/main/webapp/css/home-page-maps.css
+++ b/webapp/src/main/webapp/css/home-page-maps.css
@@ -46,7 +46,7 @@ div#researcherTotal {
     text-align: center;
     width: 170px;
     margin-top:-60px;
-}  
+}
 .leaflet-popup-content {
     line-height: 1.4;
     margin: 8px 8px;
diff --git a/webapp/src/main/webapp/css/individual/individual-2column-view.css b/webapp/src/main/webapp/css/individual/individual-2column-view.css
index 9478e24be2..e1c35dcb33 100644
--- a/webapp/src/main/webapp/css/individual/individual-2column-view.css
+++ b/webapp/src/main/webapp/css/individual/individual-2column-view.css
@@ -3,7 +3,7 @@
 /* <------ INDIVIDUAL INTRO */
 #individual-intro {
     margin-top: 15px;
-    margin-bottom: 0px; 
+    margin-bottom: 0px;
     position: relative;
     overflow: hidden;
 }
@@ -13,7 +13,7 @@
     width: 166px;
     float: left;
     padding-right: 1.5em;
-    margin-right: 12px; 
+    margin-right: 12px;
     margin-bottom: 20px;
 }
 img.individual-photo {
@@ -21,7 +21,7 @@ img.individual-photo {
     margin-left: 0;
     float: left;
     margin-right: 20px;
-    margin-bottom: 10px; 
+    margin-bottom: 10px;
 }
 ul#phone-list {
     font-size:0.9em;
@@ -29,14 +29,14 @@ ul#phone-list {
 ul#individual-phone {
     clear: both;
     list-style-type: circle;
-    margin-top:-8px; 
+    margin-top:-8px;
 }
 #primary-email {
-    margin-top: 0; 
+    margin-top: 0;
 }
-#primary-email li:last-child, 
+#primary-email li:last-child,
 #additional-emails li:last-child {
-    margin-bottom: 0; 
+    margin-bottom: 0;
 }
 
 /* <------ INDIVIDUAL INTRO - RIGHT SIDE CONTENT */
@@ -59,8 +59,8 @@ div#titleContainer {
     margin-top:6px;
 }
 #individual-info h2 {
-    padding: 25px 0 10px 0; 
-    clear:both; 
+    padding: 25px 0 10px 0;
+    clear:both;
 }
 #individual-info h2#contactHeading {
     margin-bottom: 8px;
@@ -73,14 +73,14 @@ h3.primary-email {
     margin-top: -8px !important;
 }
 #individual-intro.person {
-    margin-bottom: 0; 
+    margin-bottom: 0;
     position: relative;
     width: 100%;
 }
 #individual-info h1.foaf-person {
     float:left;
     padding-right:8px;
-    height:20px; 
+    height:20px;
     margin:-3px 8px 5px 0;
 }
 div#profileTypeContainer {
@@ -115,32 +115,32 @@ span.iconControlsEditable {
 span.iconControlsNotEditable {
     position:absolute;
     right:0;
-    top:3px; 
+    top:3px;
 }
 #overview {
-    clear: both; 
+    clear: both;
 }
 /* <------ INDIVIDUAL VISUALIZATION */
 #visualization {
-    padding: 0 0 0 0; 
-    background: #fff; 
-    width:174px; 
-    float:none; 
+    padding: 0 0 0 0;
+    background: #fff;
+    width:174px;
+    float:none;
 }
 #visualization h3 {
     padding-top: 10px;
-    margin-bottom: 0; 
+    margin-bottom: 0;
 }
 p#networks {
     margin-bottom:10px;
 }
-.collaboratorship-link-separator { 
+.collaboratorship-link-separator {
     margin-top: 10px;
     border-top: 1px solid #DDE4E3;
     padding-top: 10px;
 }
 .sparkline_text {
-    font-size: .9em; 
+    font-size: .9em;
     text-align: left;
     line-height: 1.5em;
     width: 180px;
@@ -148,7 +148,7 @@ p#networks {
 span.collaboratorship-link a img{
     vertical-align:middle;
 }
-td#totalPubs { 
+td#totalPubs {
     font-size: 1.35em;
     background: url(../../images/individual/pub-total-bkgrnd.png) top left no-repeat;
     text-align:center;
@@ -156,7 +156,7 @@ td#totalPubs {
     width:48px;
     height:48px;
 }
-td#tenYearCount { 
+td#tenYearCount {
     font-size: .85em;
     padding-left:10px;
     vertical-align:middle;
@@ -165,37 +165,37 @@ td#tenYearCount {
     padding-right: 0;
 }
 div#pub_count_short_sparkline_vis {
-    margin-top: 4px; 
-    height: 48px; 
+    margin-top: 4px;
+    height: 48px;
     margin-bottom: 20px;
 }
 /* <------ INDIVIDUAL TEMPORAL GRAPH & MAP O' SCIENCE*/
 #temporal-graph {
-    padding: 0 3px 8px 0; 
+    padding: 0 3px 8px 0;
     background-color: #fff;
-    margin-top: -4px; 
+    margin-top: -4px;
 }
 #temporal-graph h3 img,
 #map-of-science h3 img {
     padding-right: 10px;
-    vertical-align: middle; 
+    vertical-align: middle;
 }
 #map-of-science {
-    padding: 0 3px 24px 0; 
+    padding: 0 3px 24px 0;
     background-color: #fff;
 }
 /* <------ POSITIONS */
 ul#individual-personInPosition {
     list-style-type: circle;
-    padding-left: 10px; 
-    margin: 10px 0 0 0; 
+    padding-left: 10px;
+    margin: 10px 0 0 0;
 }
 ul#individual-personInPosition li {
     line-height: 1em;
-    padding-bottom:10px; 
+    padding-bottom:10px;
 }
 ul#individual-personInPosition li:last-child {
-    padding-bottom: 3px; 
+    padding-bottom: 3px;
 }
 
 /* <------ CONTACTS AND WEBPAGES */
@@ -234,8 +234,8 @@ div#contactPhoneDiv {
 ul#individual-hasResearchArea li {
     float: left;
     padding-right: 10px;
-    margin-right: 10px; 
-    padding-left: 0;  
+    margin-right: 10px;
+    padding-left: 0;
     border-right: 1px solid #5e6363;
 }
 h2#researchAreas  {
@@ -244,12 +244,12 @@ h2#researchAreas  {
 /* <------ QR Code */
 span#qrCodeImage {
     position: absolute;
-    top: 30px; 
-    left: -120px !important; 
-    width:180px; 
+    top: 30px;
+    left: -120px !important;
+    width:180px;
     border: solid 2px #ccc;
-    background: #fff; 
-    text-align:middle; 
+    background: #fff;
+    text-align:middle;
     overflow:visible;
     z-index:1000;
 }
@@ -262,23 +262,23 @@ span#quickViewLink img {
     margin-top:35px;
 }
 /****** FROM WILMA.CSS ******/
-#individual-info h2.mainPropGroup { 
+#individual-info h2.mainPropGroup {
     border-bottom: 1px solid #DDE4E3;
     padding-bottom:1px;
     margin-bottom:8px;
     padding-top:18px;
 }
-#individual-info div#contactContainer h3{ 
-    color:#8aa149; 
+#individual-info div#contactContainer h3{
+    color:#8aa149;
 }
 ul#individual-personInPosition li {
     padding-bottom:12px;
-    margin-left:10px; 
+    margin-left:10px;
     line-height: 1.25em !important;
 }
-ul#individual-personInPosition li:last-child { 
+ul#individual-personInPosition li:last-child {
     padding-bottom: 0;
 }
-td#totalPubs { 
+td#totalPubs {
     color: #2485AE;
 }
diff --git a/webapp/src/main/webapp/css/individual/individual-quick-view.css b/webapp/src/main/webapp/css/individual/individual-quick-view.css
index 1c674306a4..fb3e132f0b 100644
--- a/webapp/src/main/webapp/css/individual/individual-quick-view.css
+++ b/webapp/src/main/webapp/css/individual/individual-quick-view.css
@@ -47,7 +47,7 @@ section#label-title {
     margin-left:0 !important;
     font-size:1em !important;
     border:none !important;
-    display:inline-block; 
+    display:inline-block;
 }
 div#titleContainer {
     display:inline-block;
@@ -70,12 +70,12 @@ section#label-title h2 {
 /* <------ QR Code */
 span#qrCodeImage {
     position: absolute;
-    top: 30px; 
-    left: 76% !important; 
-    width:180px; 
+    top: 30px;
+    left: 76% !important;
+    width:180px;
     border: solid 2px #ccc;
-    background: #fff; 
-    text-align:middle; 
+    background: #fff;
+    text-align:middle;
     overflow:visible;
 }
 /* <----- WEBPAGE CONTENT LEFT SIDE -----> */
@@ -93,8 +93,8 @@ span#qrCodeImage {
 }
 div#webpage-wrapper {
     background-color: #e4e8e7;
-    margin:-7px 0 -16px 0; 
-    padding-bottom:9px; 
+    margin:-7px 0 -16px 0;
+    padding-bottom:9px;
     padding-top:3px;
     display:inline-block;
     width: 456px;
@@ -113,7 +113,7 @@ ul.individual-webpage {
     padding:18px 0 0 25px ;
 }
 ul.individual-webpage li:first-child {
-    padding: 0 0 0 0;    
+    padding: 0 0 0 0;
 }
 ul.individual-webpage li {
     padding: 5px 5px 0 0;
@@ -138,7 +138,7 @@ section#individual-intro {
 }
 #individual-intro h1.fn {
     padding-right:8px;
-    height:20px; 
+    height:20px;
     margin:-1px 8px 5px 0;
 }
 section.qv-individual-info {
@@ -190,14 +190,14 @@ div#profileTypeContainer h2 {
 /* <------ POSITIONS ------> */
 ul#individual-personInPosition {
     list-style-type: circle;
-    padding-left: 10px; 
-    margin: 10px 0 0 0; 
+    padding-left: 10px;
+    margin: 10px 0 0 0;
 }
 ul#individual-hasResearchArea li {
-    float: left; 
+    float: left;
     padding-right: 10px;
-    margin-right: 10px; 
-    padding-left: 0;  
+    margin-right: 10px;
+    padding-left: 0;
     border-right: 1px solid #5e6363 ;
     white-space:nowrap !important;
 }
@@ -226,20 +226,20 @@ span#fullViewLink {
     padding-left:47%;
 }
 /****** FROM WILMA.CSS ******/
-#individual-info h2.mainPropGroup { 
+#individual-info h2.mainPropGroup {
     border-bottom: 1px solid #DDE4E3;
     padding-bottom:1px;
     margin-bottom:8px;
 }
 ul#individual-personInPosition li {
     padding-bottom:12px;
-    margin-left:10px; 
+    margin-left:10px;
     line-height: 1.25em !important;
 }
-ul#individual-personInPosition li:last-child { 
+ul#individual-personInPosition li:last-child {
     padding-bottom: 0;
 }
 #individual-info h2 {
-    padding: 25px 0 10px 0; 
-    clear:both; 
+    padding: 25px 0 10px 0;
+    clear:both;
 }
diff --git a/webapp/src/main/webapp/css/individual/individual-vivo.css b/webapp/src/main/webapp/css/individual/individual-vivo.css
index 4ae90b7929..3881dbcd24 100644
--- a/webapp/src/main/webapp/css/individual/individual-vivo.css
+++ b/webapp/src/main/webapp/css/individual/individual-vivo.css
@@ -211,22 +211,22 @@ h5.qrCode {
 }
 span#qrCodeImage {
     position: absolute;
-    top: 27px; 
-    left: 175px !important; 
-    width:180px; 
+    top: 27px;
+    left: 175px !important;
+    width:180px;
     border: solid 2px #ccc;
-    background: #fff; 
-    text-align:middle; 
+    background: #fff;
+    text-align:middle;
     overflow:visible;
     z-index:1000;
 }
 span#qrCodeImage img {
-    padding: 1.7em 1.7em 0 1.7em; 
+    padding: 1.7em 1.7em 0 1.7em;
 }
 a.qrCloseLink {
-    float: right; 
-    padding-right: 1em; 
-    margin-right: 0; 
+    float: right;
+    padding-right: 1em;
+    margin-right: 0;
     font-size: .8em;
 }/* MISCELLANEOUS------>  */
 .listDateTime {
@@ -246,7 +246,7 @@ a.manageLinks {
 /*    padding-top: 20px; */
 }
 ul#individual-webpage li:first-child {
-    padding: 0 0 5px 0;    
+    padding: 0 0 5px 0;
 }
 ul.webpages-withThumbnails li:nth-child(2) {
     padding: 105px 0 0 15px;
diff --git a/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css b/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css
index e699ce1d88..ca2775cf99 100644
--- a/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css
+++ b/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css
@@ -1,76 +1,76 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-.ui-notify { 
-    width: 350px; 
-    position: fixed; 
-    top: 10px; 
-    right: 10px; 
+.ui-notify {
+    width: 350px;
+    position: fixed;
+    top: 10px;
+    right: 10px;
 }
-.ui-notify-message { 
-    padding: 10px; 
-    margin-bottom: 15px; 
-    -moz-border-radius: 8px; 
-    -webkit-border-radius: 8px; 
-    border-radius: 8px; 
+.ui-notify-message {
+    padding: 10px;
+    margin-bottom: 15px;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
+    border-radius: 8px;
 }
-.ui-notify-message h1 { 
-    font-size: 14px; 
-    margin: 0; 
-    padding: 0; 
+.ui-notify-message h1 {
+    font-size: 14px;
+    margin: 0;
+    padding: 0;
 }
-.ui-notify-message p { 
-    margin: 3px 0; 
-    padding: 0; 
-    line-height: 18px 
+.ui-notify-message p {
+    margin: 3px 0;
+    padding: 0;
+    line-height: 18px
 }
-.ui-notify-message:last-child { 
-    margin-bottom: 0; 
+.ui-notify-message:last-child {
+    margin-bottom: 0;
 }
-.ui-notify-message-style { 
-    background: #000; 
-    background: rgba(0,0,0,0.8); 
-    -moz-box-shadow: 0 0 6px #000; 
-    -webkit-box-shadow: 0 0 6px #000; 
-    box-shadow: 0 0 6px #000; 
+.ui-notify-message-style {
+    background: #000;
+    background: rgba(0,0,0,0.8);
+    -moz-box-shadow: 0 0 6px #000;
+    -webkit-box-shadow: 0 0 6px #000;
+    box-shadow: 0 0 6px #000;
 }
-.ui-notify-message-style h1 { 
-    color: #fff; 
+.ui-notify-message-style h1 {
+    color: #fff;
     font-weight: bold;
 }
-.ui-notify-message-style p { 
+.ui-notify-message-style p {
     color: #fff;
 }
-.ui-notify-close { 
-    color: #fff; 
+.ui-notify-close {
+    color: #fff;
     text-decoration: underline
 }
-.ui-notify-click { 
+.ui-notify-click {
     cursor: pointer;
 }
-.ui-notify-cross { 
-    margin-top: -4px; 
-    float: right; 
-    cursor: pointer; 
-    text-decoration: none; 
-    font-size: 12px; 
-    font-weight: bold; 
-    text-shadow: 0 1px 1px #fff; 
+.ui-notify-cross {
+    margin-top: -4px;
+    float: right;
+    cursor: pointer;
+    text-decoration: none;
+    font-size: 12px;
+    font-weight: bold;
+    text-shadow: 0 1px 1px #fff;
     padding: 2px;
 }
-.ui-notify-cross:hover { 
-    color: #ffffab; 
+.ui-notify-cross:hover {
+    color: #ffffab;
 }
-.ui-notify-cross:active { 
-    position:relative; 
+.ui-notify-cross:active {
+    position:relative;
     top: 1px;
 }
-.ui-state-error h1 { 
-    font-size: 14px; 
-    margin: 0; 
-    padding: 0; 
-    color: #cd0a0a; 
-    font-weight: bold; 
+.ui-state-error h1 {
+    font-size: 14px;
+    margin: 0;
+    padding: 0;
+    color: #cd0a0a;
+    font-weight: bold;
 }
-.ui-state-error p { 
-    color: #cd0a0a; 
+.ui-state-error p {
+    color: #cd0a0a;
 }
diff --git a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
index 106a4ec305..51cb46c9b1 100755
--- a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
+++ b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
@@ -50,8 +50,8 @@ body {
     margin-top:15px;
 }
 
-#left-container, 
-#right-container, 
+#left-container,
+#right-container,
 #center-container {
     height:600px;
     position:absolute;
diff --git a/webapp/src/main/webapp/css/visualization/coauthorship/style.css b/webapp/src/main/webapp/css/visualization/coauthorship/style.css
index ca61f31848..ed92ed604c 100644
--- a/webapp/src/main/webapp/css/visualization/coauthorship/style.css
+++ b/webapp/src/main/webapp/css/visualization/coauthorship/style.css
@@ -2,43 +2,43 @@
 
 /* CSS Document */
 body {
-    background: url(../../../site_icons/visualization/coauthorship/bg.gif) repeat-x 0 0 #FDF9EE; 
+    background: url(../../../site_icons/visualization/coauthorship/bg.gif) repeat-x 0 0 #FDF9EE;
     color: #4E4628;
     font: normal 14px/19px Arial, Helvetica, sans-serif;
     margin: 0;
     padding: 0;
 }
-div, 
-h1, 
-h2, 
-h3, 
-h4, 
-h5, 
-h6, 
-form, 
-label, 
-input, 
-span, 
-ul, 
-li, 
-p, 
+div,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+form,
+label,
+input,
+span,
+ul,
+li,
+p,
 a {
-    margin: 0; 
+    margin: 0;
     padding: 0;
 }
 ul {
     list-style: none;
 }
 .spacer {
-    font-size:0 ; 
-    line-height: 0; 
+    font-size:0 ;
+    line-height: 0;
     clear: both;
 }
 /* top navigation */
 #topNav {
-    width: 1000px; 
+    width: 1000px;
     position: relative;
-    margin: 0 auto; 
+    margin: 0 auto;
     padding: 8px 0 0 50px;
 }
 #topNav h1 {
@@ -51,38 +51,38 @@ ul {
 }
 #topNav ul {
     background: url(../../../site_icons/visualization/coauthorship/top_ul_bg.gif) no-repeat 0 8px;
-    width: 503px; 
-    height: 23px; 
-    padding: 8px 0 0 8px; 
-    margin: 0 0 0 217px; 
+    width: 503px;
+    height: 23px;
+    padding: 8px 0 0 8px;
+    margin: 0 0 0 217px;
 }
 #topNav ul li {
-    background-color: #E1DBC7; 
+    background-color: #E1DBC7;
     color: #0B0B0B; float:left;
-    font: bold 11px/23px "Trebuchet MS", Arial, Helvetica, sans-serif; 
+    font: bold 11px/23px "Trebuchet MS", Arial, Helvetica, sans-serif;
     text-transform: uppercase;
 }
 #topNav ul li a {
-    background-color: #E1DBC7; 
+    background-color: #E1DBC7;
     color: #0B0B0B;
     font: bold 11px/23px "Trebuchet MS", Arial, Helvetica, sans-serif;
-    text-transform: uppercase; 
-    text-align: center; 
+    text-transform: uppercase;
+    text-align: center;
     text-decoration: none;
-    width: 65px; 
-    height :23px; 
+    width: 65px;
+    height :23px;
     display: block;
 }
 #topNav ul li a:hover,
 #topNav ul li a.hover {
-    background: url(../../../site_icons/visualization/coauthorship/top_btn_h.gif) no-repeat 0 0 #E1DBC7; 
+    background: url(../../../site_icons/visualization/coauthorship/top_btn_h.gif) no-repeat 0 0 #E1DBC7;
     color: #FFFFFF;
     font: bold 11px/23px "Trebuchet MS", Arial, Helvetica, sans-serif;
-    text-transform: uppercase; 
-    text-align: center; 
+    text-transform: uppercase;
+    text-align: center;
     text-decoration: none;
-    width: 65px; 
-    height: 23px; 
+    width: 65px;
+    height: 23px;
     display: block;
 }
 /* shadow */
@@ -98,16 +98,16 @@ ul {
     margin-left: 0;
 }
 #bottomShadow {
-    background: url(../../../site_icons/visualization/coauthorship/bottom_shadow.gif) no-repeat 0 0 #FDF9EE; 
+    background: url(../../../site_icons/visualization/coauthorship/bottom_shadow.gif) no-repeat 0 0 #FDF9EE;
     color: #4E4628;
-    width: 1000px; 
-    height: 24px; 
+    width: 1000px;
+    height: 24px;
     float: left;
 }
 /* body start */
 #body {
-    width: 1000px; 
-    margin: 0 auto; 
+    width: 1000px;
+    margin: 0 auto;
     position: relative;
 }
 #bodyPannel {
@@ -121,243 +121,243 @@ ul {
     padding-left: 28px;
 }
 #bodyPannel form.search {
-    background-color: #FFFFFF; 
-    color: #000000; 
+    background-color: #FFFFFF;
+    color: #000000;
     border: #ECE8DB 1px solid;
-    width: 248px; 
-    padding: 7px 17px 27px 17px; 
+    width: 248px;
+    padding: 7px 17px 27px 17px;
     float: left;
 }
 #bodyPannel form.search h2 {
-    background: url(../../../site_icons/visualization/coauthorship/search_h2_bg.gif) no-repeat 0 0 #FFFFFF; 
+    background: url(../../../site_icons/visualization/coauthorship/search_h2_bg.gif) no-repeat 0 0 #FFFFFF;
     color: #786E4E;
-    width: 197px; padding:0 0 10px 50px; 
+    width: 197px; padding:0 0 10px 50px;
     float: left;
     font: normal 24px/42px Georgia, "Times New Roman", Times, serif;
 }
 #eventLink h2 span,
 #bodyPannel form.search h2 span {
-    background-color: #FFFFFF; 
+    background-color: #FFFFFF;
     color: #0B0B0B;
     font: normal 24px/42px Georgia, "Times New Roman", Times, serif;
 }
 #bodyPannel form.search input {
-    background-color: #EFEBDE; 
-    color: #0B0B0B; 
+    background-color: #EFEBDE;
+    color: #0B0B0B;
     border: #C3BCA4 1px solid;
-    width: 158px; 
-    height: 22px; 
-    padding: 2px; 
+    width: 158px;
+    height: 22px;
+    padding: 2px;
     margin: 0 0 8px 0; float: right;
     font: normal 14px/20px Arial, Helvetica, sans-serif;
 }
 #bodyPannel form.search p {
-    background-color: #FFFFFF; 
-    color: #CC0000; float:left; 
+    background-color: #FFFFFF;
+    color: #CC0000; float:left;
     margin: 6px 0 0 0;
     font: normal 13px/15px Arial, Helvetica, sans-serif;
 }
 #bodyPannel form.search input.check {
-    background-color: #EFEBDE; 
-    color: #0B0B0B; 
+    background-color: #EFEBDE;
+    color: #0B0B0B;
     border: #C3BCA4 1px solid;
-    width: 15px; 
-    height: 15px; 
-    float: left; 
+    width: 15px;
+    height: 15px;
+    float: left;
     margin: 6px 0 0 9px;
 }
 #bodyPannel form.search input.submit {
-    background:url(../../../site_icons/visualization/coauthorship/submit_bg.gif) no-repeat 37px 0 #FFFFFF; 
-    color: #0B0B0B; 
+    background:url(../../../site_icons/visualization/coauthorship/submit_bg.gif) no-repeat 37px 0 #FFFFFF;
+    color: #0B0B0B;
     border: none;
-    width: 53px; height:13px; 
-    float:right; margin:7px 0 0 0; 
-    padding: 0 23px 0 0; 
+    width: 53px; height:13px;
+    float:right; margin:7px 0 0 0;
+    padding: 0 23px 0 0;
     cursor: pointer;
-    font:normal 10px/13px Arial, Helvetica, sans-serif; 
+    font:normal 10px/13px Arial, Helvetica, sans-serif;
     text-transform: uppercase;
 }
 #eventLink {
-    width: 345px; 
-    padding: 0 0 0 70px;  
+    width: 345px;
+    padding: 0 0 0 70px;
     float: left;
 }
 #eventLink h2 {
-    background: url(../../../site_icons/visualization/coauthorship/event_link_bg.gif) no-repeat 0 7px #FFFFFF; 
+    background: url(../../../site_icons/visualization/coauthorship/event_link_bg.gif) no-repeat 0 7px #FFFFFF;
     color: #786E4E;
     padding: 6px 0 10px 48px;
     font: normal 28px/42px Georgia, "Times New Roman", Times, serif;
 }
 #eventLink ul {
-    float: left; 
+    float: left;
     padding: 0 0 0 5px;
 }
 #eventLink ul li {
-    font: normal 13px/19px Arial, Helvetica, sans-serif; 
-    background: url(../../../site_icons/visualization/coauthorship/red_arrow.gif) no-repeat 0 7px #FFFFFF; 
+    font: normal 13px/19px Arial, Helvetica, sans-serif;
+    background: url(../../../site_icons/visualization/coauthorship/red_arrow.gif) no-repeat 0 7px #FFFFFF;
     color: #4E4628;
     padding: 0 0 0 6px;
 }
 #eventLink ul li a {
-    font: normal 13px/19px Arial, Helvetica, sans-serif; text-decoration:none; 
-    background-color: #FFFFFF; 
+    font: normal 13px/19px Arial, Helvetica, sans-serif; text-decoration:none;
+    background-color: #FFFFFF;
     color: #4E4628;
-    padding: 0 4px; 
+    padding: 0 4px;
     display: block;
 }
 #eventLink ul li a:hover {
-    font: normal 13px/19px Arial, Helvetica, sans-serif; 
-    text-decoration: none; 
-    background-color: #F4EFDF; 
+    font: normal 13px/19px Arial, Helvetica, sans-serif;
+    text-decoration: none;
+    background-color: #F4EFDF;
     color: #4E4628;
-    padding: 0 4px; 
+    padding: 0 4px;
     display: block;
 }
 #eventLink a.more {
-    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 66px 0 #FFFFFF; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 66px 0 #FFFFFF;
+    color: #0B0B0B;
     float: right;
-    font: bold 10px/13px Arial, Helvetica, sans-serif; text-decoration: none; 
+    font: bold 10px/13px Arial, Helvetica, sans-serif; text-decoration: none;
     text-transform: uppercase;
-    padding: 0 20px 0 0; 
+    padding: 0 20px 0 0;
     margin: 5px 10px 0 0;
 }
 #eventLink a.more:hover {
-    background: url(../../../site_icons/visualization/coauthorship/more_bg_h.gif) no-repeat 66px 0 #FFFFFF; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/more_bg_h.gif) no-repeat 66px 0 #FFFFFF;
+    color: #0B0B0B;
     float: right;
-    font: bold 10px/13px Arial, Helvetica, sans-serif; 
-    text-decoration: none; 
+    font: bold 10px/13px Arial, Helvetica, sans-serif;
+    text-decoration: none;
     text-transform: uppercase;
-    padding: 0 20px 0 0; 
+    padding: 0 20px 0 0;
     margin:5px 10px 0 0;
 }
 #midle {
-    background: url(../../../site_icons/visualization/coauthorship/picture.gif) no-repeat 0 0 #FFFFFF; 
+    background: url(../../../site_icons/visualization/coauthorship/picture.gif) no-repeat 0 0 #FFFFFF;
     color: #4E4628;
     padding: 270px 0 0 0;
 }
 #midle h2 {
-    background-color: #FFFFFF; 
+    background-color: #FFFFFF;
     color: #0B0B0B;
     font: normal 28px/46px Georgia, "Times New Roman", Times, serif;
 }
 #midle h2 span {
-    background-color: #FFFFFF; 
+    background-color: #FFFFFF;
     color: #A60101;
     font: normal 28px/46px Georgia, "Times New Roman", Times, serif;
 }
 #midle p {
-    font: normal 14px/19px Arial, Helvetica, sans-serif; 
-    background-color: #FFFFFF; 
+    font: normal 14px/19px Arial, Helvetica, sans-serif;
+    background-color: #FFFFFF;
     color: #4E4628;
 }
 #midle a.more {
-    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 66px 0 #FFFFFF; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 66px 0 #FFFFFF;
+    color: #0B0B0B;
     float:right;
-    font: bold 10px/13px Arial, Helvetica, sans-serif; 
-    text-decoration: none; 
+    font: bold 10px/13px Arial, Helvetica, sans-serif;
+    text-decoration: none;
     text-transform: uppercase;
-    padding: 0 20px 0 0; 
+    padding: 0 20px 0 0;
     margin: 5px 35px 0 0;
 }
 #midle a.more: hover {
-    background: url(../../../site_icons/visualization/coauthorship/more_bg_h.gif) no-repeat 66px 0 #FFFFFF; 
+    background: url(../../../site_icons/visualization/coauthorship/more_bg_h.gif) no-repeat 66px 0 #FFFFFF;
     color: #0B0B0B; float:right;
-    font: bold 10px/13px Arial, Helvetica, sans-serif; 
-    text-decoration: none; 
+    font: bold 10px/13px Arial, Helvetica, sans-serif;
+    text-decoration: none;
     text-transform: uppercase;
-    padding: 0 20px 0 0; 
+    padding: 0 20px 0 0;
     margin: 5px 35px 0 0;
 }
 #colorBg {
-    background-color: #FCFAF3; 
-    float: left; 
+    background-color: #FCFAF3;
+    float: left;
     color: #0B0B0B;
-    margin: 18px 0 0 0; 
-    padding: 18px 40px 18px 38px; 
+    margin: 18px 0 0 0;
+    padding: 18px 40px 18px 38px;
     width: 642px;
 }
 #futurePlans {
-    width: 298px; 
+    width: 298px;
     float: left;
 }
 #futurePlans h2.text1 {
-    background-color: #FCFAF3; 
+    background-color: #FCFAF3;
     color: #0B0B0B;
     font: normal 28px/40px Georgia, "Times New Roman", Times, serif;
 }
 #futurePlans h2.text1 span {
-    background-color: #FCFAF3; 
+    background-color: #FCFAF3;
     color: #A60101;
     font: normal 28px/40px Georgia, "Times New Roman", Times, serif;
 }
-#futurePlans ul { 
+#futurePlans ul {
     float: left;
 }
 #futurePlans ul li {
-    font: normal 13px/19px Arial, Helvetica, sans-serif; 
+    font: normal 13px/19px Arial, Helvetica, sans-serif;
     color: #4E4628;
-    background: url(../../../site_icons/visualization/coauthorship/red_bullet.gif) no-repeat 0 6px #FCFAF3; 
+    background: url(../../../site_icons/visualization/coauthorship/red_bullet.gif) no-repeat 0 6px #FCFAF3;
     padding: 0 0 0 10px;
 }
 #futurePlans ul li a {
     font: bold 13px/19px Arial, Helvetica, sans-serif; text-decoration:none;
-    background-color: #FCFAF3; 
-    color: #4E4628; 
+    background-color: #FCFAF3;
+    color: #4E4628;
     display: block;
 }
 #futurePlans ul li a:hover {
-    font: bold 13px/19px Arial, Helvetica, sans-serif; 
+    font: bold 13px/19px Arial, Helvetica, sans-serif;
     text-decoration: none;
-    background-color: #EAE6D9; 
-    color: #4E4628; 
+    background-color: #EAE6D9;
+    color: #4E4628;
     display: block;
 }
 #futurePlans p {
-    background: url(../../../site_icons/visualization/coauthorship/boeder.gif) repeat-x 0 14px #FCFAF3; 
+    background: url(../../../site_icons/visualization/coauthorship/boeder.gif) repeat-x 0 14px #FCFAF3;
     color: #0B0B0B;
-    height: 13px; 
-    line-height: 13px; 
+    height: 13px;
+    line-height: 13px;
     padding: 14px 0 19px 0;
 }
 #futurePlans p a.more {
-    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 76px 0 #FCFAF3; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 76px 0 #FCFAF3;
+    color: #0B0B0B;
     float: right;
-    font: bold 10px/13px Arial, Helvetica, sans-serif; 
-    text-decoration: none; 
+    font: bold 10px/13px Arial, Helvetica, sans-serif;
+    text-decoration: none;
     text-transform: uppercase;
-    padding: 0 20px 0 10px; 
+    padding: 0 20px 0 10px;
     margin: 0;
 }
 #futurePlans p a.more:hover {
-    background: url(../../../site_icons/visualization/coauthorship/more_bg_h.gif) no-repeat 76px 0 #FCFAF3; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/more_bg_h.gif) no-repeat 76px 0 #FCFAF3;
+    color: #0B0B0B;
     float: right;
-    font: bold 10px/13px Arial, Helvetica, sans-serif; text-decoration:none; 
+    font: bold 10px/13px Arial, Helvetica, sans-serif; text-decoration:none;
     text-transform: uppercase;
-    padding: 0 20px 0 10px; 
+    padding: 0 20px 0 10px;
     margin: 0;
 }
 #newsLetter {
     margin: 0 auto;
 }
 #newsLetter span.nltop {
-    background: url(../../../site_icons/visualization/coauthorship/newsletter_top.gif) no-repeat 0 0 #FFFFFF; 
+    background: url(../../../site_icons/visualization/coauthorship/newsletter_top.gif) no-repeat 0 0 #FFFFFF;
     color: #000000;
-    line-height: 0; 
-    font-size: 0; 
+    line-height: 0;
+    font-size: 0;
     height: 15px;
     display: block;
 }
 #newsLetter span.nlbottom {
-    background: url(../../../site_icons/visualization/coauthorship/newsletter_bottom.gif) no-repeat 0 0 #FFFFFF; 
+    background: url(../../../site_icons/visualization/coauthorship/newsletter_bottom.gif) no-repeat 0 0 #FFFFFF;
     color: #000000;
-    line-height: 0; 
-    font-size: 0; 
-    height: 14px; 
+    line-height: 0;
+    font-size: 0;
+    height: 14px;
     display: block;
 }
 #newsLetter .middle {
@@ -368,243 +368,243 @@ ul {
     padding-right: 5px;
 }
 #newsLetter form.newsLetter h2.text2 {
-    background:u rl(../../../site_icons/visualization/coauthorship/newsletter_h2_bg.gif) no-repeat 0 0; 
+    background:u rl(../../../site_icons/visualization/coauthorship/newsletter_h2_bg.gif) no-repeat 0 0;
     color: #786E4E;
-    padding: 0 0 10px 65px; 
-    float: left; 
-    width: 228px; 
+    padding: 0 0 10px 65px;
+    float: left;
+    width: 228px;
     height: 37px;
     font: normal 24px/30px Georgia, "Times New Roman", Times, serif;
 }
 #newsLetter form.newsLetter h2.text2 span {
-    background-color: #FFFFFF; 
+    background-color: #FFFFFF;
     color: #0B0B0B;
     font: normal 24px/30px Georgia, "Times New Roman", Times, serif;
 }
 #bodyPannel form.search label,
 #newsLetter form.newsLetter label {
-    background-color: #FFFFFF; 
-    color: #0B0B0B; 
-    margin:  0 0 8px 0; 
+    background-color: #FFFFFF;
+    color: #0B0B0B;
+    margin:  0 0 8px 0;
     float: left;
-    font: bold 10px/28px Arial, Helvetica, sans-serif; 
+    font: bold 10px/28px Arial, Helvetica, sans-serif;
     text-transform: uppercase;
 }
 #newsLetter form.newsLetter input {
-    background-color: #EFEBDE; 
-    color: #0B0B0B; 
+    background-color: #EFEBDE;
+    color: #0B0B0B;
     border: #C3BCA4 1px solid;
-    width: 168px; 
-    height: 22px; 
-    padding: 2px; 
-    margin: 0 0 8px 15px; 
+    width: 168px;
+    height: 22px;
+    padding: 2px;
+    margin: 0 0 8px 15px;
     float: left;
     font: normal 14px/20px Arial, Helvetica, sans-serif;
 }
 #newsLetter form.newsLetter input.submit {
-    background: url(../../../site_icons/visualization/coauthorship/submit_bg.gif) no-repeat 45px 0 #FFFFFF; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/submit_bg.gif) no-repeat 45px 0 #FFFFFF;
+    color: #0B0B0B;
     border: none;
-    width: 60px; 
-    height: 13px; 
-    float: right; 
-    margin: 7px 34px 0 0; 
-    padding: 0 30px 0 0; 
+    width: 60px;
+    height: 13px;
+    float: right;
+    margin: 7px 34px 0 0;
+    padding: 0 30px 0 0;
     cursor: pointer;
-    font: normal 10px/13px Arial, Helvetica, sans-serif; 
+    font: normal 10px/13px Arial, Helvetica, sans-serif;
     text-transform: uppercase;
 }
 #contact {
-    width: 312px; 
+    width: 312px;
     float: right;
 }
 #contact span.ctop {
-    background: url(../../../site_icons/visualization/coauthorship/contact_top.gif) no-repeat 0 0 #FCFAF3; 
+    background: url(../../../site_icons/visualization/coauthorship/contact_top.gif) no-repeat 0 0 #FCFAF3;
     color: #000000;
-    line-height: 0; 
-    font-size: 0; 
-    height: 14px; 
+    line-height: 0;
+    font-size: 0;
+    height: 14px;
     display: block;
 }
 #contact span.cbottom {
-    background: url(../../../site_icons/visualization/coauthorship/contact_bottom.gif) no-repeat 0 0 #FCFAF3; 
+    background: url(../../../site_icons/visualization/coauthorship/contact_bottom.gif) no-repeat 0 0 #FCFAF3;
     color: #000000;
-    line-height: 0; 
-    font-size: 0; 
-    height: 25px; 
+    line-height: 0;
+    font-size: 0;
+    height: 25px;
     display: block;
 }
 #contact form.contact {
-    background: url(../../../site_icons/visualization/coauthorship/contact_midle.gif) repeat-y 0 0 #FCFAF3; 
+    background: url(../../../site_icons/visualization/coauthorship/contact_midle.gif) repeat-y 0 0 #FCFAF3;
     color: #000;
-    width: 272px; 
-    padding: 0 20px; 
+    width: 272px;
+    padding: 0 20px;
     float: left;
 }
 #contact form.contact h2.text3 {
-    background: url(../../../site_icons/visualization/coauthorship/contact_h2_bg.gif) no-repeat 0 0 #FFFFFF; 
+    background: url(../../../site_icons/visualization/coauthorship/contact_h2_bg.gif) no-repeat 0 0 #FFFFFF;
     color: #0B0B0B;
-    padding: 0 0 10px 55px; 
-    float: left; width:228px; 
+    padding: 0 0 10px 55px;
+    float: left; width:228px;
     height: 37px;
     font: normal 24px/30px Georgia, "Times New Roman", Times, serif;
 }
 #contact form.contact h2.text3 span {
-    background-color: #FFFFFF; 
+    background-color: #FFFFFF;
     color: #A60101;
     font: normal 24px/30px Georgia, "Times New Roman", Times, serif;
 }
 #contact form.contact label {
-    background-color: #FFFFFF; 
-    color: #0B0B0B; 
-    margin: 0 0 8px 0; 
+    background-color: #FFFFFF;
+    color: #0B0B0B;
+    margin: 0 0 8px 0;
     float: left;
     font: bold 10px/28px Arial, Helvetica, sans-serif; text-transform:uppercase;
 }
 #contact form.contact input {
-    background-color: #EFEBDE; 
-    color: #0B0B0B; 
+    background-color: #EFEBDE;
+    color: #0B0B0B;
     border: #C3BCA4 1px solid;
-    width: 168px; 
-    height: 22px; 
-    padding: 2px; 
-    margin: 0 0 8px 15px; 
+    width: 168px;
+    height: 22px;
+    padding: 2px;
+    margin: 0 0 8px 15px;
     float: right;
     font: normal 14px/20px Arial, Helvetica, sans-serif;
 }
 #contact form.contact textarea {
-    background-color: #EFEBDE; 
-    color: #0B0B0B; 
+    background-color: #EFEBDE;
+    color: #0B0B0B;
     border: #C3BCA4 1px solid;
-    width: 168px; 
-    height: 66px; 
-    padding: 2px; 
-    margin: 0 0 13px 15px; 
+    width: 168px;
+    height: 66px;
+    padding: 2px;
+    margin: 0 0 13px 15px;
     float: right;
     font: normal 14px/20px Arial, Helvetica, sans-serif;
 }
 #contact form.contact input.submit {
-    background: url(../../../site_icons/visualization/coauthorship/submit_bg.gif) no-repeat 45px 0 #FFFFFF; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/submit_bg.gif) no-repeat 45px 0 #FFFFFF;
+    color: #0B0B0B;
     border: none;
-    width: 60px; 
-    height: 13px; 
-    float: right; 
-    margin: 0 0 0 10px; 
-    padding: 0 20px 0 0; 
+    width: 60px;
+    height: 13px;
+    float: right;
+    margin: 0 0 0 10px;
+    padding: 0 20px 0 0;
     cursor: pointer;
-    font: normal 10px/13px Arial, Helvetica, sans-serif; 
+    font: normal 10px/13px Arial, Helvetica, sans-serif;
     text-transform: uppercase;
 }
 #contact form.contact input.reset {
-    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 45px 0 #FFFFFF; 
-    color: #0B0B0B; 
+    background: url(../../../site_icons/visualization/coauthorship/more_bg.gif) no-repeat 45px 0 #FFFFFF;
+    color: #0B0B0B;
     border: none;
-    width: 60px; height:13px; 
-    float: right; 
-    margin: 0; 
-    padding: 0 15px 0 0; 
+    width: 60px; height:13px;
+    float: right;
+    margin: 0;
+    padding: 0 15px 0 0;
     cursor: pointer;
-    font: normal 10px/13px Arial, Helvetica, sans-serif; 
+    font: normal 10px/13px Arial, Helvetica, sans-serif;
     text-transform: uppercase;
 }
 /* footer */
 #footer {
-    position: relative; 
-    margin: 0 auto; 
-    width: 678px; 
+    position: relative;
+    margin: 0 auto;
+    width: 678px;
     padding: 12px 0 50px;
 }
 #footer a.xhtml {
-    background-color: #CC0000; 
-    color: #FFFFFF; 
-    width: 49px; 
-    height: 16px; 
+    background-color: #CC0000;
+    color: #FFFFFF;
+    width: 49px;
+    height: 16px;
     margin: 0 6px 0 0;
-    font: bold 13px/16px "Trebuchet MS", Arial, Helvetica, sans-serif; 
-    display: block; 
-    text-align: center; 
-    text-decoration: none; 
+    font: bold 13px/16px "Trebuchet MS", Arial, Helvetica, sans-serif;
+    display: block;
+    text-align: center;
+    text-decoration: none;
     float: left;
 }
 #footer a.xhtml:hover {
-    background-color: #0B0B0B; 
-    color: #FFFFFF; 
-    width: 49px; 
-    height: 16px; 
+    background-color: #0B0B0B;
+    color: #FFFFFF;
+    width: 49px;
+    height: 16px;
     margin: 0 6px 0 0;
-    font: bold 13px/16px "Trebuchet MS", Arial, Helvetica, sans-serif; 
-    display: block; 
-    text-align: center; 
-    text-decoration: none; 
+    font: bold 13px/16px "Trebuchet MS", Arial, Helvetica, sans-serif;
+    display: block;
+    text-align: center;
+    text-decoration: none;
     float: left;
 }
 #footer a.css {
-    background-color: #0B0B0B; 
-    color: #FFFFFF; 
-    width: 38px; 
+    background-color: #0B0B0B;
+    color: #FFFFFF;
+    width: 38px;
     height: 16px;
     font: bold 13px/16px "Trebuchet MS", Arial, Helvetica, sans-serif;
-    display: block; 
-    text-align: center; 
-    text-decoration: none; 
+    display: block;
+    text-align: center;
+    text-decoration: none;
     float: left;
 }
 #footer a.css:hover {
-    background-color: #CC0000; 
-    color: #FFFFFF; 
-    width: 38px; 
+    background-color: #CC0000;
+    color: #FFFFFF;
+    width: 38px;
     height: 16px;
     font: bold 13px/16px "Trebuchet MS", Arial, Helvetica, sans-serif;
     display: block; text-align:center;
-    text-decoration: none; 
+    text-decoration: none;
     float: left;
 }
 #footer ul {
     float: right;
 }
 #footer ul li {
-    float: left; color:#0B0B0B; 
+    float: left; color:#0B0B0B;
     background-color: #FDF9EE;
     font: normal 12px/16px "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 #footer ul li a {
-    color: #0B0B0B; 
-    background-color: #FDF9EE; 
-    padding: 0 8px; 
+    color: #0B0B0B;
+    background-color: #FDF9EE;
+    padding: 0 8px;
     text-decoration: none;
     font: normal 12px/16px "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 #footer ul li a:hover {
-    color: #0B0B0B; 
-    background-color: #EFEBDE; 
-    padding: 0 8px; 
+    color: #0B0B0B;
+    background-color: #EFEBDE;
+    padding: 0 8px;
     text-decoration: none;
     font: normal 12px/16px "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 #footer p {
-    color: #A90000; 
-    background-color: #FDF9EE; 
-    padding: 0 8px; 
+    color: #A90000;
+    background-color: #FDF9EE;
+    padding: 0 8px;
     float: right;
     font: normal 12px/22px "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 #footer p.tworld {
-    color: #0B0B0B; 
-    background-color: #FDF9EE; 
-    padding: 0 8px; 
+    color: #0B0B0B;
+    background-color: #FDF9EE;
+    padding: 0 8px;
     float: right;
     font: normal 12px/19px "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 #footer p.tworld a {
-    color: #0B0B0B; 
-    background-color: #FDF9EE; 
+    color: #0B0B0B;
+    background-color: #FDF9EE;
     text-decoration: none;
     font: normal 12px/19px "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 #footer p.tworld a:hover {
-    color: #0B0B0B; 
-    background-color: #EFEBDE; 
+    color: #0B0B0B;
+    background-color: #EFEBDE;
     text-decoration: none;
     font: normal 12px/19px "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
diff --git a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
index a09e344a0d..b0f14b136d 100644
--- a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
+++ b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
@@ -31,7 +31,7 @@ This is for the overlay that happens when you change the parameter. Somehow the
 for the message is getting set to 50%, hence we need to override it here.
 */
 .blockElement {
-	top: 10px !important;	
+	top: 10px !important;
 }
 
 .easy-deselect-label a.temporal-vis-url {
@@ -144,7 +144,7 @@ a.clear-selected-entities,
 }
 #loading-comparisons img {
     vertical-align: sub;
-} 
+}
 #reset-search {
     color: #2485AE;
     cursor: pointer;
@@ -177,7 +177,7 @@ a.clear-selected-entities,
 }
 #functions{
     margin-top: 20px;
-    margin-bottom: -40px;   
+    margin-bottom: -40px;
 }
 #bar {
     height: 20px;
@@ -187,7 +187,7 @@ a.clear-selected-entities,
     margin-left: 10px;
 }
 #checkbox{
-    float:left; 
+    float:left;
 }
 .easy-deselect-label {
     float: left;
@@ -195,7 +195,7 @@ a.clear-selected-entities,
     width: 160px;
     text-align: left;
 }
-.easy-deselect-label a, 
+.easy-deselect-label a,
 #text {
     text-decoration: none;
     color: black;
@@ -226,8 +226,8 @@ sans-serif;
     overflow: hidden;
 }
 .entity-label-url {
-    width: 125px; 
-    margin-left: 10px; 
+    width: 125px;
+    margin-left: 10px;
     display: inline-block;
     text-decoration: underline;
     color: #2485AE;
@@ -240,7 +240,7 @@ sans-serif;
 }
 #graphContainer {
     margin-bottom: 15px;
-    width: 450px; 
+    width: 450px;
     height: 250px;
     margin-left: 23px;
 }
@@ -297,9 +297,9 @@ p.displayCounter{
     border-bottom: 1px solid gray;
 }
 #comparisonHeader,
-#entityHeader, 
-#entitylevelheading, 
-#comparisonParameter, 
+#entityHeader,
+#entitylevelheading,
+#comparisonParameter,
 #headerText {
     color: #2485ae;
 }
diff --git a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css
index 4db92f1401..16d139da61 100644
--- a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css
+++ b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css
@@ -24,18 +24,18 @@
 }
 
 #map_area {
-	width: 640px; 
+	width: 640px;
 	height: 480px;
 }
 
 #subEntityTableArea {
 	clear: both;
-	width: 100%; 
-	padding-top:5px; 
+	width: 100%;
+	padding-top:5px;
 }
 
 .subEntityTable {
-	width: 32%; 
+	width: 32%;
 	padding-top:5px;
 	padding-right: 8px;
 	float: left;
@@ -73,33 +73,33 @@ a.clear-selected-entities {
 
 /* tooltip */
 #tt {
-	font:11px/1.5 Verdana, Arial, Helvetica, sans-serif; 
-	position:absolute; 
-	display:block; 
+	font:11px/1.5 Verdana, Arial, Helvetica, sans-serif;
+	position:absolute;
+	display:block;
 	background:url(../../../images/visualization/mapofscience/tooltip/tt_left.gif) top left no-repeat
 }
 
 #tttop {
-	display:block; 
-	height:5px; 
-	margin-left:5px; 
-	background:url(../../../images/visualization/mapofscience/tooltip/tt_top.gif) top right no-repeat; 
+	display:block;
+	height:5px;
+	margin-left:5px;
+	background:url(../../../images/visualization/mapofscience/tooltip/tt_top.gif) top right no-repeat;
 	overflow:hidden
 }
 
 #ttcont {
-	display:block; 
-	padding:2px 12px 3px 7px; 
-	margin-left:5px; 
-	background:#666; 
+	display:block;
+	padding:2px 12px 3px 7px;
+	margin-left:5px;
+	background:#666;
 	color:#FFF
 }
 
 #ttbot {
-	display:block; 
-	height:5px; 
-	margin-left:5px; 
-	background:url(../../../images/visualization/mapofscience/tooltip/tt_bottom.gif) top right no-repeat; 
+	display:block;
+	height:5px;
+	margin-left:5px;
+	background:url(../../../images/visualization/mapofscience/tooltip/tt_bottom.gif) top right no-repeat;
 	overflow:hidden
 }
 
@@ -142,7 +142,7 @@ a.clear-selected-entities {
 }
 
 .suborganization-title {
-	vertical-align: middle; 
+	vertical-align: middle;
 	font-weight: bold;
 }
 
@@ -200,7 +200,7 @@ hr.subtle-hr {
 	border: 0;
 }
 
-#main-science-areas-table-container table tr { 
+#main-science-areas-table-container table tr {
 	min-height: 30px;
 	max-height: 30px;
 	height: 30px;
@@ -253,7 +253,7 @@ a.map-of-science-links {
     margin-top: 0;
 }
 
-.filterInfo, 
+.filterInfo,
 .paginatedtabs {
 	font-size: 0.81em;
 }
@@ -266,7 +266,7 @@ a.map-of-science-links {
 }
 
 .subpaginatedtabs span {
-    padding-right: 5px; 
+    padding-right: 5px;
     cursor: pointer;
     color: #2485AE;
 }
diff --git a/webapp/src/main/webapp/css/visualization/personlevel/page.css b/webapp/src/main/webapp/css/visualization/personlevel/page.css
index 8ccee4f7a7..857983d207 100644
--- a/webapp/src/main/webapp/css/visualization/personlevel/page.css
+++ b/webapp/src/main/webapp/css/visualization/personlevel/page.css
@@ -63,7 +63,7 @@ p.datatable {
 }
 #body h1 {
     margin: 0;
-} 
+}
 #ego_profile h1 a {
   text-decoration: none;
 }
@@ -88,7 +88,7 @@ p.datatable {
     float: left;
     margin-right: 10px;
 }
-.toggle_visualization { 
+.toggle_visualization {
     max-width: 230px;
     float: right;
     display: none;
@@ -148,7 +148,7 @@ table.sparkline_wrapper_table td, th {
     width: 50%;
 }
 #visPanel {
-    float: right; 
+    float: right;
     width: 600px;
 }
 .vis-tables table caption {
@@ -164,46 +164,46 @@ table.sparkline_wrapper_table td, th {
 .vis-tables table thead {
     text-align: left;
 }
-.vis-tables table thead tr th { 
-    background-color: #eaeaea; 
-    font-size: 14px; 
-    padding: 5px; 
-    vertical-align: top; 
-    text-align: left;  
+.vis-tables table thead tr th {
+    background-color: #eaeaea;
+    font-size: 14px;
+    padding: 5px;
+    vertical-align: top;
+    text-align: left;
 }
-.vis-tables table tbody { 
-    font-size: 12px;  
+.vis-tables table tbody {
+    font-size: 12px;
 }
-.vis-tables table tbody td { 
-    text-align: left; 
-    padding: 5px;  
+.vis-tables table tbody td {
+    text-align: left;
+    padding: 5px;
 }
 .moniker {
     margin-top: 0;
 }
 .spacer {
-    font-size: 0; 
-    line-height: 0; 
+    font-size: 0;
+    line-height: 0;
     clear: both;
 }
 /* <------ BODY START*/
 #body {
     max-width: 900px;
-    min-width: 800px; 
-    margin: 0 auto; 
+    min-width: 800px;
+    margin: 0 auto;
     position: relative;
     background: white;
 }
 #bodyPannel {
-    background: #FFFFFF;    
+    background: #FFFFFF;
     height: 840px;
     width: 100%;
     clear: both;
 }
-#dataPanel { 
+#dataPanel {
     border: 1px solid #e9e9e9;
     background: #F7F9F9;
-    width: 250px; 
+    width: 250px;
     height: 615px;
     float: left;
 }
@@ -234,7 +234,7 @@ table.sparkline_wrapper_table td, th {
 }
 /* <------ CONTAINER OVERRIDE FROM LIQUID.CSS*/
 .container {
-    width: inherit; 
+    width: inherit;
 }
 #incomplete-data {
     line-height: 150%;
@@ -257,5 +257,5 @@ table.sparkline_wrapper_table td, th {
     width: 54px;
 }
 #table_heading {
-    width: 80%; 
+    width: 80%;
 }
diff --git a/webapp/src/main/webapp/css/visualization/visualization.css b/webapp/src/main/webapp/css/visualization/visualization.css
index 411199c1f4..35cba72568 100644
--- a/webapp/src/main/webapp/css/visualization/visualization.css
+++ b/webapp/src/main/webapp/css/visualization/visualization.css
@@ -1,9 +1,9 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 /*****************************
- visualization styles       
+ visualization styles
 ******************************/
-                            
+
 span.incomplete-data-holder,
 #incomplete-data {
     padding: 5px;
@@ -67,7 +67,7 @@ span.incomplete-data-holder,
 }
 .google-visualization-sparkline-image {
     border: 1px solid #cfe4ed;
-    display: block; 
+    display: block;
 }
 .google-visualization-sparkline-selected {
     background-color: blue;
diff --git a/webapp/src/main/webapp/i18n/vivo_all.properties b/webapp/src/main/webapp/i18n/vivo_all.properties
index c33bf1a8fc..d54ceaf051 100644
--- a/webapp/src/main/webapp/i18n/vivo_all.properties
+++ b/webapp/src/main/webapp/i18n/vivo_all.properties
@@ -1,812 +1,812 @@
-#
-# Text strings for the controllers and templates
-#
-# Default (English)
-#
-
-uri_icon = uri icon
-
-#
-# "partial" individual templates ( /templates/freemarker/body/partials/individual )
-#
-contact_capitalized = Contact
-phone = phone
-primary_email = primary email
-additional_emails = additional emails
-email = email
-primary_email_capitalized = Primary Email
-additional_emails_capitalized = Additional Emails
-contact_info = Contact Info
-
-active_grants_for = Active Grants for the
-department = department
-grant_name = Grant Name
-close_date = Close Date
-no_active_grants = There are currently no active grants for this department.
-view_all_active_grants = View all active grants
-
-individuals_with_researh_area_one = Here are the individuals in <a href="{1}">{0}</a> who have an interest in this research area.
-individuals_with_researh_area_two = Here are the individuals in the <a href="{1}">{0}</a> who have an interest in this research area.
-individuals_with_dept = Here are the individuals with an interest in <a href="{1}">{0}</a> who are in this organization.
-faculty_with_researh_area = Here are the faculty members in the {0} department who have an interest in this research area.
-view_all_individuals_in_area = View all individuals with an interest in this area.
-view_all_individuals_in_dept = View all individuals in this organization.
-view_all_faculty_in_area = View all faculty with an interest in this area.
-faculty_research_areas = Faculty Research Areas
-affiliated_research_areas = Affiliated Research Areas
-affiliated_departments = Associated Departments
-organization = individuals with the research area in this organization
-
-share_the_uri = share the uri
-
-export_qr_codes = Export QR codes
-vcard_qr = vCard QR
-vcard_qr_code = vCard QR Code
-close_capitalized = Close
-qr_icon = qr icon
-qr_code = QR Code
-invalid_qr_code_parameter = You have passed an invalid value for the qrCode display parameter.
-
-research_areas = research areas
-
-publications_in_vivo = Publications in VIVO
-co_author = co-author
-co_authors = co-authors
-co_author_network = Co-author Network
-map_of_science = map of science
-map_of_science_capitalized = Map of Science
-co_investigator_network = co-investigator network
-co_investigator_network_capitalized = Co-investigator Network
-
-networks = Networks
-co_authors_capitalized = Co-authors
-
-temporal_graph = temporal graph
-temporal_graph_capitalized = Temporal Graph
-
-websites = Websites
-
-advisee_label = advisee label
-advisor_label = advisor label
-candidate = candidate
-candidacy = candidacy
-advisingRel_label = advisory label
-
-editor_abbreviated = Ed.
-volume_abbreviated = Ed.
-resource_name = resource name
-missing_info_resource = missing information resource
-
-award_receipt_name = award receipt name
-award_name = award name
-conferred_by = conferred by
-conferred_on = conferred on
-selected_award = Selected Award
-
-incomplete_date_time_interval = incomplete date/time interval
-incomplete_date_time_value = incomplete date/time value
-
-in = in
-organization_name = organization name
-missing_organization = missing organization
-middle_organization = middle organization
-
-concept_name = concept name
-
-at = at
-event_name = event name
-missing_event = missing event
-event_label = event label
-
-activity_name = activity name
-missing_activity = missing activity
-awarded_by = awarded by
-administered_by = administered by
-
-presentation_name = presentation name
-missing_presentation = missing presentation
-conference = conference
-series = series
-
-author_name = author name
-missing_author = missing author
-
-person_name = person name
-missing_person_in_posn = missing person in this position
-missing_person_in_role = missing person in this role
-
-scopus_id_link = Scopus ID Link
-
-click_to_view_web_page = Click to view the {0} web page
-screenshot_of_webpage = screenshot of webpage {0}
-click_webpage_icon = click webpage icon
-link_text = link text
-link_name = link name
-no_url_provided = no url provided for link
-
-#
-# individual templates ( /templates/freemarker/body/individual )
-#
-standard_view = Standard profile view
-quick_view = Quick profile view
-quick_view_icon = quick view icon
-geographic_focus = Geographic Focus
-
-background_top_image = background top image
-full_view_icon = full view icon
-profile_type = Profile Type
-#
-# body templates ( /templates/freemarker/body/ )
-#
-export_qr_code = Export QR code
-more_qr_info = More info on QR codes
-what_is_this = What is this?
-view_this_profile = View this person's profile
-vcard = Vcard
-hyperlink = Hyperlink
-
-#
-# harvester templates ( /templates/freemarker/body/harvester )
-#
-must_be_admin = You must be an administrator to use this tool.
-error_no_job_specified = Error: No file harvest job was specified, or an unknown job was specified.
-probably_a_bug_so_report = The end user should not see this error under normal circumstances, so this is probably a bug and should be reported.
-return_to_ingest_menu = Return to the Data Ingest Tools menu
-ingest_menu = Ingest Menu
-data_being_harvested = Please wait while your data is harvested.
-harvest_complete = Harvest complete.  For another, please refresh the page.
-error_harvest_cannot_continue = An error has occurred and the file harvest cannot continue.
-harvest_error_instructions_one = This is most likely due to an improper Harvester configuration. Please ensure the following:
-harvest_error_instructions_two = VIVO Harvester is installed.
-the_capitalized = The
-harvester_location = harvester.location
-harvest_error_instructions_three = property in runtime.properties is pointed to the Harvester installation directory.
-harvest_error_instructions_fourA = In VIVO Harvester, the web server user (typically tomcat6) has read and write access to the 
-harvest_error_instructions_fourB = vivo/
-harvest_error_instructions_fourC = directory and all of its children.
-harvest_error_instructions_fiveA = In VIVO Harvester, the
-harvest_error_instructions_fiveB = logs/
-harvest_error_instructions_fiveC = directory exists and the web server user has read and write access to it.
-harvest_error_instructions_sixA = In VIVO Harvester, the file
-harvest_error_instructions_sixB = vivo/config/vivo.xml
-harvest_error_instructions_sixC = is properly configured with your database information and namespace.
-step_one = Step 1
-download_template = Download template
-download = Download
-step_two = Step 2
-fill_in_data = Fill in data
-help_capitalized = Help
-fill_in_template_with_data = Fill in the template with your data.  You may fill in multiple templates if you wish to harvest multiple files at once.
-step_three = Step 3
-upload_files = Upload file(s)
-upload_completed_templates = Upload your completed template(s).
-upload_capitalized = Upload
-uploaded_files = Uploaded files
-step_four = Step 4
-harvest_capitalized = Harvest
-click_to_harvest = Click the button to harvest your file(s).
-step_five = Step 5
-view_results = View results
-script_executed = Script being executed
-progress_capitalized = Progress
-undefined_runtime_property = property in runtime.properties is undefined.
-define_value_for_property = In order to use this feature, please define a value for this property that points to the Harvester installation directory before redeploying and restarting the application.
-
-#
-# lib templates ( /templates/freemarker/body/lib )
-#
-faculty_capitalized = Faculty
-loading_faculty = Loading faculty . . .
-research_capitalized = Research
-view_all = View all ...
-view_all_research = view all research
-no_research_content_found = No research content found.
-departments = Departments
-loading_map_information = Loading map information . . .
-verify_match_capitalized = Verify this match
-
-#
-# custom form templates ( /templates/freemarker/edit/forms )
-#
-manage_concepts = Manage Concepts
-no_concepts_specified = There are currently no concepts specified.
-return_to_profile = Return to Profile Page
-external_vocabulary_services = External Vocabulary Services
-create_own_concept = Select or create a VIVO-defined concept.
-add_selected_concept = Add Selected Concept
-cannot_find_concept = Can't find the concept you want? Select or create a VIVO-defined concept.
-add_concept = Add Concept
-
-event_type = event type
-attended = attended
-
-manage_authors = Manage Authors
-no_linked_author = no linked author
-remove_author_link = remove author link
-add_author = Add Author
-return_to_publication = Return to publication
-add_an_author = Add an Author
-person_capitalized = Person
-organization_capitalized = Organization
-middle_name = Middle name
-initial_okay = initial okay
-selected_author = Selected Author
-organization_name_capitalized = Organization name
-selected_organization = Selected Organization
-
-clinical_activity = clinical activity
-clinical_activity_type = clinical activity type
-year_hint_format = YYYY
-
-collection_series_editor_role = collection or series editor role
-editor_role_in = editor role in
-
-edit_wbpage_of = Edit webpage of
-add_webpage_for = Add webpage for
-add_webpage = Add Web Page
-url_type = URL Type
-faculty_of_1000 = Faculty of 1000 Link
-standard_web_link = Standard Web Link
-webpage_name = Webpage Name
-
-investigator_entry_for = investigator entry for
-investigator_capitalized = Investigator
-principal_investigator_entry_for = principal investigator entry for
-co_principal_investigator_entry_for = co-principal investigator entry for
-start_year_must_precede_end = The Start Year must be earlier than the End Year.
-end_year_must_be_later = The End Year must be later than the Start Year.
-enter_or_select_grant = Please enter or select a value in the Grant Name field.
-selected_grant = Selected Grant
-years_of_grant_participation = Years of Participation in Grant
-
-leadership = leadership
-organization_type = organization type
-
-membership = membership
-membership_in = membership in
-organizations = organizations
-
-organizer_of = organizer of
-
-outreach_comm_service = outreach & community service
-outreach_comm_service_in = outreach & community service in
-
-select_or_enter_name = Please select an existing value or enter a new value in the Name field.
-presentation_entry_for = presentation entry for
-presentation_capitalized = Presentation
-presentation_type = Presentation Type
-role_in = Role in
-presentation_hint = e.g., Moderator, Speaker, Panelist
-presented_at = Presented At
-selected_conference = Selected Conference
-
-select_existing_pub_or_enter_new = Please select an existing publication in the Title field or enter a new one.
-
-publication_entry_for = publication entry for
-publication_type = Publication Type
-selected_publication = Selected Publication
-published_in = Published in
-selected_journal = Selected Journal
-selected_event = Selected Event
-proceedings_of = Proceedings of
-editor_capitalized = Editor
-required_with_last_name = required with new Last name
-selected_editor = Selected Editor
-publisher_capitalized = Publisher
-selected_publisher = Selected Publisher
-volume_capitalized = Volume
-number_capitalized = Number
-issue_capitalized = Issue
-chapter_capitalized = Chapter
-start_page = Start Page
-end_page = End Page
-selected_book = Selected Book
-publication_date = Publication Date
-place_of_publication = Place of Publication
-
-research_activity = research activity
-research_activity_type = research activity type
-
-reviewer_of = reviewer of
-
-entry_for = entry for
-specify_role_for_activity = Please specify a role for this activity.
-start_year = Start Year
-
-service_to_profession = service to the profession
-service_to_profession_in = service to the profession in
-
-teaching_activity = teaching activity
-teaching_activity_type = teaching activity type
-teaching_role_hint = e.g., Instructor, Facilitator, Assistant
-
-create_own_concept_all_caps = Create Your Own Concept
-concept_capitalized = Concept
-selected_concept = Selected Concept
-create_concept = Create Concept
-return_to_manage_concepts = Return to Manage Concepts
-
-institutional_internal_class = Institutional Internal Class
-internal_class_intro_one = This class will be used to designate those individuals internal to your institution.
-internal_class_intro_two = This will allow you to limit the individuals displayed on your menu pages (People, Research, etc.) to only those within your institution.
-no_local_oncologies = There are currently no recognized local ontologies.
-namespace_must_use_this_pattern = In order for a local ontology to be recognized here, its namespace URI must follow this pattern
-new_local_oncology = a new local ontology
-return_here_to_define_class = and then return here to define the institutional internal class.
-select_existing_local_class = Select an existing class from a local extension
-cannot_find_class = Can't find an appropriate class?
-create_new_class = Create a new class
-create_new_one = Create a new one
-use_capitals_each_word = use capitals for the first letter of each word
-local_namespace = Local Namespace
-problematic_section_error = Error: problematic section as above should all have been handled.
-new_local_ontology = new local ontology
-
-manage_grants_and_projects = Manage Grants & Projects for
-check_grants_to_exclude = Check those grants and projects you want to <em>exclude</em> from the profile page.
-
-manage_affiliated_people = Manage People Affiliated with
-check_people_to_exclude = Check those people you want to <em>exclude</em> from the profile page.
-
-manage_publications_for = Manage Publications for
-check_pubs_to_exclude = Check those publications you want to <em>exclude</em> from the profile page.
-
-manage_web_pages = Manage Web Pages
-has_no_webpages = This individual currently has no web pages specified. Add a new web page by clicking on the button below.
-edit_webpage_link = edit web page link
-delete_webpage_link = delete web page link
-webpage_url = webpage url
-add_new_web_page = Add New Web Page
-
-enable_internal_class_one = To enable this option, you must first select an
-enable_internal_class_two = for your instance
-internal_class = institutional internal class
-only_display = Only display
-within_my_institution = within my institution
-
-enter_a_name = Please enter a value in the Name field.
-enter_last_name = Please enter a Last name for this person.
-enter_first_name = Please enter a First name for this person.
-
-posn_history_entry_for = position history entry for
-enter_posn_title_value = Please enter a value in the Position Title field.
-enter_posn_type_value = Please select a value in the Position Type field.
-enter_or_select_person_value = Please select an existing value or enter a new value in the Person field.
-position_title = Position Title
-position_type = Position Type
-selected_person = Selected Person
-
-degree_candidacy = Degree Candidacy
-subject_area = Subject Area
-selected_subject_area = Selected Subject Area
-selected_advisee = Selected Advisee
-selected_advisor = Selected Advisor
-advisee_capitalized = Advisee
-advisor_capitalized = Advisor
-advising_relationship_type = Advising Relationship Type
-select_advising_relationship_type = Please select an Advising Relationship Type.
-advisor_relationship_entry_for = advisor relationship entry for
-advisee_relationship_entry_for = advisee relationship entry for
-years_participating = Years of Participation
-
-award_or_honor_for = award or honor for
-select_Award_or_enter_name = Please select an existing value or enter a new value in the Award or Honor Name field.
-award_honor_name = Award or Honor Name
-conferred_by_capitalized = Conferred by
-selected_conferred = Selected Conferrer
-description = Description
-year_awarded = Year Awarded
-years_inclusive = Years Inclusive
-award_hint = (e.g., for multi-year awards)
-
-educational_training_for = educational training entry for
-select_organization_type = Please select a value in the Organization Type field.
-select_an_organization_name = Please enter or select a value in the Name field.
-select_educational_training_value = Please select a value in the Type of Educational Training field.
-org_type_capitalized = Organization Type
-educational_training_type = Type of Educational Training
-dept_or_school_name = Department or School Name within the
-degree = Degree
-missing_degree = missing degree
-major_field = Major Field of Degree
-supplemental_information = Supplemental Information
-supplemental_information_hint = (e.g., Thesis title, Transfer info, etc.)
-academic_studies_or_other = Academic Studies or Other Training
-
-create_mailing_address = Create Mailing Address
-mailing_address_for = mailing address for
-enter_a_country = Please enter a value in the Country field.
-enter_street_address = Please enter a value in the Street Address field.
-enter_a_locality = Please enter a value in the City/Locality field.
-enter_postal_code = Please enter a value in the Postal Code field.
-country = Country
-street_address = Street Address
-city_locality = City/Locality
-region = State/Province/Region
-postal_code = Postal Code
-
-posn_entry_for = position entry for
-
-#
-#  coauthorship templates ( /templates/freemarker/visualization/coauthorship )
-#
-within_last_10_years = within the last 10 years
-total = total
-from = from
-file = file
-file_capitalized = File
-view_full_timeline_and_network = View full timeline and co-author network.
-download_data_as = Download data as
-unique_coauthors_per_year = Unique Co-Authors per year
-count_capitalized = Count
-
-#
-#  copi templates ( /templates/freemarker/visualization/copi )
-#
-year_capitalized = Year
-unique_coinvestigators = Unique co-investigators
-co_investigator = co-investigator
-co_investigators = co-investigators
-unique_coinvestigators_per_year = Unique Co-Investigators per year
-view_timeline_copi_network = View full timeline and co-investigator network.
-
-#
-#  entity comparison templates ( /templates/freemarker/visualization/entitycomparison )
-#
-parent_organization_of = Parent organization of
-temporal_graph_drill_up = temporal graph drill up
-how_to_compare = How do you want to compare?
-no_view_link = no view link
-persistent_link_to_visualization = Persistent link to current visualization
-error_notification = error notification
-close_me = Close Me
-what_to_compare = What do you want to compare?
-organizations_capitalized = Organizations
-people_capitalized = People
-organization_hierarchy_note = Note: the organizations or people listed below are only those which are directly beneath {0} in the organization hierarchy. You may 'drill down' to see the organizations or people below a given sub-organization by selecting the chart icon next to a selected sub-organization's name below the graph on the right.
-save_all_as_csv = Save All as CSV
-clear_capitalized = Clear
-clear_all_selected_entities = Clear all selected entities.
-comparing_capitalized = Comparing
-of = of
-institutions_capitalized = Institutions
-info_based_on_vivo_data = This information is based solely on {0} which have been loaded into the VIVO system.
-you_have_selected = You have selected
-of_a_maximum = of a maximum
-schools = schools
-legend_capitalized = Legend
-with_unknown_year = with unknown year
-with_known_year = with known year
-from_current_incomplete_year = from current incomplete year
-
-entity_comp_error_text1 = This organization has neither sub-organizations nor people with
-entity_comp_error_text2 = in the system.
-entity_comp_error_text3 = Please visit the full
-entity_comp_error_text4 = for a more complete overview.
-profile_page = profile page
-
-publication = publication
-published = published
-publications = publications
-by_publications = by Publications
-publications_capitalized = Publications
-grant = grant
-granted = granted
-grants = grants
-by_grants = by Grants
-grants_capitalized = Grants
-activity = activity
-activities = activities
-
-#
-#  grant visualization templates ( /templates/freemarker/visualization/grant )
-#
-view_all_grants = view all grants
-view_all_grants_text = View all VIVO grants and corresponding co-investigator network.
-grant_per_year = Grants per year
-link = link
-
-#
-#  map of science templates ( /templates/freemarker/visualization/mapOfScience )
-#
-parent_entity = parent entity
-map_of_science_icon = map of science icon
-explore_activity = Explore activity
-explore_capitalized = Explore
-across_subdisciplines = across 554 scientific subdisciplines
-compare_organizations = Compare organizations
-mapped = mapped
-save_unmapped_publications = Save Unmapped Publications
-map_of_science_visualization = Map of Science Visualization
-no_publications_for_this_organization = No publications in the system have been attributed to this organization.
-please_visit = Please visit the
-for_complete_overview = for a complete overview.
-
-#
-#  model constructor templates ( /templates/freemarker/visualization/modelconstructor )
-#
-cached_models_regenerated = The following cached models will be regenerated.
-uri_independent_model = URI Independent Model
-currently_no_constructed_models = Currently there are no constructed models for use by visualization.
-
-#
-#  person level templates ( /templates/freemarker/visualization/personlevel)
-#
-co_investigator_icon = co-investigator icon
-co_authorship = co-authorship
-this_author = this author
-in_the_vivo_db = in the VIVO database.
-no_papers_for = Currently there are no papers for
-publication_s_capitalized = Publication(s)
-co_author_s_capitalized = Co-author(s)
-incomplete_data_note1 = Note: This information is based solely on publications that have been loaded into the VIVO system. This may only be a small sample of the person's total work.
-incomplete_data_note2 = Go to your profile page to enter additional details about your publications.
-incomplete_data_note3 = Log in to enter additional details about your publications on your profile page.
-tables_capitalized = Tables
-publications_per_year = Publications per year
-
-investigator_name = investigator name
-co_author_icon = co-author icon
-currently_no_grants_for = Currently there are no {0} grants for
-this_investigator = this investigator
-grant_s_capitalized = Grant(s)
-co_investigator_s_capitalized = Co-investigator(s)
-incomplete_grant_data_note1 = Note: This information is based solely on grants that have been loaded into the VIVO system. This may only be a small sample of the person's total work.
-incomplete_grant_data_note2 = Go to your profile page to enter additional details about your grants.
-incomplete_grant_data_note3 = Log in to enter additional details about your grants on your profile page.
-grants_per_year = Grants per year
-grant_info_for_all_years = The information in the following tables is for all years.
-grant_sparkline_note = The spark lines shown above reflect grants through the last complete calendar year. These tables, however, show the grant information for all years, based on the information loaded in the VIVO system.
-
-#
-#  publication templates ( /templates/freemarker/visualization/publication)
-#
-numbers_based_on_publications_in_vivo = These numbers are based solely on publications that have been loaded into this VIVO application. If this is your profile, you can enter additional publications below.
-last_ten_full_years = in the last 10 full years
-
-last_ten_full = in the last 10 full
-download_link = download link
-years = years
-
-#
-#  miscellaneous visualization templates ( /templates/freemarker/visualization)
-#
-visualization_tools = Visualization Tools
-refresh_cached_vis_models = Refresh Cached Models for Visualization
-why_needed = Why is it needed?
-vis_tools_note_one = Large-scale visualizations like the Temporal Graph or the Map of Science involve calculating total counts of publications or of grants for some entity. Since this also means checking through all of its sub-entities, the underlying queries can be both memory-intensive and time-consuming. For a faster user experience, we wish to save the results of these queries for later re-use.
-vis_caching_process = What's involved in the caching process?
-vis_tools_note_two = To this end we have devised a caching solution which will retain information about the hierarchy of organizations -- namely, which publications are attributed to which organizations -- by storing the RDF model.
-vis_tools_note_three = We're currently caching these models in memory.  The cache is built (only once) on the first user request after a server restart.  Because of this, the same model will be served until the next restart. This means that the data in these models may become stale depending upon when it was last created. This works well enough for now. In future releases we will improve this solution so that models are stored on disk and periodically updated.
-vis_tools_note_four = The models are refreshed each time the server restarts.  Since this is not generally practical on production instances, administrators can instead use the "refresh cache" link above to do this without a restart.
-
-#
-#  custom form javascript variables ( /templates/freemarker/edit/js)
-#
-drag_drop_reorder_authors = Drag and drop to reorder authors
-reordering_authors_failed = Reordering of authors failed.
-confirm_author_removal = Are you sure you want to remove this author:
-error_processing_author_request = Error processing request: author not removed
-author_capitalized = Author
-or_add_new_one = or add a new one.
-
-vocabulary_service_unavailable = An error was encountered in executing this search.
-no_serch_results_found = No search results were found.
-label_type = Label (Type)
-label_altLabels = Label (Alternate Labels)
-definition_capitalized = Definition
-best_match = Best Match
-select_term_from_results = Please select at least one term from the search search results.
-select_vocabulary_source_to_search = Please select at least one external vocabulary source to search.
-confirm_term_deletion = Are you sure you want to remove this term?
-error_term_not_deleted = Error processing request: term not removed
-
-advising = advising
-advising_relationship = advising relationship
-
-select_or_create_organization = Select an existing Organization or create a new one.
-
-grant_successfully_excluded = The item has been successfully excluded from the profile page.
-error_excluding_grant = Error processing request: the item cannot be excluded from the profile page.
-
-person_successfully_excluded = The person has been successfully excluded from the organization page.
-error_excluding_person = Error processing request: the person cannot be excluded from the organization page.
-
-publication_successfully_excluded = The publication will has been successfully excluded from the profile page.
-error_excluding_publication = Error processing request: the publication cannot be excluded from the profile page.
-
-drag_drop_to_reorder_webpages = Drag and drop to reorder web pages
-webpage_reordering_failed = Reordering of web pages failed.
-confirm_webpage_deletion = Are you sure you want to remove this web page?
-error_removing_webpage = Error processing request: web page not removed.
-
-#
-#  miscellaneous javascript variables ( productMods/js)
-#
-researcher = researcher
-
-#
-#  individual javascript variables ( productMods/js/individual)
-#
-error_processing_type_change = Error processing request: the unchecked labels could not be deleted.
-
-#
-#  visualization javascript variables ( productMods/js/visualization)
-#
-publications_with = Publications with
-
-co_investigators_capitalized = Co-investigators
-grants_with = Grants with
-
-vis_first_link = First
-vis_last_link = Last
-vis_previous_link = Prev
-vis_next_link = Next
-
-max_entity_note = A Maximum 10 entities can be compared. Please remove some & try again.
-organizations_and_people = Organizations and People
-loading_data_for = Loading data for
-data_for = Data for
-refreshing_data_message = is now being refreshed. The visualization will load as soon as we are done computing, or you can search or browse other data in VIVO and come back in a few minutes.
-disclaimer_text_one = This information is based solely on
-disclaimer_text_two = which have been loaded into the VIVO system as of
-level_undefined_error = ENTITY LEVEL UNDEFINED ERROR
-
-total_number_of = Total Number of
-number_of = Number of
-have_an_unknown = have an unknown
-year_not_chartered = year (not charted above)
-in_completed_year = in a completed year
-were = were
-in_current_incomplete_year = in the current incomplete year (not charted above)
-publication_count = Publication Count
-grant_count = Grant Count
-entity_type = Entity Type
-entity_label = Entity Label
-no_matching_entities_found = No matching entities found
-clear_search_query = clear search query
-short_max_entity_note = A Maximum of 10 entities can be compared.
-information_capitalized = Information
-content_requires_flash = This content requires the Adobe Flash Player.
-get_flash = Get Flash
-of_pubs = of pubs.
-max_nbr_for_comp = The maximum number of items for comparison is 3.
-no_matching_science_areas = No matching science areas found
-
-subdisciplines = Subdisciplines
-disciplines = Disciplines
-science_area_level = Level of Science Area
-of_activity = of activity
-
-drill_down = drill down
-
-disciplines_lower = disciplines
-subdisciplines_lower = subdisciplines
-show_discipline_labels = Show discipline labels
-
-no_attributed_publications = No publications in the system have been attributed to this
-none_of_the = None of the
-publications_attributed_to = publications attributed to this
-been_science_located = have been "science-located."
-publication_attributed_to = The publication attributed to this
-not_science_located = has not been "science-located."
-no_journal_information = have no journal information.
-no_matching_map_location = could not be matched with a map location using their journal information.
-
-map_being_refreshed_msg = is now being refreshed. The visualization will load as soon as we are done computing, or you can search or browse other data in VIVO and come back in a few minutes.
-
-publication_pubs = publications (pubs.)
-percent_activity = % activity
-
-#
-#  miscellaneous additions
-#
-
-standardview_tooltip_one = Click to display the
-standardview_tooltip_two = profile quick view.
-research_area_tooltip_one = Click an area to view others
-research_area_tooltip_two = with the same interest.
-quickview_tooltip = Click to view the standard profile page.
-global_research = Global Research
-country_wide_research = Country-wide Research
-local_research = Local Research
-selected_presentation = Selected Presentation
-event_capitalized = Event
-item_capitalized = Item
-telephone_number_for = telephone number for
-telephone_number = Telephone Number
-enter_telephone_number = Please enter a value in the Telephone Number field.
-email_address_for = email address for
-enter_email_address = Please enter a value in the Email Address field.
-full_name_for = full name for
-title_not_found = Title not found.
-speeches_capitalized = Speeches
-theses_capitalized = Theses 
-select_document_type = Please select a value in the Document Type field.
-select_a_document_name = Please enter or select a value in the Document Name field.
-document_type_capitalized = Document Type
-document_name_capitalized = Document Name
-selected_document = Selected Document
-editor_name = editor name
-missing_editor = missing editor
-drag_drop_reorder_editors = Drag and drop to reorder editors
-reordering_editors_failed = Reordering of editors failed.
-confirm_editor_removal = Are you sure you want to remove this editor:
-error_processing_editor_request = Error processing request: editor not removed
-manage_editors = Manage Editors
-no_linked_editor = no linked editor
-remove_editor_link = remove editor link
-add_an_editor = Add an Editor
-add_editor = Add Editor
-please_select_type = Please select a type from the drop-down list.
-preferred_title = Preferred Title
-preferred_title_for = preferred title for
-enter_preferred_title = Please enter a value in the Preferred Title field.
-fax_number_for = fax number for
-fax_number = Fax Number
-enter_fax_number = Please enter a value in the Fax Number field.
-credentials = credentials
-select_credential_or_enter_name = Please enter or select a value in the Credential Name field.
-type_of_credential = Type of Credential
-credential_name = Credential Name
-selected_credential = Selected Credential
-year_issued = Year Issued
-year_awarded_for = year awarded for
-create_year_awarded = Create year awarded
-edit_year_awarded = Edit year awarded
-publication_date_for = publication date for
-create_publication_date = Create publication date
-edit_publication_date = Edit publication date
-name_prefix = Name Prefix
-name_suffix = Name Suffix
-administering_organization_for = administering organization for
-missing_credential = missing credential
-grant_administered_by = grant being administered by
-missing_grant = missing grant
-editor_of_entry = editor of entry for
-role_type = Role type
-researcher_role = Researcher Role
-search_service_btn = Search Service
-through_today = Publications through today's date
-doi_link=Digital Object Identifier (DOI)
-
-using_cache_time=Using information cached at
-
-#
-#New Entries for i18n purposes
-#
-edit_entry_for_head_role=: Edit this "head of" role
-edit_entry_for_member_role=: Edit this membership
-edit_entry_for_clinical_role=: Edit this clinical activity
-edit_entry_for_attendee_role=: Edit this participation 
-edit_entry_for_organizer_role=: Edit this organizer role 
-edit_entry_for_editor_role=: Edit this editor role
-edit_entry_for_service_provider_role=: Edit this service provider role 
-edit_entry_for_outreach_provider_role=: Edit this outreach provider role
-edit_entry_for_researcher_role=: Edit this researcher role
-edit_entry_for_reviewer_role=: Edit this reviewer role
-edit_entry_for_teacher_role=: Edit this teaching role
-
-create_entry_for_head_role=: Add a new "head of" role
-create_entry_for_member_role=: Add a new membership
-create_entry_for_clinical_role=: Add a new clinical activity
-create_entry_for_attendee_role=: Add a new participation 
-create_entry_for_organizer_role=: Add a new Organizer role 
-create_entry_for_editor_role=: Add a new editor role
-create_entry_for_service_provider_role=: Add a new service provider role 
-create_entry_for_outreach_provider_role=: Add a new outreach provider role
-create_entry_for_researcher_role=: Add a new researcher role
-create_entry_for_reviewer_role=: Add a new reviewer role
-create_entry_for_teacher_role=: Add a new teaching role
-
-
-save_changes=Save
-start_capitalized = Start
-end_capitalized = End
-institution_name=Name of Institution
-role_in_institution=Role in Institution
-presentation_name_capitalized=Title of Presentation
-role_in_presentation_capitalized=Role in Presentation
-advisee_capitalized_first_name=First Name
-advisee_capitalized_lastname=Last Name
-
+#
+# Text strings for the controllers and templates
+#
+# Default (English)
+#
+
+uri_icon = uri icon
+
+#
+# "partial" individual templates ( /templates/freemarker/body/partials/individual )
+#
+contact_capitalized = Contact
+phone = phone
+primary_email = primary email
+additional_emails = additional emails
+email = email
+primary_email_capitalized = Primary Email
+additional_emails_capitalized = Additional Emails
+contact_info = Contact Info
+
+active_grants_for = Active Grants for the
+department = department
+grant_name = Grant Name
+close_date = Close Date
+no_active_grants = There are currently no active grants for this department.
+view_all_active_grants = View all active grants
+
+individuals_with_researh_area_one = Here are the individuals in <a href="{1}">{0}</a> who have an interest in this research area.
+individuals_with_researh_area_two = Here are the individuals in the <a href="{1}">{0}</a> who have an interest in this research area.
+individuals_with_dept = Here are the individuals with an interest in <a href="{1}">{0}</a> who are in this organization.
+faculty_with_researh_area = Here are the faculty members in the {0} department who have an interest in this research area.
+view_all_individuals_in_area = View all individuals with an interest in this area.
+view_all_individuals_in_dept = View all individuals in this organization.
+view_all_faculty_in_area = View all faculty with an interest in this area.
+faculty_research_areas = Faculty Research Areas
+affiliated_research_areas = Affiliated Research Areas
+affiliated_departments = Associated Departments
+organization = individuals with the research area in this organization
+
+share_the_uri = share the uri
+
+export_qr_codes = Export QR codes
+vcard_qr = vCard QR
+vcard_qr_code = vCard QR Code
+close_capitalized = Close
+qr_icon = qr icon
+qr_code = QR Code
+invalid_qr_code_parameter = You have passed an invalid value for the qrCode display parameter.
+
+research_areas = research areas
+
+publications_in_vivo = Publications in VIVO
+co_author = co-author
+co_authors = co-authors
+co_author_network = Co-author Network
+map_of_science = map of science
+map_of_science_capitalized = Map of Science
+co_investigator_network = co-investigator network
+co_investigator_network_capitalized = Co-investigator Network
+
+networks = Networks
+co_authors_capitalized = Co-authors
+
+temporal_graph = temporal graph
+temporal_graph_capitalized = Temporal Graph
+
+websites = Websites
+
+advisee_label = advisee label
+advisor_label = advisor label
+candidate = candidate
+candidacy = candidacy
+advisingRel_label = advisory label
+
+editor_abbreviated = Ed.
+volume_abbreviated = Ed.
+resource_name = resource name
+missing_info_resource = missing information resource
+
+award_receipt_name = award receipt name
+award_name = award name
+conferred_by = conferred by
+conferred_on = conferred on
+selected_award = Selected Award
+
+incomplete_date_time_interval = incomplete date/time interval
+incomplete_date_time_value = incomplete date/time value
+
+in = in
+organization_name = organization name
+missing_organization = missing organization
+middle_organization = middle organization
+
+concept_name = concept name
+
+at = at
+event_name = event name
+missing_event = missing event
+event_label = event label
+
+activity_name = activity name
+missing_activity = missing activity
+awarded_by = awarded by
+administered_by = administered by
+
+presentation_name = presentation name
+missing_presentation = missing presentation
+conference = conference
+series = series
+
+author_name = author name
+missing_author = missing author
+
+person_name = person name
+missing_person_in_posn = missing person in this position
+missing_person_in_role = missing person in this role
+
+scopus_id_link = Scopus ID Link
+
+click_to_view_web_page = Click to view the {0} web page
+screenshot_of_webpage = screenshot of webpage {0}
+click_webpage_icon = click webpage icon
+link_text = link text
+link_name = link name
+no_url_provided = no url provided for link
+
+#
+# individual templates ( /templates/freemarker/body/individual )
+#
+standard_view = Standard profile view
+quick_view = Quick profile view
+quick_view_icon = quick view icon
+geographic_focus = Geographic Focus
+
+background_top_image = background top image
+full_view_icon = full view icon
+profile_type = Profile Type
+#
+# body templates ( /templates/freemarker/body/ )
+#
+export_qr_code = Export QR code
+more_qr_info = More info on QR codes
+what_is_this = What is this?
+view_this_profile = View this person's profile
+vcard = Vcard
+hyperlink = Hyperlink
+
+#
+# harvester templates ( /templates/freemarker/body/harvester )
+#
+must_be_admin = You must be an administrator to use this tool.
+error_no_job_specified = Error: No file harvest job was specified, or an unknown job was specified.
+probably_a_bug_so_report = The end user should not see this error under normal circumstances, so this is probably a bug and should be reported.
+return_to_ingest_menu = Return to the Data Ingest Tools menu
+ingest_menu = Ingest Menu
+data_being_harvested = Please wait while your data is harvested.
+harvest_complete = Harvest complete.  For another, please refresh the page.
+error_harvest_cannot_continue = An error has occurred and the file harvest cannot continue.
+harvest_error_instructions_one = This is most likely due to an improper Harvester configuration. Please ensure the following:
+harvest_error_instructions_two = VIVO Harvester is installed.
+the_capitalized = The
+harvester_location = harvester.location
+harvest_error_instructions_three = property in runtime.properties is pointed to the Harvester installation directory.
+harvest_error_instructions_fourA = In VIVO Harvester, the web server user (typically tomcat6) has read and write access to the
+harvest_error_instructions_fourB = vivo/
+harvest_error_instructions_fourC = directory and all of its children.
+harvest_error_instructions_fiveA = In VIVO Harvester, the
+harvest_error_instructions_fiveB = logs/
+harvest_error_instructions_fiveC = directory exists and the web server user has read and write access to it.
+harvest_error_instructions_sixA = In VIVO Harvester, the file
+harvest_error_instructions_sixB = vivo/config/vivo.xml
+harvest_error_instructions_sixC = is properly configured with your database information and namespace.
+step_one = Step 1
+download_template = Download template
+download = Download
+step_two = Step 2
+fill_in_data = Fill in data
+help_capitalized = Help
+fill_in_template_with_data = Fill in the template with your data.  You may fill in multiple templates if you wish to harvest multiple files at once.
+step_three = Step 3
+upload_files = Upload file(s)
+upload_completed_templates = Upload your completed template(s).
+upload_capitalized = Upload
+uploaded_files = Uploaded files
+step_four = Step 4
+harvest_capitalized = Harvest
+click_to_harvest = Click the button to harvest your file(s).
+step_five = Step 5
+view_results = View results
+script_executed = Script being executed
+progress_capitalized = Progress
+undefined_runtime_property = property in runtime.properties is undefined.
+define_value_for_property = In order to use this feature, please define a value for this property that points to the Harvester installation directory before redeploying and restarting the application.
+
+#
+# lib templates ( /templates/freemarker/body/lib )
+#
+faculty_capitalized = Faculty
+loading_faculty = Loading faculty . . .
+research_capitalized = Research
+view_all = View all ...
+view_all_research = view all research
+no_research_content_found = No research content found.
+departments = Departments
+loading_map_information = Loading map information . . .
+verify_match_capitalized = Verify this match
+
+#
+# custom form templates ( /templates/freemarker/edit/forms )
+#
+manage_concepts = Manage Concepts
+no_concepts_specified = There are currently no concepts specified.
+return_to_profile = Return to Profile Page
+external_vocabulary_services = External Vocabulary Services
+create_own_concept = Select or create a VIVO-defined concept.
+add_selected_concept = Add Selected Concept
+cannot_find_concept = Can't find the concept you want? Select or create a VIVO-defined concept.
+add_concept = Add Concept
+
+event_type = event type
+attended = attended
+
+manage_authors = Manage Authors
+no_linked_author = no linked author
+remove_author_link = remove author link
+add_author = Add Author
+return_to_publication = Return to publication
+add_an_author = Add an Author
+person_capitalized = Person
+organization_capitalized = Organization
+middle_name = Middle name
+initial_okay = initial okay
+selected_author = Selected Author
+organization_name_capitalized = Organization name
+selected_organization = Selected Organization
+
+clinical_activity = clinical activity
+clinical_activity_type = clinical activity type
+year_hint_format = YYYY
+
+collection_series_editor_role = collection or series editor role
+editor_role_in = editor role in
+
+edit_wbpage_of = Edit webpage of
+add_webpage_for = Add webpage for
+add_webpage = Add Web Page
+url_type = URL Type
+faculty_of_1000 = Faculty of 1000 Link
+standard_web_link = Standard Web Link
+webpage_name = Webpage Name
+
+investigator_entry_for = investigator entry for
+investigator_capitalized = Investigator
+principal_investigator_entry_for = principal investigator entry for
+co_principal_investigator_entry_for = co-principal investigator entry for
+start_year_must_precede_end = The Start Year must be earlier than the End Year.
+end_year_must_be_later = The End Year must be later than the Start Year.
+enter_or_select_grant = Please enter or select a value in the Grant Name field.
+selected_grant = Selected Grant
+years_of_grant_participation = Years of Participation in Grant
+
+leadership = leadership
+organization_type = organization type
+
+membership = membership
+membership_in = membership in
+organizations = organizations
+
+organizer_of = organizer of
+
+outreach_comm_service = outreach & community service
+outreach_comm_service_in = outreach & community service in
+
+select_or_enter_name = Please select an existing value or enter a new value in the Name field.
+presentation_entry_for = presentation entry for
+presentation_capitalized = Presentation
+presentation_type = Presentation Type
+role_in = Role in
+presentation_hint = e.g., Moderator, Speaker, Panelist
+presented_at = Presented At
+selected_conference = Selected Conference
+
+select_existing_pub_or_enter_new = Please select an existing publication in the Title field or enter a new one.
+
+publication_entry_for = publication entry for
+publication_type = Publication Type
+selected_publication = Selected Publication
+published_in = Published in
+selected_journal = Selected Journal
+selected_event = Selected Event
+proceedings_of = Proceedings of
+editor_capitalized = Editor
+required_with_last_name = required with new Last name
+selected_editor = Selected Editor
+publisher_capitalized = Publisher
+selected_publisher = Selected Publisher
+volume_capitalized = Volume
+number_capitalized = Number
+issue_capitalized = Issue
+chapter_capitalized = Chapter
+start_page = Start Page
+end_page = End Page
+selected_book = Selected Book
+publication_date = Publication Date
+place_of_publication = Place of Publication
+
+research_activity = research activity
+research_activity_type = research activity type
+
+reviewer_of = reviewer of
+
+entry_for = entry for
+specify_role_for_activity = Please specify a role for this activity.
+start_year = Start Year
+
+service_to_profession = service to the profession
+service_to_profession_in = service to the profession in
+
+teaching_activity = teaching activity
+teaching_activity_type = teaching activity type
+teaching_role_hint = e.g., Instructor, Facilitator, Assistant
+
+create_own_concept_all_caps = Create Your Own Concept
+concept_capitalized = Concept
+selected_concept = Selected Concept
+create_concept = Create Concept
+return_to_manage_concepts = Return to Manage Concepts
+
+institutional_internal_class = Institutional Internal Class
+internal_class_intro_one = This class will be used to designate those individuals internal to your institution.
+internal_class_intro_two = This will allow you to limit the individuals displayed on your menu pages (People, Research, etc.) to only those within your institution.
+no_local_oncologies = There are currently no recognized local ontologies.
+namespace_must_use_this_pattern = In order for a local ontology to be recognized here, its namespace URI must follow this pattern
+new_local_oncology = a new local ontology
+return_here_to_define_class = and then return here to define the institutional internal class.
+select_existing_local_class = Select an existing class from a local extension
+cannot_find_class = Can't find an appropriate class?
+create_new_class = Create a new class
+create_new_one = Create a new one
+use_capitals_each_word = use capitals for the first letter of each word
+local_namespace = Local Namespace
+problematic_section_error = Error: problematic section as above should all have been handled.
+new_local_ontology = new local ontology
+
+manage_grants_and_projects = Manage Grants & Projects for
+check_grants_to_exclude = Check those grants and projects you want to <em>exclude</em> from the profile page.
+
+manage_affiliated_people = Manage People Affiliated with
+check_people_to_exclude = Check those people you want to <em>exclude</em> from the profile page.
+
+manage_publications_for = Manage Publications for
+check_pubs_to_exclude = Check those publications you want to <em>exclude</em> from the profile page.
+
+manage_web_pages = Manage Web Pages
+has_no_webpages = This individual currently has no web pages specified. Add a new web page by clicking on the button below.
+edit_webpage_link = edit web page link
+delete_webpage_link = delete web page link
+webpage_url = webpage url
+add_new_web_page = Add New Web Page
+
+enable_internal_class_one = To enable this option, you must first select an
+enable_internal_class_two = for your instance
+internal_class = institutional internal class
+only_display = Only display
+within_my_institution = within my institution
+
+enter_a_name = Please enter a value in the Name field.
+enter_last_name = Please enter a Last name for this person.
+enter_first_name = Please enter a First name for this person.
+
+posn_history_entry_for = position history entry for
+enter_posn_title_value = Please enter a value in the Position Title field.
+enter_posn_type_value = Please select a value in the Position Type field.
+enter_or_select_person_value = Please select an existing value or enter a new value in the Person field.
+position_title = Position Title
+position_type = Position Type
+selected_person = Selected Person
+
+degree_candidacy = Degree Candidacy
+subject_area = Subject Area
+selected_subject_area = Selected Subject Area
+selected_advisee = Selected Advisee
+selected_advisor = Selected Advisor
+advisee_capitalized = Advisee
+advisor_capitalized = Advisor
+advising_relationship_type = Advising Relationship Type
+select_advising_relationship_type = Please select an Advising Relationship Type.
+advisor_relationship_entry_for = advisor relationship entry for
+advisee_relationship_entry_for = advisee relationship entry for
+years_participating = Years of Participation
+
+award_or_honor_for = award or honor for
+select_Award_or_enter_name = Please select an existing value or enter a new value in the Award or Honor Name field.
+award_honor_name = Award or Honor Name
+conferred_by_capitalized = Conferred by
+selected_conferred = Selected Conferrer
+description = Description
+year_awarded = Year Awarded
+years_inclusive = Years Inclusive
+award_hint = (e.g., for multi-year awards)
+
+educational_training_for = educational training entry for
+select_organization_type = Please select a value in the Organization Type field.
+select_an_organization_name = Please enter or select a value in the Name field.
+select_educational_training_value = Please select a value in the Type of Educational Training field.
+org_type_capitalized = Organization Type
+educational_training_type = Type of Educational Training
+dept_or_school_name = Department or School Name within the
+degree = Degree
+missing_degree = missing degree
+major_field = Major Field of Degree
+supplemental_information = Supplemental Information
+supplemental_information_hint = (e.g., Thesis title, Transfer info, etc.)
+academic_studies_or_other = Academic Studies or Other Training
+
+create_mailing_address = Create Mailing Address
+mailing_address_for = mailing address for
+enter_a_country = Please enter a value in the Country field.
+enter_street_address = Please enter a value in the Street Address field.
+enter_a_locality = Please enter a value in the City/Locality field.
+enter_postal_code = Please enter a value in the Postal Code field.
+country = Country
+street_address = Street Address
+city_locality = City/Locality
+region = State/Province/Region
+postal_code = Postal Code
+
+posn_entry_for = position entry for
+
+#
+#  coauthorship templates ( /templates/freemarker/visualization/coauthorship )
+#
+within_last_10_years = within the last 10 years
+total = total
+from = from
+file = file
+file_capitalized = File
+view_full_timeline_and_network = View full timeline and co-author network.
+download_data_as = Download data as
+unique_coauthors_per_year = Unique Co-Authors per year
+count_capitalized = Count
+
+#
+#  copi templates ( /templates/freemarker/visualization/copi )
+#
+year_capitalized = Year
+unique_coinvestigators = Unique co-investigators
+co_investigator = co-investigator
+co_investigators = co-investigators
+unique_coinvestigators_per_year = Unique Co-Investigators per year
+view_timeline_copi_network = View full timeline and co-investigator network.
+
+#
+#  entity comparison templates ( /templates/freemarker/visualization/entitycomparison )
+#
+parent_organization_of = Parent organization of
+temporal_graph_drill_up = temporal graph drill up
+how_to_compare = How do you want to compare?
+no_view_link = no view link
+persistent_link_to_visualization = Persistent link to current visualization
+error_notification = error notification
+close_me = Close Me
+what_to_compare = What do you want to compare?
+organizations_capitalized = Organizations
+people_capitalized = People
+organization_hierarchy_note = Note: the organizations or people listed below are only those which are directly beneath {0} in the organization hierarchy. You may 'drill down' to see the organizations or people below a given sub-organization by selecting the chart icon next to a selected sub-organization's name below the graph on the right.
+save_all_as_csv = Save All as CSV
+clear_capitalized = Clear
+clear_all_selected_entities = Clear all selected entities.
+comparing_capitalized = Comparing
+of = of
+institutions_capitalized = Institutions
+info_based_on_vivo_data = This information is based solely on {0} which have been loaded into the VIVO system.
+you_have_selected = You have selected
+of_a_maximum = of a maximum
+schools = schools
+legend_capitalized = Legend
+with_unknown_year = with unknown year
+with_known_year = with known year
+from_current_incomplete_year = from current incomplete year
+
+entity_comp_error_text1 = This organization has neither sub-organizations nor people with
+entity_comp_error_text2 = in the system.
+entity_comp_error_text3 = Please visit the full
+entity_comp_error_text4 = for a more complete overview.
+profile_page = profile page
+
+publication = publication
+published = published
+publications = publications
+by_publications = by Publications
+publications_capitalized = Publications
+grant = grant
+granted = granted
+grants = grants
+by_grants = by Grants
+grants_capitalized = Grants
+activity = activity
+activities = activities
+
+#
+#  grant visualization templates ( /templates/freemarker/visualization/grant )
+#
+view_all_grants = view all grants
+view_all_grants_text = View all VIVO grants and corresponding co-investigator network.
+grant_per_year = Grants per year
+link = link
+
+#
+#  map of science templates ( /templates/freemarker/visualization/mapOfScience )
+#
+parent_entity = parent entity
+map_of_science_icon = map of science icon
+explore_activity = Explore activity
+explore_capitalized = Explore
+across_subdisciplines = across 554 scientific subdisciplines
+compare_organizations = Compare organizations
+mapped = mapped
+save_unmapped_publications = Save Unmapped Publications
+map_of_science_visualization = Map of Science Visualization
+no_publications_for_this_organization = No publications in the system have been attributed to this organization.
+please_visit = Please visit the
+for_complete_overview = for a complete overview.
+
+#
+#  model constructor templates ( /templates/freemarker/visualization/modelconstructor )
+#
+cached_models_regenerated = The following cached models will be regenerated.
+uri_independent_model = URI Independent Model
+currently_no_constructed_models = Currently there are no constructed models for use by visualization.
+
+#
+#  person level templates ( /templates/freemarker/visualization/personlevel)
+#
+co_investigator_icon = co-investigator icon
+co_authorship = co-authorship
+this_author = this author
+in_the_vivo_db = in the VIVO database.
+no_papers_for = Currently there are no papers for
+publication_s_capitalized = Publication(s)
+co_author_s_capitalized = Co-author(s)
+incomplete_data_note1 = Note: This information is based solely on publications that have been loaded into the VIVO system. This may only be a small sample of the person's total work.
+incomplete_data_note2 = Go to your profile page to enter additional details about your publications.
+incomplete_data_note3 = Log in to enter additional details about your publications on your profile page.
+tables_capitalized = Tables
+publications_per_year = Publications per year
+
+investigator_name = investigator name
+co_author_icon = co-author icon
+currently_no_grants_for = Currently there are no {0} grants for
+this_investigator = this investigator
+grant_s_capitalized = Grant(s)
+co_investigator_s_capitalized = Co-investigator(s)
+incomplete_grant_data_note1 = Note: This information is based solely on grants that have been loaded into the VIVO system. This may only be a small sample of the person's total work.
+incomplete_grant_data_note2 = Go to your profile page to enter additional details about your grants.
+incomplete_grant_data_note3 = Log in to enter additional details about your grants on your profile page.
+grants_per_year = Grants per year
+grant_info_for_all_years = The information in the following tables is for all years.
+grant_sparkline_note = The spark lines shown above reflect grants through the last complete calendar year. These tables, however, show the grant information for all years, based on the information loaded in the VIVO system.
+
+#
+#  publication templates ( /templates/freemarker/visualization/publication)
+#
+numbers_based_on_publications_in_vivo = These numbers are based solely on publications that have been loaded into this VIVO application. If this is your profile, you can enter additional publications below.
+last_ten_full_years = in the last 10 full years
+
+last_ten_full = in the last 10 full
+download_link = download link
+years = years
+
+#
+#  miscellaneous visualization templates ( /templates/freemarker/visualization)
+#
+visualization_tools = Visualization Tools
+refresh_cached_vis_models = Refresh Cached Models for Visualization
+why_needed = Why is it needed?
+vis_tools_note_one = Large-scale visualizations like the Temporal Graph or the Map of Science involve calculating total counts of publications or of grants for some entity. Since this also means checking through all of its sub-entities, the underlying queries can be both memory-intensive and time-consuming. For a faster user experience, we wish to save the results of these queries for later re-use.
+vis_caching_process = What's involved in the caching process?
+vis_tools_note_two = To this end we have devised a caching solution which will retain information about the hierarchy of organizations -- namely, which publications are attributed to which organizations -- by storing the RDF model.
+vis_tools_note_three = We're currently caching these models in memory.  The cache is built (only once) on the first user request after a server restart.  Because of this, the same model will be served until the next restart. This means that the data in these models may become stale depending upon when it was last created. This works well enough for now. In future releases we will improve this solution so that models are stored on disk and periodically updated.
+vis_tools_note_four = The models are refreshed each time the server restarts.  Since this is not generally practical on production instances, administrators can instead use the "refresh cache" link above to do this without a restart.
+
+#
+#  custom form javascript variables ( /templates/freemarker/edit/js)
+#
+drag_drop_reorder_authors = Drag and drop to reorder authors
+reordering_authors_failed = Reordering of authors failed.
+confirm_author_removal = Are you sure you want to remove this author:
+error_processing_author_request = Error processing request: author not removed
+author_capitalized = Author
+or_add_new_one = or add a new one.
+
+vocabulary_service_unavailable = An error was encountered in executing this search.
+no_serch_results_found = No search results were found.
+label_type = Label (Type)
+label_altLabels = Label (Alternate Labels)
+definition_capitalized = Definition
+best_match = Best Match
+select_term_from_results = Please select at least one term from the search search results.
+select_vocabulary_source_to_search = Please select at least one external vocabulary source to search.
+confirm_term_deletion = Are you sure you want to remove this term?
+error_term_not_deleted = Error processing request: term not removed
+
+advising = advising
+advising_relationship = advising relationship
+
+select_or_create_organization = Select an existing Organization or create a new one.
+
+grant_successfully_excluded = The item has been successfully excluded from the profile page.
+error_excluding_grant = Error processing request: the item cannot be excluded from the profile page.
+
+person_successfully_excluded = The person has been successfully excluded from the organization page.
+error_excluding_person = Error processing request: the person cannot be excluded from the organization page.
+
+publication_successfully_excluded = The publication will has been successfully excluded from the profile page.
+error_excluding_publication = Error processing request: the publication cannot be excluded from the profile page.
+
+drag_drop_to_reorder_webpages = Drag and drop to reorder web pages
+webpage_reordering_failed = Reordering of web pages failed.
+confirm_webpage_deletion = Are you sure you want to remove this web page?
+error_removing_webpage = Error processing request: web page not removed.
+
+#
+#  miscellaneous javascript variables ( productMods/js)
+#
+researcher = researcher
+
+#
+#  individual javascript variables ( productMods/js/individual)
+#
+error_processing_type_change = Error processing request: the unchecked labels could not be deleted.
+
+#
+#  visualization javascript variables ( productMods/js/visualization)
+#
+publications_with = Publications with
+
+co_investigators_capitalized = Co-investigators
+grants_with = Grants with
+
+vis_first_link = First
+vis_last_link = Last
+vis_previous_link = Prev
+vis_next_link = Next
+
+max_entity_note = A Maximum 10 entities can be compared. Please remove some & try again.
+organizations_and_people = Organizations and People
+loading_data_for = Loading data for
+data_for = Data for
+refreshing_data_message = is now being refreshed. The visualization will load as soon as we are done computing, or you can search or browse other data in VIVO and come back in a few minutes.
+disclaimer_text_one = This information is based solely on
+disclaimer_text_two = which have been loaded into the VIVO system as of
+level_undefined_error = ENTITY LEVEL UNDEFINED ERROR
+
+total_number_of = Total Number of
+number_of = Number of
+have_an_unknown = have an unknown
+year_not_chartered = year (not charted above)
+in_completed_year = in a completed year
+were = were
+in_current_incomplete_year = in the current incomplete year (not charted above)
+publication_count = Publication Count
+grant_count = Grant Count
+entity_type = Entity Type
+entity_label = Entity Label
+no_matching_entities_found = No matching entities found
+clear_search_query = clear search query
+short_max_entity_note = A Maximum of 10 entities can be compared.
+information_capitalized = Information
+content_requires_flash = This content requires the Adobe Flash Player.
+get_flash = Get Flash
+of_pubs = of pubs.
+max_nbr_for_comp = The maximum number of items for comparison is 3.
+no_matching_science_areas = No matching science areas found
+
+subdisciplines = Subdisciplines
+disciplines = Disciplines
+science_area_level = Level of Science Area
+of_activity = of activity
+
+drill_down = drill down
+
+disciplines_lower = disciplines
+subdisciplines_lower = subdisciplines
+show_discipline_labels = Show discipline labels
+
+no_attributed_publications = No publications in the system have been attributed to this
+none_of_the = None of the
+publications_attributed_to = publications attributed to this
+been_science_located = have been "science-located."
+publication_attributed_to = The publication attributed to this
+not_science_located = has not been "science-located."
+no_journal_information = have no journal information.
+no_matching_map_location = could not be matched with a map location using their journal information.
+
+map_being_refreshed_msg = is now being refreshed. The visualization will load as soon as we are done computing, or you can search or browse other data in VIVO and come back in a few minutes.
+
+publication_pubs = publications (pubs.)
+percent_activity = % activity
+
+#
+#  miscellaneous additions
+#
+
+standardview_tooltip_one = Click to display the
+standardview_tooltip_two = profile quick view.
+research_area_tooltip_one = Click an area to view others
+research_area_tooltip_two = with the same interest.
+quickview_tooltip = Click to view the standard profile page.
+global_research = Global Research
+country_wide_research = Country-wide Research
+local_research = Local Research
+selected_presentation = Selected Presentation
+event_capitalized = Event
+item_capitalized = Item
+telephone_number_for = telephone number for
+telephone_number = Telephone Number
+enter_telephone_number = Please enter a value in the Telephone Number field.
+email_address_for = email address for
+enter_email_address = Please enter a value in the Email Address field.
+full_name_for = full name for
+title_not_found = Title not found.
+speeches_capitalized = Speeches
+theses_capitalized = Theses
+select_document_type = Please select a value in the Document Type field.
+select_a_document_name = Please enter or select a value in the Document Name field.
+document_type_capitalized = Document Type
+document_name_capitalized = Document Name
+selected_document = Selected Document
+editor_name = editor name
+missing_editor = missing editor
+drag_drop_reorder_editors = Drag and drop to reorder editors
+reordering_editors_failed = Reordering of editors failed.
+confirm_editor_removal = Are you sure you want to remove this editor:
+error_processing_editor_request = Error processing request: editor not removed
+manage_editors = Manage Editors
+no_linked_editor = no linked editor
+remove_editor_link = remove editor link
+add_an_editor = Add an Editor
+add_editor = Add Editor
+please_select_type = Please select a type from the drop-down list.
+preferred_title = Preferred Title
+preferred_title_for = preferred title for
+enter_preferred_title = Please enter a value in the Preferred Title field.
+fax_number_for = fax number for
+fax_number = Fax Number
+enter_fax_number = Please enter a value in the Fax Number field.
+credentials = credentials
+select_credential_or_enter_name = Please enter or select a value in the Credential Name field.
+type_of_credential = Type of Credential
+credential_name = Credential Name
+selected_credential = Selected Credential
+year_issued = Year Issued
+year_awarded_for = year awarded for
+create_year_awarded = Create year awarded
+edit_year_awarded = Edit year awarded
+publication_date_for = publication date for
+create_publication_date = Create publication date
+edit_publication_date = Edit publication date
+name_prefix = Name Prefix
+name_suffix = Name Suffix
+administering_organization_for = administering organization for
+missing_credential = missing credential
+grant_administered_by = grant being administered by
+missing_grant = missing grant
+editor_of_entry = editor of entry for
+role_type = Role type
+researcher_role = Researcher Role
+search_service_btn = Search Service
+through_today = Publications through today's date
+doi_link=Digital Object Identifier (DOI)
+
+using_cache_time=Using information cached at
+
+#
+#New Entries for i18n purposes
+#
+edit_entry_for_head_role=: Edit this "head of" role
+edit_entry_for_member_role=: Edit this membership
+edit_entry_for_clinical_role=: Edit this clinical activity
+edit_entry_for_attendee_role=: Edit this participation
+edit_entry_for_organizer_role=: Edit this organizer role
+edit_entry_for_editor_role=: Edit this editor role
+edit_entry_for_service_provider_role=: Edit this service provider role
+edit_entry_for_outreach_provider_role=: Edit this outreach provider role
+edit_entry_for_researcher_role=: Edit this researcher role
+edit_entry_for_reviewer_role=: Edit this reviewer role
+edit_entry_for_teacher_role=: Edit this teaching role
+
+create_entry_for_head_role=: Add a new "head of" role
+create_entry_for_member_role=: Add a new membership
+create_entry_for_clinical_role=: Add a new clinical activity
+create_entry_for_attendee_role=: Add a new participation
+create_entry_for_organizer_role=: Add a new Organizer role
+create_entry_for_editor_role=: Add a new editor role
+create_entry_for_service_provider_role=: Add a new service provider role
+create_entry_for_outreach_provider_role=: Add a new outreach provider role
+create_entry_for_researcher_role=: Add a new researcher role
+create_entry_for_reviewer_role=: Add a new reviewer role
+create_entry_for_teacher_role=: Add a new teaching role
+
+
+save_changes=Save
+start_capitalized = Start
+end_capitalized = End
+institution_name=Name of Institution
+role_in_institution=Role in Institution
+presentation_name_capitalized=Title of Presentation
+role_in_presentation_capitalized=Role in Presentation
+advisee_capitalized_first_name=First Name
+advisee_capitalized_lastname=Last Name
+
diff --git a/webapp/src/main/webapp/images/placeholders/placeholders.properties b/webapp/src/main/webapp/images/placeholders/placeholders.properties
index 32168afd53..5452a10c17 100644
--- a/webapp/src/main/webapp/images/placeholders/placeholders.properties
+++ b/webapp/src/main/webapp/images/placeholders/placeholders.properties
@@ -12,7 +12,7 @@
 # means that any individual of type foaf:Person will be represented by
 # person.thumbnail.jpg
 #
-# NOTE: a colon is a special character in a properties file, and must be escaped 
+# NOTE: a colon is a special character in a properties file, and must be escaped
 # by a backslash.
 
 http\://xmlns.com/foaf/0.1/Person                                    = /images/placeholders/person.thumbnail.jpg
diff --git a/webapp/src/main/webapp/js/d3.min.js b/webapp/src/main/webapp/js/d3.min.js
index 6ba6b41ed9..6059ff69e2 100644
--- a/webapp/src/main/webapp/js/d3.min.js
+++ b/webapp/src/main/webapp/js/d3.min.js
@@ -5,4 +5,4 @@ i.d="W"in i?(i.w+6)%7+7*i.W-(o+5)%7:i.w+7*i.U-(o+6)%7}return"Z"in i?(i.H+=i.Z/10
 var n,e,r=t.event.changedTouches,i=r.length;for(f&&clearTimeout(f),f=setTimeout(function(){f=null},500),n=0;n<i;++n)(e=v[r[n].identifier])&&(_t(),e("end"))}function c(e,r,i,o,u){var a,c,s,f=i(r,e),l=_.copy();if(E(new yt(n,"beforestart",a,e,g,f[0],f[1],0,0,l),function(){return null!=(t.event.subject=a=p.apply(o,u))&&(c=a.x-f[0]||0,s=a.y-f[1]||0,!0)}))return function t(h){var p,d=f;switch(h){case"start":v[e]=t,p=g++;break;case"end":delete v[e],--g;case"drag":f=i(r,e),p=g}E(new yt(n,h,a,e,p,f[0]+c,f[1]+s,f[0]-d[0],f[1]-d[1],l),l.apply,l,[h,o,u])}}var s,f,l=mt,h=xt,p=bt,v={},_=d("start","drag","end"),g=0;return n.filter=function(t){return arguments.length?(l="function"==typeof t?t:Nl(!!t),n):l},n.container=function(t){return arguments.length?(h="function"==typeof t?t:Nl(t),n):h},n.subject=function(t){return arguments.length?(p="function"==typeof t?t:Nl(t),n):p},n.on=function(){var t=_.on.apply(_,arguments);return t===_?n:t},n},Al=function(t,n,e){t.prototype=n.prototype=e,e.constructor=t},Cl="\\s*([+-]?\\d+)\\s*",zl="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*",Pl="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*",Ll=/^#([0-9a-f]{3})$/,Rl=/^#([0-9a-f]{6})$/,ql=new RegExp("^rgb\\("+[Cl,Cl,Cl]+"\\)$"),Ul=new RegExp("^rgb\\("+[Pl,Pl,Pl]+"\\)$"),Dl=new RegExp("^rgba\\("+[Cl,Cl,Cl,zl]+"\\)$"),Ol=new RegExp("^rgba\\("+[Pl,Pl,Pl,zl]+"\\)$"),Fl=new RegExp("^hsl\\("+[zl,Pl,Pl]+"\\)$"),Il=new RegExp("^hsla\\("+[zl,Pl,Pl,zl]+"\\)$"),Yl={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074};Al(Mt,Tt,{displayable:function(){return this.rgb().displayable()},toString:function(){return this.rgb()+""}}),Al(At,Et,wt(Mt,{brighter:function(t){return t=null==t?1/.7:Math.pow(1/.7,t),new At(this.r*t,this.g*t,this.b*t,this.opacity)},darker:function(t){return t=null==t?.7:Math.pow(.7,t),new At(this.r*t,this.g*t,this.b*t,this.opacity)},rgb:function(){return this},displayable:function(){return 0<=this.r&&this.r<=255&&0<=this.g&&this.g<=255&&0<=this.b&&this.b<=255&&0<=this.opacity&&this.opacity<=1},toString:function(){var t=this.opacity;return t=isNaN(t)?1:Math.max(0,Math.min(1,t)),(1===t?"rgb(":"rgba(")+Math.max(0,Math.min(255,Math.round(this.r)||0))+", "+Math.max(0,Math.min(255,Math.round(this.g)||0))+", "+Math.max(0,Math.min(255,Math.round(this.b)||0))+(1===t?")":", "+t+")")}})),Al(Lt,Pt,wt(Mt,{brighter:function(t){return t=null==t?1/.7:Math.pow(1/.7,t),new Lt(this.h,this.s,this.l*t,this.opacity)},darker:function(t){return t=null==t?.7:Math.pow(.7,t),new Lt(this.h,this.s,this.l*t,this.opacity)},rgb:function(){var t=this.h%360+360*(this.h<0),n=isNaN(t)||isNaN(this.s)?0:this.s,e=this.l,r=e+(e<.5?e:1-e)*n,i=2*e-r;return new At(Rt(t>=240?t-240:t+120,i,r),Rt(t,i,r),Rt(t<120?t+240:t-120,i,r),this.opacity)},displayable:function(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1}}));var Bl=Math.PI/180,jl=180/Math.PI,Hl=.95047,Xl=1,Vl=1.08883,$l=4/29,Wl=6/29,Zl=3*Wl*Wl,Gl=Wl*Wl*Wl;Al(Dt,Ut,wt(Mt,{brighter:function(t){return new Dt(this.l+18*(null==t?1:t),this.a,this.b,this.opacity)},darker:function(t){return new Dt(this.l-18*(null==t?1:t),this.a,this.b,this.opacity)},rgb:function(){var t=(this.l+16)/116,n=isNaN(this.a)?t:t+this.a/500,e=isNaN(this.b)?t:t-this.b/200;return t=Xl*Ft(t),n=Hl*Ft(n),e=Vl*Ft(e),new At(It(3.2404542*n-1.5371385*t-.4985314*e),It(-.969266*n+1.8760108*t+.041556*e),It(.0556434*n-.2040259*t+1.0572252*e),this.opacity)}})),Al(Ht,jt,wt(Mt,{brighter:function(t){return new Ht(this.h,this.c,this.l+18*(null==t?1:t),this.opacity)},darker:function(t){return new Ht(this.h,this.c,this.l-18*(null==t?1:t),this.opacity)},rgb:function(){return qt(this).rgb()}}));var Jl=-.14861,Ql=1.78277,Kl=-.29227,th=-.90649,nh=1.97294,eh=nh*th,rh=nh*Ql,ih=Ql*Kl-th*Jl;Al($t,Vt,wt(Mt,{brighter:function(t){return t=null==t?1/.7:Math.pow(1/.7,t),new $t(this.h,this.s,this.l*t,this.opacity)},darker:function(t){return t=null==t?.7:Math.pow(.7,t),new $t(this.h,this.s,this.l*t,this.opacity)},rgb:function(){var t=isNaN(this.h)?0:(this.h+120)*Bl,n=+this.l,e=isNaN(this.s)?0:this.s*n*(1-n),r=Math.cos(t),i=Math.sin(t);return new At(255*(n+e*(Jl*r+Ql*i)),255*(n+e*(Kl*r+th*i)),255*(n+e*(nh*r)),this.opacity)}}));var oh,uh,ah,ch,sh,fh,lh=function(t){var n=t.length-1;return function(e){var r=e<=0?e=0:e>=1?(e=1,n-1):Math.floor(e*n),i=t[r],o=t[r+1],u=r>0?t[r-1]:2*i-o,a=r<n-1?t[r+2]:2*o-i;return Wt((e-r/n)*n,u,i,o,a)}},hh=function(t){var n=t.length;return function(e){var r=Math.floor(((e%=1)<0?++e:e)*n),i=t[(r+n-1)%n],o=t[r%n],u=t[(r+1)%n],a=t[(r+2)%n];return Wt((e-r/n)*n,i,o,u,a)}},ph=function(t){return function(){return t}},dh=function t(n){function e(t,n){var e=r((t=Et(t)).r,(n=Et(n)).r),i=r(t.g,n.g),o=r(t.b,n.b),u=Kt(t.opacity,n.opacity);return function(n){return t.r=e(n),t.g=i(n),t.b=o(n),t.opacity=u(n),t+""}}var r=Qt(n);return e.gamma=t,e}(1),vh=tn(lh),_h=tn(hh),gh=function(t,n){var e,r=n?n.length:0,i=t?Math.min(r,t.length):0,o=new Array(r),u=new Array(r);for(e=0;e<i;++e)o[e]=Th(t[e],n[e]);for(;e<r;++e)u[e]=n[e];return function(t){for(e=0;e<i;++e)u[e]=o[e](t);return u}},yh=function(t,n){var e=new Date;return t=+t,n-=t,function(r){return e.setTime(t+n*r),e}},mh=function(t,n){return t=+t,n-=t,function(e){return t+n*e}},xh=function(t,n){var e,r={},i={};null!==t&&"object"==typeof t||(t={}),null!==n&&"object"==typeof n||(n={});for(e in n)e in t?r[e]=Th(t[e],n[e]):i[e]=n[e];return function(t){for(e in r)i[e]=r[e](t);return i}},bh=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,wh=new RegExp(bh.source,"g"),Mh=function(t,n){var e,r,i,o=bh.lastIndex=wh.lastIndex=0,u=-1,a=[],c=[];for(t+="",n+="";(e=bh.exec(t))&&(r=wh.exec(n));)(i=r.index)>o&&(i=n.slice(o,i),a[u]?a[u]+=i:a[++u]=i),(e=e[0])===(r=r[0])?a[u]?a[u]+=r:a[++u]=r:(a[++u]=null,c.push({i:u,x:mh(e,r)})),o=wh.lastIndex;return o<n.length&&(i=n.slice(o),a[u]?a[u]+=i:a[++u]=i),a.length<2?c[0]?en(c[0].x):nn(n):(n=c.length,function(t){for(var e,r=0;r<n;++r)a[(e=c[r]).i]=e.x(t);return a.join("")})},Th=function(t,n){var e,r=typeof n;return null==n||"boolean"===r?ph(n):("number"===r?mh:"string"===r?(e=Tt(n))?(n=e,dh):Mh:n instanceof Tt?dh:n instanceof Date?yh:Array.isArray(n)?gh:isNaN(n)?xh:mh)(t,n)},kh=function(t,n){return t=+t,n-=t,function(e){return Math.round(t+n*e)}},Sh=180/Math.PI,Nh={translateX:0,translateY:0,rotate:0,skewX:0,scaleX:1,scaleY:1},Eh=function(t,n,e,r,i,o){var u,a,c;return(u=Math.sqrt(t*t+n*n))&&(t/=u,n/=u),(c=t*e+n*r)&&(e-=t*c,r-=n*c),(a=Math.sqrt(e*e+r*r))&&(e/=a,r/=a,c/=a),t*r<n*e&&(t=-t,n=-n,c=-c,u=-u),{translateX:i,translateY:o,rotate:Math.atan2(n,t)*Sh,skewX:Math.atan(c)*Sh,scaleX:u,scaleY:a}},Ah=un(rn,"px, ","px)","deg)"),Ch=un(on,", ",")",")"),zh=Math.SQRT2,Ph=function(t,n){var e,r,i=t[0],o=t[1],u=t[2],a=n[0],c=n[1],s=n[2],f=a-i,l=c-o,h=f*f+l*l;if(h<1e-12)r=Math.log(s/u)/zh,e=function(t){return[i+t*f,o+t*l,u*Math.exp(zh*t*r)]};else{var p=Math.sqrt(h),d=(s*s-u*u+4*h)/(2*u*2*p),v=(s*s-u*u-4*h)/(2*s*2*p),_=Math.log(Math.sqrt(d*d+1)-d),g=Math.log(Math.sqrt(v*v+1)-v);r=(g-_)/zh,e=function(t){var n=t*r,e=an(_),a=u/(2*p)*(e*sn(zh*n+_)-cn(_));return[i+a*f,o+a*l,u*e/an(zh*n+_)]}}return e.duration=1e3*r,e},Lh=fn(Jt),Rh=fn(Kt),qh=hn(Jt),Uh=hn(Kt),Dh=pn(Jt),Oh=pn(Kt),Fh=function(t,n){for(var e=new Array(n),r=0;r<n;++r)e[r]=t(r/(n-1));return e},Ih=0,Yh=0,Bh=0,jh=1e3,Hh=0,Xh=0,Vh=0,$h="object"==typeof performance&&performance.now?performance:Date,Wh="function"==typeof requestAnimationFrame?requestAnimationFrame:function(t){setTimeout(t,17)};_n.prototype=gn.prototype={constructor:_n,restart:function(t,n,e){if("function"!=typeof t)throw new TypeError("callback is not a function");e=(null==e?dn():+e)+(null==n?0:+n),this._next||fh===this||(fh?fh._next=this:sh=this,fh=this),this._call=t,this._time=e,wn()},stop:function(){this._call&&(this._call=null,this._time=1/0,wn())}};var Zh=function(t,n,e){var r=new _n;return n=null==n?0:+n,r.restart(function(e){r.stop(),t(e+n)},n,e),r},Gh=function(t,n,e){var r=new _n,i=n;return null==n?(r.restart(t,n,e),r):(n=+n,e=null==e?dn():+e,r.restart(function o(u){u+=i,r.restart(o,i+=n,e),t(u)},n,e),r)},Jh=d("start","end","interrupt"),Qh=[],Kh=0,tp=1,np=2,ep=3,rp=4,ip=5,op=6,up=function(t,n,e,r,i,o){var u=t.__transition;if(u){if(e in u)return}else t.__transition={};Sn(t,e,{name:n,index:r,group:i,on:Jh,tween:Qh,time:o.time,delay:o.delay,duration:o.duration,ease:o.ease,timer:null,state:Kh})},ap=function(t,n){var e,r,i,o=t.__transition,u=!0;if(o){n=null==n?null:n+"";for(i in o)(e=o[i]).name===n?(r=e.state>np&&e.state<ip,e.state=op,e.timer.stop(),r&&e.on.call("interrupt",t,t.__data__,e.index,e.group),delete o[i]):u=!1;u&&delete t.__transition}},cp=function(t){return this.each(function(){ap(this,t)})},sp=function(t,n){var e=this._id;if(t+="",arguments.length<2){for(var r,i=kn(this.node(),e).tween,o=0,u=i.length;o<u;++o)if((r=i[o]).name===t)return r.value;return null}return this.each((null==n?Nn:En)(e,t,n))},fp=function(t,n){var e;return("number"==typeof n?mh:n instanceof Tt?dh:(e=Tt(n))?(n=e,dh):Mh)(t,n)},lp=function(t,n){var e=Ef(t),r="transform"===e?Ch:fp;return this.attrTween(t,"function"==typeof n?(e.local?qn:Rn)(e,r,An(this,"attr."+t,n)):null==n?(e.local?zn:Cn)(e):(e.local?Ln:Pn)(e,r,n+""))},hp=function(t,n){var e="attr."+t;if(arguments.length<2)return(e=this.tween(e))&&e._value;if(null==n)return this.tween(e,null);if("function"!=typeof n)throw new Error;var r=Ef(t);return this.tween(e,(r.local?Un:Dn)(r,n))},pp=function(t){var n=this._id;return arguments.length?this.each(("function"==typeof t?On:Fn)(n,t)):kn(this.node(),n).delay},dp=function(t){var n=this._id;return arguments.length?this.each(("function"==typeof t?In:Yn)(n,t)):kn(this.node(),n).duration},vp=function(t){var n=this._id;return arguments.length?this.each(Bn(n,t)):kn(this.node(),n).ease},_p=function(t){"function"!=typeof t&&(t=Rf(t));for(var n=this._groups,e=n.length,r=new Array(e),i=0;i<e;++i)for(var o,u=n[i],a=u.length,c=r[i]=[],s=0;s<a;++s)(o=u[s])&&t.call(o,o.__data__,s,u)&&c.push(o);return new Kn(r,this._parents,this._name,this._id)},gp=function(t){if(t._id!==this._id)throw new Error;for(var n=this._groups,e=t._groups,r=n.length,i=e.length,o=Math.min(r,i),u=new Array(r),a=0;a<o;++a)for(var c,s=n[a],f=e[a],l=s.length,h=u[a]=new Array(l),p=0;p<l;++p)(c=s[p]||f[p])&&(h[p]=c);for(;a<r;++a)u[a]=n[a];return new Kn(u,this._parents,this._name,this._id)},yp=function(t,n){var e=this._id;return arguments.length<2?kn(this.node(),e).on.on(t):this.each(Hn(e,t,n))},mp=function(){return this.on("end.remove",Xn(this._id))},xp=function(t){var n=this._name,e=this._id;"function"!=typeof t&&(t=If(t));for(var r=this._groups,i=r.length,o=new Array(i),u=0;u<i;++u)for(var a,c,s=r[u],f=s.length,l=o[u]=new Array(f),h=0;h<f;++h)(a=s[h])&&(c=t.call(a,a.__data__,h,s))&&("__data__"in a&&(c.__data__=a.__data__),l[h]=c,up(l[h],n,e,h,l,kn(a,e)));return new Kn(o,this._parents,n,e)},bp=function(t){var n=this._name,e=this._id;"function"!=typeof t&&(t=Bf(t));for(var r=this._groups,i=r.length,o=[],u=[],a=0;a<i;++a)for(var c,s=r[a],f=s.length,l=0;l<f;++l)if(c=s[l]){for(var h,p=t.call(c,c.__data__,l,s),d=kn(c,e),v=0,_=p.length;v<_;++v)(h=p[v])&&up(h,n,e,v,p,d);o.push(p),u.push(c)}return new Kn(o,u,n,e)},wp=vt.prototype.constructor,Mp=function(){return new wp(this._groups,this._parents)},Tp=function(t,n,e){var r="transform"==(t+="")?Ah:fp;return null==n?this.styleTween(t,Vn(t,r)).on("end.style."+t,$n(t)):this.styleTween(t,"function"==typeof n?Zn(t,r,An(this,"style."+t,n)):Wn(t,r,n+""),e)},kp=function(t,n,e){var r="style."+(t+="");if(arguments.length<2)return(r=this.tween(r))&&r._value;if(null==n)return this.tween(r,null);if("function"!=typeof n)throw new Error;return this.tween(r,Gn(t,n,null==e?"":e))},Sp=function(t){return this.tween("text","function"==typeof t?Qn(An(this,"text",t)):Jn(null==t?"":t+""))},Np=function(){for(var t=this._name,n=this._id,e=ne(),r=this._groups,i=r.length,o=0;o<i;++o)for(var u,a=r[o],c=a.length,s=0;s<c;++s)if(u=a[s]){var f=kn(u,n);up(u,t,e,s,a,{time:f.time+f.delay+f.duration,delay:0,duration:f.duration,ease:f.ease})}return new Kn(r,this._parents,t,e)},Ep=0,Ap=vt.prototype;Kn.prototype=te.prototype={constructor:Kn,select:xp,selectAll:bp,filter:_p,merge:gp,selection:Mp,transition:Np,call:Ap.call,nodes:Ap.nodes,node:Ap.node,size:Ap.size,empty:Ap.empty,each:Ap.each,on:yp,attr:lp,attrTween:hp,style:Tp,styleTween:kp,text:Sp,remove:mp,tween:sp,delay:pp,duration:dp,ease:vp};var Cp=function t(n){function e(t){return Math.pow(t,n)}return n=+n,e.exponent=t,e}(3),zp=function t(n){function e(t){return 1-Math.pow(1-t,n)}return n=+n,e.exponent=t,e}(3),Pp=function t(n){function e(t){return((t*=2)<=1?Math.pow(t,n):2-Math.pow(2-t,n))/2}return n=+n,e.exponent=t,e}(3),Lp=Math.PI,Rp=Lp/2,qp=4/11,Up=6/11,Dp=8/11,Op=.75,Fp=9/11,Ip=10/11,Yp=.9375,Bp=21/22,jp=63/64,Hp=1/qp/qp,Xp=function t(n){function e(t){return t*t*((n+1)*t-n)}return n=+n,e.overshoot=t,e}(1.70158),Vp=function t(n){function e(t){return--t*t*((n+1)*t+n)+1}return n=+n,e.overshoot=t,e}(1.70158),$p=function t(n){function e(t){return((t*=2)<1?t*t*((n+1)*t-n):(t-=2)*t*((n+1)*t+n)+2)/2}return n=+n,e.overshoot=t,e}(1.70158),Wp=2*Math.PI,Zp=function t(n,e){function r(t){return n*Math.pow(2,10*--t)*Math.sin((i-t)/e)}var i=Math.asin(1/(n=Math.max(1,n)))*(e/=Wp);return r.amplitude=function(n){return t(n,e*Wp)},r.period=function(e){return t(n,e)},r}(1,.3),Gp=function t(n,e){function r(t){return 1-n*Math.pow(2,-10*(t=+t))*Math.sin((t+i)/e)}var i=Math.asin(1/(n=Math.max(1,n)))*(e/=Wp);return r.amplitude=function(n){return t(n,e*Wp)},r.period=function(e){return t(n,e)},r}(1,.3),Jp=function t(n,e){function r(t){return((t=2*t-1)<0?n*Math.pow(2,10*t)*Math.sin((i-t)/e):2-n*Math.pow(2,-10*t)*Math.sin((i+t)/e))/2}var i=Math.asin(1/(n=Math.max(1,n)))*(e/=Wp);return r.amplitude=function(n){return t(n,e*Wp)},r.period=function(e){return t(n,e)},r}(1,.3),Qp={time:null,delay:0,duration:250,ease:ce},Kp=function(t){var n,e;t instanceof Kn?(n=t._id,t=t._name):(n=ne(),(e=Qp).time=dn(),t=null==t?null:t+"");for(var r=this._groups,i=r.length,o=0;o<i;++o)for(var u,a=r[o],c=a.length,s=0;s<c;++s)(u=a[s])&&up(u,t,n,s,a,e||be(u,n));return new Kn(r,this._parents,t,n)};vt.prototype.interrupt=cp,vt.prototype.transition=Kp;var td=[null],nd=function(t,n){var e,r,i=t.__transition;if(i){n=null==n?null:n+"";for(r in i)if((e=i[r]).state>tp&&e.name===n)return new Kn([[t]],td,n,+r)}return null},ed=function(t){return function(){return t}},rd=function(t,n,e){this.target=t,this.type=n,this.selection=e},id=function(){t.event.preventDefault(),t.event.stopImmediatePropagation()},od={name:"drag"},ud={name:"space"},ad={name:"handle"},cd={name:"center"},sd={name:"x",handles:["e","w"].map(Me),input:function(t,n){return t&&[[t[0],n[0][1]],[t[1],n[1][1]]]},output:function(t){return t&&[t[0][0],t[1][0]]}},fd={name:"y",handles:["n","s"].map(Me),input:function(t,n){return t&&[[n[0][0],t[0]],[n[1][0],t[1]]]},output:function(t){return t&&[t[0][1],t[1][1]]}},ld={name:"xy",handles:["n","e","s","w","nw","ne","se","sw"].map(Me),input:function(t){return t},output:function(t){return t}},hd={overlay:"crosshair",selection:"move",n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},pd={e:"w",w:"e",nw:"ne",ne:"nw",se:"sw",sw:"se"},dd={n:"s",s:"n",nw:"sw",ne:"se",se:"ne",sw:"nw"},vd={overlay:1,selection:1,n:null,e:1,s:null,w:-1,nw:-1,ne:1,se:1,sw:-1},_d={overlay:1,selection:1,n:-1,e:null,s:1,w:null,nw:-1,ne:-1,se:1,sw:1},gd=function(){return ze(ld)},yd=Math.cos,md=Math.sin,xd=Math.PI,bd=xd/2,wd=2*xd,Md=Math.max,Td=function(){function t(t){var o,u,a,c,s,f,l=t.length,h=[],p=Gs(l),d=[],v=[],_=v.groups=new Array(l),g=new Array(l*l);for(o=0,s=-1;++s<l;){for(u=0,f=-1;++f<l;)u+=t[s][f];h.push(u),d.push(Gs(l)),o+=u}for(e&&p.sort(function(t,n){return e(h[t],h[n])}),r&&d.forEach(function(n,e){n.sort(function(n,i){return r(t[e][n],t[e][i])})}),o=Md(0,wd-n*l)/o,c=o?n:wd/l,u=0,s=-1;++s<l;){for(a=u,f=-1;++f<l;){var y=p[s],m=d[y][f],x=t[y][m],b=u,w=u+=x*o;g[m*l+y]={index:y,subindex:m,startAngle:b,endAngle:w,value:x}}_[y]={index:y,startAngle:a,endAngle:u,value:h[y]},u+=c}for(s=-1;++s<l;)for(f=s-1;++f<l;){var M=g[f*l+s],T=g[s*l+f];(M.value||T.value)&&v.push(M.value<T.value?{source:T,target:M}:{source:M,target:T})}return i?v.sort(i):v}var n=0,e=null,r=null,i=null;return t.padAngle=function(e){return arguments.length?(n=Md(0,e),t):n},t.sortGroups=function(n){return arguments.length?(e=n,t):e},t.sortSubgroups=function(n){return arguments.length?(r=n,t):r},t.sortChords=function(n){return arguments.length?(null==n?i=null:(i=Pe(n))._=n,t):i&&i._},t},kd=Array.prototype.slice,Sd=function(t){return function(){return t}},Nd=Math.PI,Ed=2*Nd,Ad=Ed-1e-6;Le.prototype=Re.prototype={constructor:Le,moveTo:function(t,n){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+n)},closePath:function(){null!==this._x1&&(this._x1=this._x0,this._y1=this._y0,this._+="Z")},lineTo:function(t,n){this._+="L"+(this._x1=+t)+","+(this._y1=+n)},quadraticCurveTo:function(t,n,e,r){this._+="Q"+ +t+","+ +n+","+(this._x1=+e)+","+(this._y1=+r)},bezierCurveTo:function(t,n,e,r,i,o){this._+="C"+ +t+","+ +n+","+ +e+","+ +r+","+(this._x1=+i)+","+(this._y1=+o)},arcTo:function(t,n,e,r,i){t=+t,n=+n,e=+e,r=+r,i=+i;var o=this._x1,u=this._y1,a=e-t,c=r-n,s=o-t,f=u-n,l=s*s+f*f;if(i<0)throw new Error("negative radius: "+i);if(null===this._x1)this._+="M"+(this._x1=t)+","+(this._y1=n);else if(l>1e-6)if(Math.abs(f*a-c*s)>1e-6&&i){var h=e-o,p=r-u,d=a*a+c*c,v=h*h+p*p,_=Math.sqrt(d),g=Math.sqrt(l),y=i*Math.tan((Nd-Math.acos((d+l-v)/(2*_*g)))/2),m=y/g,x=y/_;Math.abs(m-1)>1e-6&&(this._+="L"+(t+m*s)+","+(n+m*f)),this._+="A"+i+","+i+",0,0,"+ +(f*h>s*p)+","+(this._x1=t+x*a)+","+(this._y1=n+x*c)}else this._+="L"+(this._x1=t)+","+(this._y1=n);else;},arc:function(t,n,e,r,i,o){t=+t,n=+n,e=+e;var u=e*Math.cos(r),a=e*Math.sin(r),c=t+u,s=n+a,f=1^o,l=o?r-i:i-r;if(e<0)throw new Error("negative radius: "+e);null===this._x1?this._+="M"+c+","+s:(Math.abs(this._x1-c)>1e-6||Math.abs(this._y1-s)>1e-6)&&(this._+="L"+c+","+s),e&&(l<0&&(l=l%Ed+Ed),l>Ad?this._+="A"+e+","+e+",0,1,"+f+","+(t-u)+","+(n-a)+"A"+e+","+e+",0,1,"+f+","+(this._x1=c)+","+(this._y1=s):l>1e-6&&(this._+="A"+e+","+e+",0,"+ +(l>=Nd)+","+f+","+(this._x1=t+e*Math.cos(i))+","+(this._y1=n+e*Math.sin(i))))},rect:function(t,n,e,r){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+n)+"h"+ +e+"v"+ +r+"h"+-e+"Z"},toString:function(){return this._}};var Cd=function(){function t(){var t,a=kd.call(arguments),c=n.apply(this,a),s=e.apply(this,a),f=+r.apply(this,(a[0]=c,a)),l=i.apply(this,a)-bd,h=o.apply(this,a)-bd,p=f*yd(l),d=f*md(l),v=+r.apply(this,(a[0]=s,a)),_=i.apply(this,a)-bd,g=o.apply(this,a)-bd;if(u||(u=t=Re()),u.moveTo(p,d),u.arc(0,0,f,l,h),l===_&&h===g||(u.quadraticCurveTo(0,0,v*yd(_),v*md(_)),u.arc(0,0,v,_,g)),u.quadraticCurveTo(0,0,p,d),u.closePath(),t)return u=null,t+""||null}var n=qe,e=Ue,r=De,i=Oe,o=Fe,u=null;return t.radius=function(n){return arguments.length?(r="function"==typeof n?n:Sd(+n),t):r},t.startAngle=function(n){return arguments.length?(i="function"==typeof n?n:Sd(+n),t):i},t.endAngle=function(n){return arguments.length?(o="function"==typeof n?n:Sd(+n),t):o},t.source=function(e){return arguments.length?(n=e,t):n},t.target=function(n){return arguments.length?(e=n,t):e},t.context=function(n){return arguments.length?(u=null==n?null:n,t):u},t};Ie.prototype=Ye.prototype={constructor:Ie,has:function(t){return"$"+t in this},get:function(t){return this["$"+t]},set:function(t,n){return this["$"+t]=n,this},remove:function(t){var n="$"+t;return n in this&&delete this[n]},clear:function(){for(var t in this)"$"===t[0]&&delete this[t]},keys:function(){var t=[];for(var n in this)"$"===n[0]&&t.push(n.slice(1));return t},values:function(){var t=[];for(var n in this)"$"===n[0]&&t.push(this[n]);return t},entries:function(){var t=[];for(var n in this)"$"===n[0]&&t.push({key:n.slice(1),value:this[n]});return t},size:function(){var t=0;for(var n in this)"$"===n[0]&&++t;return t},empty:function(){for(var t in this)if("$"===t[0])return!1;return!0},each:function(t){for(var n in this)"$"===n[0]&&t(this[n],n.slice(1),this)}};var zd=function(){function t(n,i,u,a){if(i>=o.length)return null!=r?r(n):null!=e?n.sort(e):n;for(var c,s,f,l=-1,h=n.length,p=o[i++],d=Ye(),v=u();++l<h;)(f=d.get(c=p(s=n[l])+""))?f.push(s):d.set(c,[s]);return d.each(function(n,e){a(v,e,t(n,i,u,a))}),v}function n(t,e){if(++e>o.length)return t;var i,a=u[e-1];return null!=r&&e>=o.length?i=t.entries():(i=[],t.each(function(t,r){i.push({key:r,values:n(t,e)})})),null!=a?i.sort(function(t,n){return a(t.key,n.key)}):i}var e,r,i,o=[],u=[];return i={object:function(n){return t(n,0,Be,je)},map:function(n){return t(n,0,He,Xe)},entries:function(e){return n(t(e,0,He,Xe),0)},key:function(t){return o.push(t),i},sortKeys:function(t){return u[o.length-1]=t,i},sortValues:function(t){return e=t,i},rollup:function(t){return r=t,i}}},Pd=Ye.prototype;Ve.prototype=$e.prototype={constructor:Ve,has:Pd.has,add:function(t){return t+="",this["$"+t]=t,this},remove:Pd.remove,clear:Pd.clear,values:Pd.keys,size:Pd.size,empty:Pd.empty,each:Pd.each};var Ld=function(t){var n=[];for(var e in t)n.push(e);return n},Rd=function(t){var n=[];for(var e in t)n.push(t[e]);return n},qd=function(t){var n=[];for(var e in t)n.push({key:e,value:t[e]});return n},Ud=function(t){function n(t,n){var r,i,o=e(t,function(t,e){if(r)return r(t,e-1);i=t,r=n?Ze(t,n):We(t)});return o.columns=i,o}function e(t,n){function e(){if(f>=s)return u;if(i)return i=!1,o;var n,e=f;if(34===t.charCodeAt(e)){for(var r=e;r++<s;)if(34===t.charCodeAt(r)){if(34!==t.charCodeAt(r+1))break;++r}return f=r+2,n=t.charCodeAt(r+1),13===n?(i=!0,10===t.charCodeAt(r+2)&&++f):10===n&&(i=!0),t.slice(e+1,r).replace(/""/g,'"')}for(;f<s;){var a=1;if(10===(n=t.charCodeAt(f++)))i=!0;else if(13===n)i=!0,10===t.charCodeAt(f)&&(++f,++a);else if(n!==c)continue;return t.slice(e,f-a)}return t.slice(e)}for(var r,i,o={},u={},a=[],s=t.length,f=0,l=0;(r=e())!==u;){for(var h=[];r!==o&&r!==u;)h.push(r),r=e();n&&null==(h=n(h,l++))||a.push(h)}return a}function r(n,e){return null==e&&(e=Ge(n)),[e.map(u).join(t)].concat(n.map(function(n){return e.map(function(t){return u(n[t])}).join(t)})).join("\n")}function i(t){return t.map(o).join("\n")}function o(n){return n.map(u).join(t)}function u(t){return null==t?"":a.test(t+="")?'"'+t.replace(/\"/g,'""')+'"':t}var a=new RegExp('["'+t+"\n\r]"),c=t.charCodeAt(0);return{parse:n,parseRows:e,format:r,formatRows:i}},Dd=Ud(","),Od=Dd.parse,Fd=Dd.parseRows,Id=Dd.format,Yd=Dd.formatRows,Bd=Ud("\t"),jd=Bd.parse,Hd=Bd.parseRows,Xd=Bd.format,Vd=Bd.formatRows,$d=function(t,n){function e(){var e,i,o=r.length,u=0,a=0;for(e=0;e<o;++e)i=r[e],u+=i.x,a+=i.y;for(u=u/o-t,a=a/o-n,e=0;e<o;++e)i=r[e],i.x-=u,i.y-=a}var r;return null==t&&(t=0),null==n&&(n=0),e.initialize=function(t){r=t},e.x=function(n){return arguments.length?(t=+n,e):t},e.y=function(t){return arguments.length?(n=+t,e):n},e},Wd=function(t){return function(){return t}},Zd=function(){return 1e-6*(Math.random()-.5)},Gd=function(t){var n=+this._x.call(null,t),e=+this._y.call(null,t);return Je(this.cover(n,e),n,e,t)},Jd=function(t,n){if(isNaN(t=+t)||isNaN(n=+n))return this;var e=this._x0,r=this._y0,i=this._x1,o=this._y1;if(isNaN(e))i=(e=Math.floor(t))+1,o=(r=Math.floor(n))+1;else{if(!(e>t||t>i||r>n||n>o))return this;var u,a,c=i-e,s=this._root;switch(a=(n<(r+o)/2)<<1|t<(e+i)/2){case 0:do{u=new Array(4),u[a]=s,s=u}while(c*=2,i=e+c,o=r+c,t>i||n>o);break;case 1:do{u=new Array(4),u[a]=s,s=u}while(c*=2,e=i-c,o=r+c,e>t||n>o);break;case 2:do{u=new Array(4),u[a]=s,s=u}while(c*=2,i=e+c,r=o-c,t>i||r>n);break;case 3:do{u=new Array(4),u[a]=s,s=u}while(c*=2,e=i-c,r=o-c,e>t||r>n)}this._root&&this._root.length&&(this._root=s)}return this._x0=e,this._y0=r,this._x1=i,this._y1=o,this},Qd=function(){var t=[];return this.visit(function(n){if(!n.length)do{t.push(n.data)}while(n=n.next)}),t},Kd=function(t){return arguments.length?this.cover(+t[0][0],+t[0][1]).cover(+t[1][0],+t[1][1]):isNaN(this._x0)?void 0:[[this._x0,this._y0],[this._x1,this._y1]]},tv=function(t,n,e,r,i){this.node=t,this.x0=n,this.y0=e,this.x1=r,this.y1=i},nv=function(t,n,e){var r,i,o,u,a,c,s,f=this._x0,l=this._y0,h=this._x1,p=this._y1,d=[],v=this._root;for(v&&d.push(new tv(v,f,l,h,p)),null==e?e=1/0:(f=t-e,l=n-e,h=t+e,p=n+e,e*=e);c=d.pop();)if(!(!(v=c.node)||(i=c.x0)>h||(o=c.y0)>p||(u=c.x1)<f||(a=c.y1)<l))if(v.length){var _=(i+u)/2,g=(o+a)/2;d.push(new tv(v[3],_,g,u,a),new tv(v[2],i,g,_,a),new tv(v[1],_,o,u,g),new tv(v[0],i,o,_,g)),(s=(n>=g)<<1|t>=_)&&(c=d[d.length-1],d[d.length-1]=d[d.length-1-s],d[d.length-1-s]=c)}else{var y=t-+this._x.call(null,v.data),m=n-+this._y.call(null,v.data),x=y*y+m*m;if(x<e){var b=Math.sqrt(e=x);f=t-b,l=n-b,h=t+b,p=n+b,r=v.data}}return r},ev=function(t){if(isNaN(o=+this._x.call(null,t))||isNaN(u=+this._y.call(null,t)))return this;var n,e,r,i,o,u,a,c,s,f,l,h,p=this._root,d=this._x0,v=this._y0,_=this._x1,g=this._y1;if(!p)return this;if(p.length)for(;;){if((s=o>=(a=(d+_)/2))?d=a:_=a,(f=u>=(c=(v+g)/2))?v=c:g=c,n=p,!(p=p[l=f<<1|s]))return this;if(!p.length)break;(n[l+1&3]||n[l+2&3]||n[l+3&3])&&(e=n,h=l)}for(;p.data!==t;)if(r=p,!(p=p.next))return this;return(i=p.next)&&delete p.next,r?(i?r.next=i:delete r.next,this):n?(i?n[l]=i:delete n[l],(p=n[0]||n[1]||n[2]||n[3])&&p===(n[3]||n[2]||n[1]||n[0])&&!p.length&&(e?e[h]=p:this._root=p),this):(this._root=i,this)},rv=function(){return this._root},iv=function(){var t=0;return this.visit(function(n){if(!n.length)do{++t}while(n=n.next)}),t},ov=function(t){var n,e,r,i,o,u,a=[],c=this._root;for(c&&a.push(new tv(c,this._x0,this._y0,this._x1,this._y1));n=a.pop();)if(!t(c=n.node,r=n.x0,i=n.y0,o=n.x1,u=n.y1)&&c.length){var s=(r+o)/2,f=(i+u)/2;(e=c[3])&&a.push(new tv(e,s,f,o,u)),(e=c[2])&&a.push(new tv(e,r,f,s,u)),(e=c[1])&&a.push(new tv(e,s,i,o,f)),(e=c[0])&&a.push(new tv(e,r,i,s,f))}return this},uv=function(t){var n,e=[],r=[];for(this._root&&e.push(new tv(this._root,this._x0,this._y0,this._x1,this._y1));n=e.pop();){var i=n.node;if(i.length){var o,u=n.x0,a=n.y0,c=n.x1,s=n.y1,f=(u+c)/2,l=(a+s)/2;(o=i[0])&&e.push(new tv(o,u,a,f,l)),(o=i[1])&&e.push(new tv(o,f,a,c,l)),(o=i[2])&&e.push(new tv(o,u,l,f,s)),(o=i[3])&&e.push(new tv(o,f,l,c,s))}r.push(n)}for(;n=r.pop();)t(n.node,n.x0,n.y0,n.x1,n.y1);return this},av=function(t){return arguments.length?(this._x=t,this):this._x},cv=function(t){return arguments.length?(this._y=t,this):this._y},sv=er.prototype=rr.prototype;sv.copy=function(){var t,n,e=new rr(this._x,this._y,this._x0,this._y0,this._x1,this._y1),r=this._root;if(!r)return e;if(!r.length)return e._root=ir(r),e;for(t=[{source:r,target:e._root=new Array(4)}];r=t.pop();)for(var i=0;i<4;++i)(n=r.source[i])&&(n.length?t.push({source:n,target:r.target[i]=new Array(4)}):r.target[i]=ir(n));return e},sv.add=Gd,sv.addAll=Qe,sv.cover=Jd,sv.data=Qd,sv.extent=Kd,sv.find=nv,sv.remove=ev,sv.removeAll=Ke,sv.root=rv,sv.size=iv,sv.visit=ov,sv.visitAfter=uv,sv.x=av,sv.y=cv;var fv,lv=function(t){function n(){function t(t,n,e,r,i){var o=t.data,a=t.r,p=l+a;{if(!o)return n>s+p||r<s-p||e>f+p||i<f-p;if(o.index>c.index){var d=s-o.x-o.vx,v=f-o.y-o.vy,_=d*d+v*v;_<p*p&&(0===d&&(d=Zd(),_+=d*d),0===v&&(v=Zd(),_+=v*v),_=(p-(_=Math.sqrt(_)))/_*u,c.vx+=(d*=_)*(p=(a*=a)/(h+a)),c.vy+=(v*=_)*p,o.vx-=d*(p=1-p),o.vy-=v*p)}}}for(var n,r,c,s,f,l,h,p=i.length,d=0;d<a;++d)for(r=er(i,or,ur).visitAfter(e),n=0;n<p;++n)c=i[n],l=o[c.index],h=l*l,s=c.x+c.vx,f=c.y+c.vy,r.visit(t)}function e(t){if(t.data)return t.r=o[t.data.index];for(var n=t.r=0;n<4;++n)t[n]&&t[n].r>t.r&&(t.r=t[n].r)}function r(){if(i){var n,e,r=i.length;for(o=new Array(r),n=0;n<r;++n)e=i[n],o[e.index]=+t(e,n,i)}}var i,o,u=1,a=1;return"function"!=typeof t&&(t=Wd(null==t?1:+t)),n.initialize=function(t){i=t,r()},n.iterations=function(t){return arguments.length?(a=+t,n):a},n.strength=function(t){return arguments.length?(u=+t,n):u},n.radius=function(e){return arguments.length?(t="function"==typeof e?e:Wd(+e),r(),n):t},n},hv=function(t){function n(t){return 1/Math.min(s[t.source.index],s[t.target.index])}function e(n){for(var e=0,r=t.length;e<d;++e)for(var i,o,c,s,l,h,p,v=0;v<r;++v)i=t[v],o=i.source,c=i.target,s=c.x+c.vx-o.x-o.vx||Zd(),l=c.y+c.vy-o.y-o.vy||Zd(),h=Math.sqrt(s*s+l*l),h=(h-a[v])/h*n*u[v],s*=h,l*=h,c.vx-=s*(p=f[v]),c.vy-=l*p,o.vx+=s*(p=1-p),o.vy+=l*p}function r(){if(c){var n,e,r=c.length,h=t.length,p=Ye(c,l);for(n=0,s=new Array(r);n<h;++n)e=t[n],e.index=n,"object"!=typeof e.source&&(e.source=cr(p,e.source)),"object"!=typeof e.target&&(e.target=cr(p,e.target)),s[e.source.index]=(s[e.source.index]||0)+1,s[e.target.index]=(s[e.target.index]||0)+1;for(n=0,f=new Array(h);n<h;++n)e=t[n],f[n]=s[e.source.index]/(s[e.source.index]+s[e.target.index]);u=new Array(h),i(),a=new Array(h),o()}}function i(){if(c)for(var n=0,e=t.length;n<e;++n)u[n]=+h(t[n],n,t)}function o(){if(c)for(var n=0,e=t.length;n<e;++n)a[n]=+p(t[n],n,t)}var u,a,c,s,f,l=ar,h=n,p=Wd(30),d=1;return null==t&&(t=[]),e.initialize=function(t){c=t,r()},e.links=function(n){return arguments.length?(t=n,r(),e):t},e.id=function(t){return arguments.length?(l=t,e):l},e.iterations=function(t){return arguments.length?(d=+t,e):d},e.strength=function(t){return arguments.length?(h="function"==typeof t?t:Wd(+t),i(),e):h},e.distance=function(t){return arguments.length?(p="function"==typeof t?t:Wd(+t),o(),e):p},e},pv=10,dv=Math.PI*(3-Math.sqrt(5)),vv=function(t){function n(){e(),p.call("tick",o),u<a&&(h.stop(),p.call("end",o))}function e(){var n,e,r=t.length;for(u+=(s-u)*c,
 l.each(function(t){t(u)}),n=0;n<r;++n)e=t[n],null==e.fx?e.x+=e.vx*=f:(e.x=e.fx,e.vx=0),null==e.fy?e.y+=e.vy*=f:(e.y=e.fy,e.vy=0)}function r(){for(var n,e=0,r=t.length;e<r;++e){if(n=t[e],n.index=e,isNaN(n.x)||isNaN(n.y)){var i=pv*Math.sqrt(e),o=e*dv;n.x=i*Math.cos(o),n.y=i*Math.sin(o)}(isNaN(n.vx)||isNaN(n.vy))&&(n.vx=n.vy=0)}}function i(n){return n.initialize&&n.initialize(t),n}var o,u=1,a=.001,c=1-Math.pow(a,1/300),s=0,f=.6,l=Ye(),h=gn(n),p=d("tick","end");return null==t&&(t=[]),r(),o={tick:e,restart:function(){return h.restart(n),o},stop:function(){return h.stop(),o},nodes:function(n){return arguments.length?(t=n,r(),l.each(i),o):t},alpha:function(t){return arguments.length?(u=+t,o):u},alphaMin:function(t){return arguments.length?(a=+t,o):a},alphaDecay:function(t){return arguments.length?(c=+t,o):+c},alphaTarget:function(t){return arguments.length?(s=+t,o):s},velocityDecay:function(t){return arguments.length?(f=1-t,o):1-f},force:function(t,n){return arguments.length>1?(null==n?l.remove(t):l.set(t,i(n)),o):l.get(t)},find:function(n,e,r){var i,o,u,a,c,s=0,f=t.length;for(null==r?r=1/0:r*=r,s=0;s<f;++s)a=t[s],i=n-a.x,o=e-a.y,(u=i*i+o*o)<r&&(c=a,r=u);return c},on:function(t,n){return arguments.length>1?(p.on(t,n),o):p.on(t)}}},_v=function(){function t(t){var n,a=i.length,c=er(i,sr,fr).visitAfter(e);for(u=t,n=0;n<a;++n)o=i[n],c.visit(r)}function n(){if(i){var t,n,e=i.length;for(a=new Array(e),t=0;t<e;++t)n=i[t],a[n.index]=+c(n,t,i)}}function e(t){var n,e,r,i,o,u=0;if(t.length){for(r=i=o=0;o<4;++o)(n=t[o])&&(e=n.value)&&(u+=e,r+=e*n.x,i+=e*n.y);t.x=r/u,t.y=i/u}else{n=t,n.x=n.data.x,n.y=n.data.y;do{u+=a[n.data.index]}while(n=n.next)}t.value=u}function r(t,n,e,r){if(!t.value)return!0;var i=t.x-o.x,c=t.y-o.y,h=r-n,p=i*i+c*c;if(h*h/l<p)return p<f&&(0===i&&(i=Zd(),p+=i*i),0===c&&(c=Zd(),p+=c*c),p<s&&(p=Math.sqrt(s*p)),o.vx+=i*t.value*u/p,o.vy+=c*t.value*u/p),!0;if(!(t.length||p>=f)){(t.data!==o||t.next)&&(0===i&&(i=Zd(),p+=i*i),0===c&&(c=Zd(),p+=c*c),p<s&&(p=Math.sqrt(s*p)));do{t.data!==o&&(h=a[t.data.index]*u/p,o.vx+=i*h,o.vy+=c*h)}while(t=t.next)}}var i,o,u,a,c=Wd(-30),s=1,f=1/0,l=.81;return t.initialize=function(t){i=t,n()},t.strength=function(e){return arguments.length?(c="function"==typeof e?e:Wd(+e),n(),t):c},t.distanceMin=function(n){return arguments.length?(s=n*n,t):Math.sqrt(s)},t.distanceMax=function(n){return arguments.length?(f=n*n,t):Math.sqrt(f)},t.theta=function(n){return arguments.length?(l=n*n,t):Math.sqrt(l)},t},gv=function(t){function n(t){for(var n,e=0,u=r.length;e<u;++e)n=r[e],n.vx+=(o[e]-n.x)*i[e]*t}function e(){if(r){var n,e=r.length;for(i=new Array(e),o=new Array(e),n=0;n<e;++n)i[n]=isNaN(o[n]=+t(r[n],n,r))?0:+u(r[n],n,r)}}var r,i,o,u=Wd(.1);return"function"!=typeof t&&(t=Wd(null==t?0:+t)),n.initialize=function(t){r=t,e()},n.strength=function(t){return arguments.length?(u="function"==typeof t?t:Wd(+t),e(),n):u},n.x=function(r){return arguments.length?(t="function"==typeof r?r:Wd(+r),e(),n):t},n},yv=function(t){function n(t){for(var n,e=0,u=r.length;e<u;++e)n=r[e],n.vy+=(o[e]-n.y)*i[e]*t}function e(){if(r){var n,e=r.length;for(i=new Array(e),o=new Array(e),n=0;n<e;++n)i[n]=isNaN(o[n]=+t(r[n],n,r))?0:+u(r[n],n,r)}}var r,i,o,u=Wd(.1);return"function"!=typeof t&&(t=Wd(null==t?0:+t)),n.initialize=function(t){r=t,e()},n.strength=function(t){return arguments.length?(u="function"==typeof t?t:Wd(+t),e(),n):u},n.y=function(r){return arguments.length?(t="function"==typeof r?r:Wd(+r),e(),n):t},n},mv=function(t,n){if((e=(t=n?t.toExponential(n-1):t.toExponential()).indexOf("e"))<0)return null;var e,r=t.slice(0,e);return[r.length>1?r[0]+r.slice(2):r,+t.slice(e+1)]},xv=function(t){return t=mv(Math.abs(t)),t?t[1]:NaN},bv=function(t,n){return function(e,r){for(var i=e.length,o=[],u=0,a=t[0],c=0;i>0&&a>0&&(c+a+1>r&&(a=Math.max(1,r-c)),o.push(e.substring(i-=a,i+a)),!((c+=a+1)>r));)a=t[u=(u+1)%t.length];return o.reverse().join(n)}},wv=function(t){return function(n){return n.replace(/[0-9]/g,function(n){return t[+n]})}},Mv=function(t,n){t=t.toPrecision(n);t:for(var e,r=t.length,i=1,o=-1;i<r;++i)switch(t[i]){case".":o=e=i;break;case"0":0===o&&(o=i),e=i;break;case"e":break t;default:o>0&&(o=0)}return o>0?t.slice(0,o)+t.slice(e+1):t},Tv=function(t,n){var e=mv(t,n);if(!e)return t+"";var r=e[0],i=e[1],o=i-(fv=3*Math.max(-8,Math.min(8,Math.floor(i/3))))+1,u=r.length;return o===u?r:o>u?r+new Array(o-u+1).join("0"):o>0?r.slice(0,o)+"."+r.slice(o):"0."+new Array(1-o).join("0")+mv(t,Math.max(0,n+o-1))[0]},kv=function(t,n){var e=mv(t,n);if(!e)return t+"";var r=e[0],i=e[1];return i<0?"0."+new Array(-i).join("0")+r:r.length>i+1?r.slice(0,i+1)+"."+r.slice(i+1):r+new Array(i-r.length+2).join("0")},Sv={"":Mv,"%":function(t,n){return(100*t).toFixed(n)},b:function(t){return Math.round(t).toString(2)},c:function(t){return t+""},d:function(t){return Math.round(t).toString(10)},e:function(t,n){return t.toExponential(n)},f:function(t,n){return t.toFixed(n)},g:function(t,n){return t.toPrecision(n)},o:function(t){return Math.round(t).toString(8)},p:function(t,n){return kv(100*t,n)},r:kv,s:Tv,X:function(t){return Math.round(t).toString(16).toUpperCase()},x:function(t){return Math.round(t).toString(16)}},Nv=/^(?:(.)?([<>=^]))?([+\-\( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?([a-z%])?$/i;lr.prototype=hr.prototype,hr.prototype.toString=function(){return this.fill+this.align+this.sign+this.symbol+(this.zero?"0":"")+(null==this.width?"":Math.max(1,0|this.width))+(this.comma?",":"")+(null==this.precision?"":"."+Math.max(0,0|this.precision))+this.type};var Ev,Av=function(t){return t},Cv=["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"],zv=function(t){function n(t){function n(t){var n,i,s,m=v,x=_;if("c"===d)x=g(t)+x,t="";else{t=+t;var b=t<0;if(t=g(Math.abs(t),p),b&&0==+t&&(b=!1),m=(b?"("===c?c:"-":"-"===c||"("===c?"":c)+m,x=x+("s"===d?Cv[8+fv/3]:"")+(b&&"("===c?")":""),y)for(n=-1,i=t.length;++n<i;)if(48>(s=t.charCodeAt(n))||s>57){x=(46===s?o+t.slice(n+1):t.slice(n))+x,t=t.slice(0,n);break}}h&&!f&&(t=r(t,1/0));var w=m.length+t.length+x.length,M=w<l?new Array(l-w+1).join(e):"";switch(h&&f&&(t=r(M+t,M.length?l-x.length:1/0),M=""),a){case"<":t=m+t+x+M;break;case"=":t=m+M+t+x;break;case"^":t=M.slice(0,w=M.length>>1)+m+t+x+M.slice(w);break;default:t=M+m+t+x}return u(t)}t=lr(t);var e=t.fill,a=t.align,c=t.sign,s=t.symbol,f=t.zero,l=t.width,h=t.comma,p=t.precision,d=t.type,v="$"===s?i[0]:"#"===s&&/[boxX]/.test(d)?"0"+d.toLowerCase():"",_="$"===s?i[1]:/[%p]/.test(d)?"%":"",g=Sv[d],y=!d||/[defgprs%]/.test(d);return p=null==p?d?6:12:/[gprs]/.test(d)?Math.max(1,Math.min(21,p)):Math.max(0,Math.min(20,p)),n.toString=function(){return t+""},n}function e(t,e){var r=n((t=lr(t),t.type="f",t)),i=3*Math.max(-8,Math.min(8,Math.floor(xv(e)/3))),o=Math.pow(10,-i),u=Cv[8+i/3];return function(t){return r(o*t)+u}}var r=t.grouping&&t.thousands?bv(t.grouping,t.thousands):Av,i=t.currency,o=t.decimal,u=t.numerals?wv(t.numerals):Av;return{format:n,formatPrefix:e}};pr({decimal:".",thousands:",",grouping:[3],currency:["$",""]});var Pv=function(t){return Math.max(0,-xv(Math.abs(t)))},Lv=function(t,n){return Math.max(0,3*Math.max(-8,Math.min(8,Math.floor(xv(n)/3)))-xv(Math.abs(t)))},Rv=function(t,n){return t=Math.abs(t),n=Math.abs(n)-t,Math.max(0,xv(n)-xv(t))+1},qv=function(){return new dr};dr.prototype={constructor:dr,reset:function(){this.s=this.t=0},add:function(t){vr(p_,t,this.t),vr(this,p_.s,this.s),this.s?this.t+=p_.t:this.s=p_.t},valueOf:function(){return this.s}};var Uv,Dv,Ov,Fv,Iv,Yv,Bv,jv,Hv,Xv,Vv,$v,Wv,Zv,Gv,Jv,Qv,Kv,t_,n_,e_,r_,i_,o_,u_,a_,c_,s_,f_,l_,h_,p_=new dr,d_=1e-6,v_=Math.PI,__=v_/2,g_=v_/4,y_=2*v_,m_=180/v_,x_=v_/180,b_=Math.abs,w_=Math.atan,M_=Math.atan2,T_=Math.cos,k_=Math.ceil,S_=Math.exp,N_=Math.log,E_=Math.pow,A_=Math.sin,C_=Math.sign||function(t){return t>0?1:t<0?-1:0},z_=Math.sqrt,P_=Math.tan,L_={Feature:function(t,n){xr(t.geometry,n)},FeatureCollection:function(t,n){for(var e=t.features,r=-1,i=e.length;++r<i;)xr(e[r].geometry,n)}},R_={Sphere:function(t,n){n.sphere()},Point:function(t,n){t=t.coordinates,n.point(t[0],t[1],t[2])},MultiPoint:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)t=e[r],n.point(t[0],t[1],t[2])},LineString:function(t,n){br(t.coordinates,n,0)},MultiLineString:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)br(e[r],n,0)},Polygon:function(t,n){wr(t.coordinates,n)},MultiPolygon:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)wr(e[r],n)},GeometryCollection:function(t,n){for(var e=t.geometries,r=-1,i=e.length;++r<i;)xr(e[r],n)}},q_=function(t,n){t&&L_.hasOwnProperty(t.type)?L_[t.type](t,n):xr(t,n)},U_=qv(),D_=qv(),O_={point:mr,lineStart:mr,lineEnd:mr,polygonStart:function(){U_.reset(),O_.lineStart=Mr,O_.lineEnd=Tr},polygonEnd:function(){var t=+U_;D_.add(t<0?y_+t:t),this.lineStart=this.lineEnd=this.point=mr},sphere:function(){D_.add(y_)}},F_=function(t){return D_.reset(),q_(t,O_),2*D_},I_=qv(),Y_={point:Rr,lineStart:Ur,lineEnd:Dr,polygonStart:function(){Y_.point=Or,Y_.lineStart=Fr,Y_.lineEnd=Ir,I_.reset(),O_.polygonStart()},polygonEnd:function(){O_.polygonEnd(),Y_.point=Rr,Y_.lineStart=Ur,Y_.lineEnd=Dr,U_<0?(Yv=-(jv=180),Bv=-(Hv=90)):I_>d_?Hv=90:I_<-d_&&(Bv=-90),Gv[0]=Yv,Gv[1]=jv}},B_=function(t){var n,e,r,i,o,u,a;if(Hv=jv=-(Yv=Bv=1/0),Zv=[],q_(t,Y_),e=Zv.length){for(Zv.sort(Br),n=1,r=Zv[0],o=[r];n<e;++n)i=Zv[n],jr(r,i[0])||jr(r,i[1])?(Yr(r[0],i[1])>Yr(r[0],r[1])&&(r[1]=i[1]),Yr(i[0],r[1])>Yr(r[0],r[1])&&(r[0]=i[0])):o.push(r=i);for(u=-(1/0),e=o.length-1,n=0,r=o[e];n<=e;r=i,++n)i=o[n],(a=Yr(r[1],i[0]))>u&&(u=a,Yv=i[0],jv=r[1])}return Zv=Gv=null,Yv===1/0||Bv===1/0?[[NaN,NaN],[NaN,NaN]]:[[Yv,Bv],[jv,Hv]]},j_={sphere:mr,point:Hr,lineStart:Vr,lineEnd:Zr,polygonStart:function(){j_.lineStart=Gr,j_.lineEnd=Jr},polygonEnd:function(){j_.lineStart=Vr,j_.lineEnd=Zr}},H_=function(t){Jv=Qv=Kv=t_=n_=e_=r_=i_=o_=u_=a_=0,q_(t,j_);var n=o_,e=u_,r=a_,i=n*n+e*e+r*r;return i<1e-12&&(n=e_,e=r_,r=i_,Qv<d_&&(n=Kv,e=t_,r=n_),(i=n*n+e*e+r*r)<1e-12)?[NaN,NaN]:[M_(e,n)*m_,gr(r/z_(i))*m_]},X_=function(t){return function(){return t}},V_=function(t,n){function e(e,r){return e=t(e,r),n(e[0],e[1])}return t.invert&&n.invert&&(e.invert=function(e,r){return(e=n.invert(e,r))&&t.invert(e[0],e[1])}),e};ti.invert=ti;var $_,W_,Z_,G_,J_,Q_,K_,tg,ng,eg,rg,ig=function(t){function n(n){return n=t(n[0]*x_,n[1]*x_),n[0]*=m_,n[1]*=m_,n}return t=ni(t[0]*x_,t[1]*x_,t.length>2?t[2]*x_:0),n.invert=function(n){return n=t.invert(n[0]*x_,n[1]*x_),n[0]*=m_,n[1]*=m_,n},n},og=function(){function t(t,n){e.push(t=r(t,n)),t[0]*=m_,t[1]*=m_}function n(){var t=i.apply(this,arguments),n=o.apply(this,arguments)*x_,c=u.apply(this,arguments)*x_;return e=[],r=ni(-t[0]*x_,-t[1]*x_,0).invert,oi(a,n,c,1),t={type:"Polygon",coordinates:[e]},e=r=null,t}var e,r,i=X_([0,0]),o=X_(90),u=X_(6),a={point:t};return n.center=function(t){return arguments.length?(i="function"==typeof t?t:X_([+t[0],+t[1]]),n):i},n.radius=function(t){return arguments.length?(o="function"==typeof t?t:X_(+t),n):o},n.precision=function(t){return arguments.length?(u="function"==typeof t?t:X_(+t),n):u},n},ug=function(){var t,n=[];return{point:function(n,e){t.push([n,e])},lineStart:function(){n.push(t=[])},lineEnd:mr,rejoin:function(){n.length>1&&n.push(n.pop().concat(n.shift()))},result:function(){var e=n;return n=[],t=null,e}}},ag=function(t,n,e,r,i,o){var u,a=t[0],c=t[1],s=n[0],f=n[1],l=0,h=1,p=s-a,d=f-c;if(u=e-a,p||!(u>0)){if(u/=p,p<0){if(u<l)return;u<h&&(h=u)}else if(p>0){if(u>h)return;u>l&&(l=u)}if(u=i-a,p||!(u<0)){if(u/=p,p<0){if(u>h)return;u>l&&(l=u)}else if(p>0){if(u<l)return;u<h&&(h=u)}if(u=r-c,d||!(u>0)){if(u/=d,d<0){if(u<l)return;u<h&&(h=u)}else if(d>0){if(u>h)return;u>l&&(l=u)}if(u=o-c,d||!(u<0)){if(u/=d,d<0){if(u>h)return;u>l&&(l=u)}else if(d>0){if(u<l)return;u<h&&(h=u)}return l>0&&(t[0]=a+l*p,t[1]=c+l*d),h<1&&(n[0]=a+h*p,n[1]=c+h*d),!0}}}}},cg=function(t,n){return b_(t[0]-n[0])<d_&&b_(t[1]-n[1])<d_},sg=function(t,n,e,r,i){var o,u,a=[],c=[];if(t.forEach(function(t){if(!((n=t.length-1)<=0)){var n,e,r=t[0],u=t[n];if(cg(r,u)){for(i.lineStart(),o=0;o<n;++o)i.point((r=t[o])[0],r[1]);return void i.lineEnd()}a.push(e=new ai(r,t,null,!0)),c.push(e.o=new ai(r,null,e,!1)),a.push(e=new ai(u,t,null,!1)),c.push(e.o=new ai(u,null,e,!0))}}),a.length){for(c.sort(n),ci(a),ci(c),o=0,u=c.length;o<u;++o)c[o].e=e=!e;for(var s,f,l=a[0];;){for(var h=l,p=!0;h.v;)if((h=h.n)===l)return;s=h.z,i.lineStart();do{if(h.v=h.o.v=!0,h.e){if(p)for(o=0,u=s.length;o<u;++o)i.point((f=s[o])[0],f[1]);else r(h.x,h.n.x,1,i);h=h.n}else{if(p)for(s=h.p.z,o=s.length-1;o>=0;--o)i.point((f=s[o])[0],f[1]);else r(h.x,h.p.x,-1,i);h=h.p}h=h.o,s=h.z,p=!p}while(!h.v);i.lineEnd()}}},fg=1e9,lg=-fg,hg=function(){var t,n,e,r=0,i=0,o=960,u=500;return e={stream:function(e){return t&&n===e?t:t=si(r,i,o,u)(n=e)},extent:function(a){return arguments.length?(r=+a[0][0],i=+a[0][1],o=+a[1][0],u=+a[1][1],t=n=null,e):[[r,i],[o,u]]}}},pg=qv(),dg=function(t,n){var e=n[0],r=n[1],i=[A_(e),-T_(e),0],o=0,u=0;pg.reset();for(var a=0,c=t.length;a<c;++a)if(f=(s=t[a]).length)for(var s,f,l=s[f-1],h=l[0],p=l[1]/2+g_,d=A_(p),v=T_(p),_=0;_<f;++_,h=y,d=x,v=b,l=g){var g=s[_],y=g[0],m=g[1]/2+g_,x=A_(m),b=T_(m),w=y-h,M=w>=0?1:-1,T=M*w,k=T>v_,S=d*x;if(pg.add(M_(S*M*A_(T),v*b+S*T_(T))),o+=k?w+M*y_:w,k^h>=e^y>=e){var N=Cr(Er(l),Er(g));Lr(N);var E=Cr(i,N);Lr(E);var A=(k^w>=0?-1:1)*gr(E[2]);(r>A||r===A&&(N[0]||N[1]))&&(u+=k^w>=0?1:-1)}}return(o<-d_||o<d_&&pg<-d_)^1&u},vg=qv(),_g={sphere:mr,point:mr,lineStart:fi,lineEnd:mr,polygonStart:mr,polygonEnd:mr},gg=function(t){return vg.reset(),q_(t,_g),+vg},yg=[null,null],mg={type:"LineString",coordinates:yg},xg=function(t,n){return yg[0]=t,yg[1]=n,gg(mg)},bg={Feature:function(t,n){return di(t.geometry,n)},FeatureCollection:function(t,n){for(var e=t.features,r=-1,i=e.length;++r<i;)if(di(e[r].geometry,n))return!0;return!1}},wg={Sphere:function(){return!0},Point:function(t,n){return vi(t.coordinates,n)},MultiPoint:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(vi(e[r],n))return!0;return!1},LineString:function(t,n){return _i(t.coordinates,n)},MultiLineString:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(_i(e[r],n))return!0;return!1},Polygon:function(t,n){return gi(t.coordinates,n)},MultiPolygon:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(gi(e[r],n))return!0;return!1},GeometryCollection:function(t,n){for(var e=t.geometries,r=-1,i=e.length;++r<i;)if(di(e[r],n))return!0;return!1}},Mg=function(t,n){return(t&&bg.hasOwnProperty(t.type)?bg[t.type]:di)(t,n)},Tg=function(t,n){var e=t[0]*x_,r=t[1]*x_,i=n[0]*x_,o=n[1]*x_,u=T_(r),a=A_(r),c=T_(o),s=A_(o),f=u*T_(e),l=u*A_(e),h=c*T_(i),p=c*A_(i),d=2*gr(z_(yr(o-r)+u*c*yr(i-e))),v=A_(d),_=d?function(t){var n=A_(t*=d)/v,e=A_(d-t)/v,r=e*f+n*h,i=e*l+n*p,o=e*a+n*s;return[M_(i,r)*m_,M_(o,z_(r*r+i*i))*m_]}:function(){return[e*m_,r*m_]};return _.distance=d,_},kg=function(t){return t},Sg=qv(),Ng=qv(),Eg={point:mr,lineStart:mr,lineEnd:mr,polygonStart:function(){Eg.lineStart=Ti,Eg.lineEnd=Ni},polygonEnd:function(){Eg.lineStart=Eg.lineEnd=Eg.point=mr,Sg.add(b_(Ng)),Ng.reset()},result:function(){var t=Sg/2;return Sg.reset(),t}},Ag=1/0,Cg=Ag,zg=-Ag,Pg=zg,Lg={point:Ei,lineStart:mr,lineEnd:mr,polygonStart:mr,polygonEnd:mr,result:function(){var t=[[Ag,Cg],[zg,Pg]];return zg=Pg=-(Cg=Ag=1/0),t}},Rg=0,qg=0,Ug=0,Dg=0,Og=0,Fg=0,Ig=0,Yg=0,Bg=0,jg={point:Ai,lineStart:Ci,lineEnd:Li,polygonStart:function(){jg.lineStart=Ri,jg.lineEnd=qi},polygonEnd:function(){jg.point=Ai,jg.lineStart=Ci,jg.lineEnd=Li},result:function(){var t=Bg?[Ig/Bg,Yg/Bg]:Fg?[Dg/Fg,Og/Fg]:Ug?[Rg/Ug,qg/Ug]:[NaN,NaN];return Rg=qg=Ug=Dg=Og=Fg=Ig=Yg=Bg=0,t}};Oi.prototype={_radius:4.5,pointRadius:function(t){return this._radius=t,this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){0===this._line&&this._context.closePath(),this._point=NaN},point:function(t,n){switch(this._point){case 0:this._context.moveTo(t,n),this._point=1;break;case 1:this._context.lineTo(t,n);break;default:this._context.moveTo(t+this._radius,n),this._context.arc(t,n,this._radius,0,y_)}},result:mr};var Hg,Xg,Vg,$g,Wg,Zg=qv(),Gg={point:mr,lineStart:function(){Gg.point=Fi},lineEnd:function(){Hg&&Ii(Xg,Vg),Gg.point=mr},polygonStart:function(){Hg=!0},polygonEnd:function(){Hg=null},result:function(){var t=+Zg;return Zg.reset(),t}};Yi.prototype={_circle:Bi(4.5),pointRadius:function(t){return this._circle=Bi(t),this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){0===this._line&&this._string.push("Z"),this._point=NaN},point:function(t,n){switch(this._point){case 0:this._string.push("M",t,",",n),this._point=1;break;case 1:this._string.push("L",t,",",n);break;default:this._string.push("M",t,",",n,this._circle)}},result:function(){if(this._string.length){var t=this._string.join("");return this._string=[],t}}};var Jg=function(t,n){function e(t){return t&&("function"==typeof o&&i.pointRadius(+o.apply(this,arguments)),q_(t,r(i))),i.result()}var r,i,o=4.5;return e.area=function(t){return q_(t,r(Eg)),Eg.result()},e.measure=function(t){return q_(t,r(Gg)),Gg.result()},e.bounds=function(t){return q_(t,r(Lg)),Lg.result()},e.centroid=function(t){return q_(t,r(jg)),jg.result()},e.projection=function(n){return arguments.length?(r=null==n?(t=null,kg):(t=n).stream,e):t},e.context=function(t){return arguments.length?(i=null==t?(n=null,new Yi):new Oi(n=t),"function"!=typeof o&&i.pointRadius(o),e):n},e.pointRadius=function(t){return arguments.length?(o="function"==typeof t?t:(i.pointRadius(+t),+t),e):o},e.projection(t).context(n)},Qg=function(t,n,e,r){return function(i,o){function u(n,e){var r=i(n,e);t(n=r[0],e=r[1])&&o.point(n,e)}function a(t,n){var e=i(t,n);_.point(e[0],e[1])}function c(){b.point=a,_.lineStart()}function s(){b.point=u,_.lineEnd()}function f(t,n){v.push([t,n]);var e=i(t,n);m.point(e[0],e[1])}function l(){m.lineStart(),v=[]}function h(){f(v[0][0],v[0][1]),m.lineEnd();var t,n,e,r,i=m.clean(),u=y.result(),a=u.length;if(v.pop(),p.push(v),v=null,a)if(1&i){if(e=u[0],(n=e.length-1)>0){for(x||(o.polygonStart(),x=!0),o.lineStart(),t=0;t<n;++t)o.point((r=e[t])[0],r[1]);o.lineEnd()}}else a>1&&2&i&&u.push(u.pop().concat(u.shift())),d.push(u.filter(ji))}var p,d,v,_=n(o),g=i.invert(r[0],r[1]),y=ug(),m=n(y),x=!1,b={point:u,lineStart:c,lineEnd:s,polygonStart:function(){b.point=f,b.lineStart=l,b.lineEnd=h,d=[],p=[]},polygonEnd:function(){b.point=u,b.lineStart=c,b.lineEnd=s,d=ff(d);var t=dg(p,g);d.length?(x||(o.polygonStart(),x=!0),sg(d,Hi,t,e,o)):t&&(x||(o.polygonStart(),x=!0),o.lineStart(),e(null,null,1,o),o.lineEnd()),x&&(o.polygonEnd(),x=!1),d=p=null},sphere:function(){o.polygonStart(),o.lineStart(),e(null,null,1,o),o.lineEnd(),o.polygonEnd()}};return b}},Kg=Qg(function(){return!0},Xi,$i,[-v_,-__]),ty=function(t,n){function e(e,r,i,o){oi(o,t,n,i,e,r)}function r(t,n){return T_(t)*T_(n)>a}function i(t){var n,e,i,a,f;return{lineStart:function(){a=i=!1,f=1},point:function(l,h){var p,d=[l,h],v=r(l,h),_=c?v?0:u(l,h):v?u(l+(l<0?v_:-v_),h):0;if(!n&&(a=i=v)&&t.lineStart(),v!==i&&(p=o(n,d),(cg(n,p)||cg(d,p))&&(d[0]+=d_,d[1]+=d_,v=r(d[0],d[1]))),v!==i)f=0,v?(t.lineStart(),p=o(d,n),t.point(p[0],p[1])):(p=o(n,d),t.point(p[0],p[1]),t.lineEnd()),n=p;else if(s&&n&&c^v){var g;_&e||!(g=o(d,n,!0))||(f=0,c?(t.lineStart(),t.point(g[0][0],g[0][1]),t.point(g[1][0],g[1][1]),t.lineEnd()):(t.point(g[1][0],g[1][1]),t.lineEnd(),t.lineStart(),t.point(g[0][0],g[0][1])))}!v||n&&cg(n,d)||t.point(d[0],d[1]),n=d,i=v,e=_},lineEnd:function(){i&&t.lineEnd(),n=null},clean:function(){return f|(a&&i)<<1}}}function o(t,n,e){var r=Er(t),i=Er(n),o=[1,0,0],u=Cr(r,i),c=Ar(u,u),s=u[0],f=c-s*s;if(!f)return!e&&t;var l=a*c/f,h=-a*s/f,p=Cr(o,u),d=Pr(o,l);zr(d,Pr(u,h));var v=p,_=Ar(d,v),g=Ar(v,v),y=_*_-g*(Ar(d,d)-1);if(!(y<0)){var m=z_(y),x=Pr(v,(-_-m)/g);if(zr(x,d),x=Nr(x),!e)return x;var b,w=t[0],M=n[0],T=t[1],k=n[1];M<w&&(b=w,w=M,M=b);var S=M-w,N=b_(S-v_)<d_,E=N||S<d_;if(!N&&k<T&&(b=T,T=k,k=b),E?N?T+k>0^x[1]<(b_(x[0]-w)<d_?T:k):T<=x[1]&&x[1]<=k:S>v_^(w<=x[0]&&x[0]<=M)){var A=Pr(v,(-_+m)/g);return zr(A,d),[x,Nr(A)]}}}function u(n,e){var r=c?t:v_-t,i=0;return n<-r?i|=1:n>r&&(i|=2),e<-r?i|=4:e>r&&(i|=8),i}var a=T_(t),c=a>0,s=b_(a)>d_;return Qg(r,i,e,c?[0,-t]:[-v_,t-v_])},ny=function(t){return{stream:Wi(t)}};Zi.prototype={constructor:Zi,point:function(t,n){this.stream.point(t,n)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}};var ey=16,ry=T_(30*x_),iy=function(t,n){return+n?Ki(t,n):Qi(t)},oy=Wi({point:function(t,n){this.stream.point(t*x_,n*x_)}}),uy=function(){return eo(io).scale(155.424).center([0,33.6442])},ay=function(){return uy().parallels([29.5,45.5]).scale(1070).translate([480,250]).rotate([96,0]).center([-.6,38.7])},cy=function(){function t(t){var n=t[0],e=t[1];return a=null,i.point(n,e),a||(o.point(n,e),a)||(u.point(n,e),a)}function n(){return e=r=null,t}var e,r,i,o,u,a,c=ay(),s=uy().rotate([154,0]).center([-2,58.5]).parallels([55,65]),f=uy().rotate([157,0]).center([-3,19.9]).parallels([8,18]),l={point:function(t,n){a=[t,n]}};return t.invert=function(t){var n=c.scale(),e=c.translate(),r=(t[0]-e[0])/n,i=(t[1]-e[1])/n;return(i>=.12&&i<.234&&r>=-.425&&r<-.214?s:i>=.166&&i<.234&&r>=-.214&&r<-.115?f:c).invert(t)},t.stream=function(t){return e&&r===t?e:e=oo([c.stream(r=t),s.stream(t),f.stream(t)])},t.precision=function(t){return arguments.length?(c.precision(t),s.precision(t),f.precision(t),n()):c.precision()},t.scale=function(n){return arguments.length?(c.scale(n),s.scale(.35*n),f.scale(n),t.translate(c.translate())):c.scale()},t.translate=function(t){if(!arguments.length)return c.translate();var e=c.scale(),r=+t[0],a=+t[1];return i=c.translate(t).clipExtent([[r-.455*e,a-.238*e],[r+.455*e,a+.238*e]]).stream(l),o=s.translate([r-.307*e,a+.201*e]).clipExtent([[r-.425*e+d_,a+.12*e+d_],[r-.214*e-d_,a+.234*e-d_]]).stream(l),u=f.translate([r-.205*e,a+.212*e]).clipExtent([[r-.214*e+d_,a+.166*e+d_],[r-.115*e-d_,a+.234*e-d_]]).stream(l),n()},t.fitExtent=function(n,e){return Gi(t,n,e)},t.fitSize=function(n,e){return Ji(t,n,e)},t.scale(1070)},sy=uo(function(t){return z_(2/(1+t))});sy.invert=ao(function(t){return 2*gr(t/2)});var fy=function(){return to(sy).scale(124.75).clipAngle(179.999)},ly=uo(function(t){return(t=_r(t))&&t/A_(t)});ly.invert=ao(function(t){return t});var hy=function(){return to(ly).scale(79.4188).clipAngle(179.999)};co.invert=function(t,n){return[t,2*w_(S_(n))-__]};var py=function(){return so(co).scale(961/y_)},dy=function(){return eo(lo).scale(109.5).parallels([30,30])};ho.invert=ho;var vy=function(){return to(ho).scale(152.63)},_y=function(){return eo(po).scale(131.154).center([0,13.9389])};vo.invert=ao(w_);var gy=function(){return to(vo).scale(144.049).clipAngle(60)},yy=function(){function t(){return i=o=null,u}var n,e,r,i,o,u,a=1,c=0,s=0,f=1,l=1,h=kg,p=null,d=kg;return u={stream:function(t){return i&&o===t?i:i=h(d(o=t))},clipExtent:function(i){return arguments.length?(d=null==i?(p=n=e=r=null,kg):si(p=+i[0][0],n=+i[0][1],e=+i[1][0],r=+i[1][1]),t()):null==p?null:[[p,n],[e,r]]},scale:function(n){return arguments.length?(h=_o((a=+n)*f,a*l,c,s),t()):a},translate:function(n){return arguments.length?(h=_o(a*f,a*l,c=+n[0],s=+n[1]),t()):[c,s]},reflectX:function(n){return arguments.length?(h=_o(a*(f=n?-1:1),a*l,c,s),t()):f<0},reflectY:function(n){return arguments.length?(h=_o(a*f,a*(l=n?-1:1),c,s),t()):l<0},fitExtent:function(t,n){return Gi(u,t,n)},fitSize:function(t,n){return Ji(u,t,n)}}};go.invert=ao(gr);var my=function(){return to(go).scale(249.5).clipAngle(90+d_)};yo.invert=ao(function(t){return 2*w_(t)});var xy=function(){return to(yo).scale(250).clipAngle(142)};mo.invert=function(t,n){return[-n,2*w_(S_(t))-__]};var by=function(){var t=so(mo),n=t.center,e=t.rotate;return t.center=function(t){return arguments.length?n([-t[1],t[0]]):(t=n(),[t[1],-t[0]])},t.rotate=function(t){return arguments.length?e([t[0],t[1],t.length>2?t[2]+90:90]):(t=e(),[t[0],t[1],t[2]-90])},e([0,0,90]).scale(159.155)},wy=function(){function t(t){var o,u=0;t.eachAfter(function(t){var e=t.children;e?(t.x=bo(e),t.y=Mo(e)):(t.x=o?u+=n(t,o):0,t.y=0,o=t)});var a=ko(t),c=So(t),s=a.x-n(a,c)/2,f=c.x+n(c,a)/2;return t.eachAfter(i?function(n){n.x=(n.x-t.x)*e,n.y=(t.y-n.y)*r}:function(n){n.x=(n.x-s)/(f-s)*e,n.y=(1-(t.y?n.y/t.y:1))*r})}var n=xo,e=1,r=1,i=!1;return t.separation=function(e){return arguments.length?(n=e,t):n},t.size=function(n){return arguments.length?(i=!1,e=+n[0],r=+n[1],t):i?null:[e,r]},t.nodeSize=function(n){return arguments.length?(i=!0,e=+n[0],r=+n[1],t):i?[e,r]:null},t},My=function(){return this.eachAfter(No)},Ty=function(t){var n,e,r,i,o=this,u=[o];do{for(n=u.reverse(),u=[];o=n.pop();)if(t(o),e=o.children)for(r=0,i=e.length;r<i;++r)u.push(e[r])}while(u.length);return this},ky=function(t){for(var n,e,r=this,i=[r];r=i.pop();)if(t(r),n=r.children)for(e=n.length-1;e>=0;--e)i.push(n[e]);return this},Sy=function(t){for(var n,e,r,i=this,o=[i],u=[];i=o.pop();)if(u.push(i),n=i.children)for(e=0,r=n.length;e<r;++e)o.push(n[e]);for(;i=u.pop();)t(i);return this},Ny=function(t){return this.eachAfter(function(n){for(var e=+t(n.data)||0,r=n.children,i=r&&r.length;--i>=0;)e+=r[i].value;n.value=e})},Ey=function(t){return this.eachBefore(function(n){n.children&&n.children.sort(t)})},Ay=function(t){for(var n=this,e=Eo(n,t),r=[n];n!==e;)n=n.parent,r.push(n);for(var i=r.length;t!==e;)r.splice(i,0,t),t=t.parent;return r},Cy=function(){for(var t=this,n=[t];t=t.parent;)n.push(t);return n},zy=function(){var t=[];return this.each(function(n){t.push(n)}),t},Py=function(){var t=[];return this.eachBefore(function(n){n.children||t.push(n)}),t},Ly=function(){var t=this,n=[];return t.each(function(e){e!==t&&n.push({source:e.parent,target:e})}),n};Ro.prototype=Ao.prototype={constructor:Ro,count:My,each:Ty,eachAfter:Sy,eachBefore:ky,sum:Ny,sort:Ey,path:Ay,ancestors:Cy,descendants:zy,leaves:Py,links:Ly,copy:Co};var Ry=function(t){for(var n=(t=t.slice()).length,e=null,r=e;n;){var i=new qo(t[n-1]);r=r?r.next=i:e=i,t[void 0]=t[--n]}return{head:e,tail:r}},qy=function(t){return Do(Ry(t),[])},Uy=function(t){return Xo(t),t},Dy=function(t){return function(){return t}},Oy=function(){function t(t){return t.x=e/2,t.y=r/2,n?t.eachBefore(Go(n)).eachAfter(Jo(i,.5)).eachBefore(Qo(1)):t.eachBefore(Go(Zo)).eachAfter(Jo(Wo,1)).eachAfter(Jo(i,t.r/Math.min(e,r))).eachBefore(Qo(Math.min(e,r)/(2*t.r))),t}var n=null,e=1,r=1,i=Wo;return t.radius=function(e){return arguments.length?(n=Vo(e),t):n},t.size=function(n){return arguments.length?(e=+n[0],r=+n[1],t):[e,r]},t.padding=function(n){return arguments.length?(i="function"==typeof n?n:Dy(+n),t):i},t},Fy=function(t){t.x0=Math.round(t.x0),t.y0=Math.round(t.y0),t.x1=Math.round(t.x1),t.y1=Math.round(t.y1)},Iy=function(t,n,e,r,i){for(var o,u=t.children,a=-1,c=u.length,s=t.value&&(r-n)/t.value;++a<c;)o=u[a],o.y0=e,o.y1=i,o.x0=n,o.x1=n+=o.value*s},Yy=function(){function t(t){var u=t.height+1;return t.x0=t.y0=i,t.x1=e,t.y1=r/u,t.eachBefore(n(r,u)),o&&t.eachBefore(Fy),t}function n(t,n){return function(e){e.children&&Iy(e,e.x0,t*(e.depth+1)/n,e.x1,t*(e.depth+2)/n);var r=e.x0,o=e.y0,u=e.x1-i,a=e.y1-i;u<r&&(r=u=(r+u)/2),a<o&&(o=a=(o+a)/2),e.x0=r,e.y0=o,e.x1=u,e.y1=a}}var e=1,r=1,i=0,o=!1;return t.round=function(n){return arguments.length?(o=!!n,t):o},t.size=function(n){return arguments.length?(e=+n[0],r=+n[1],t):[e,r]},t.padding=function(n){return arguments.length?(i=+n,t):i},t},By="$",jy={depth:-1},Hy={},Xy=function(){function t(t){var r,i,o,u,a,c,s,f=t.length,l=new Array(f),h={};for(i=0;i<f;++i)r=t[i],a=l[i]=new Ro(r),null!=(c=n(r,i,t))&&(c+="")&&(s=By+(a.id=c),h[s]=s in h?Hy:a);for(i=0;i<f;++i)if(a=l[i],null!=(c=e(t[i],i,t))&&(c+="")){if(!(u=h[By+c]))throw new Error("missing: "+c);if(u===Hy)throw new Error("ambiguous: "+c);u.children?u.children.push(a):u.children=[a],a.parent=u}else{if(o)throw new Error("multiple roots");o=a}if(!o)throw new Error("no root");if(o.parent=jy,o.eachBefore(function(t){t.depth=t.parent.depth+1,--f}).eachBefore(Lo),o.parent=null,f>0)throw new Error("cycle");return o}var n=Ko,e=tu;return t.id=function(e){return arguments.length?(n=$o(e),t):n},t.parentId=function(n){return arguments.length?(e=$o(n),t):e},t};au.prototype=Object.create(Ro.prototype);var Vy=function(){function t(t){var r=cu(t);if(r.eachAfter(n),r.parent.m=-r.z,r.eachBefore(e),c)t.eachBefore(i);else{var s=t,f=t,l=t;t.eachBefore(function(t){t.x<s.x&&(s=t),t.x>f.x&&(f=t),t.depth>l.depth&&(l=t)});var h=s===f?1:o(s,f)/2,p=h-s.x,d=u/(f.x+h+p),v=a/(l.depth||1);t.eachBefore(function(t){t.x=(t.x+p)*d,t.y=t.depth*v})}return t}function n(t){var n=t.children,e=t.parent.children,i=t.i?e[t.i-1]:null;if(n){ou(t);var u=(n[0].z+n[n.length-1].z)/2;i?(t.z=i.z+o(t._,i._),t.m=t.z-u):t.z=u}else i&&(t.z=i.z+o(t._,i._));t.parent.A=r(t,i,t.parent.A||e[0])}function e(t){t._.x=t.z+t.parent.m,t.m+=t.parent.m}function r(t,n,e){if(n){for(var r,i=t,u=t,a=n,c=i.parent.children[0],s=i.m,f=u.m,l=a.m,h=c.m;a=ru(a),i=eu(i),a&&i;)c=eu(c),u=ru(u),u.a=t,r=a.z+l-i.z-s+o(a._,i._),r>0&&(iu(uu(a,t,e),t,r),s+=r,f+=r),l+=a.m,s+=i.m,h+=c.m,f+=u.m;a&&!ru(u)&&(u.t=a,u.m+=l-f),i&&!eu(c)&&(c.t=i,c.m+=s-h,e=t)}return e}function i(t){t.x*=u,t.y=t.depth*a}var o=nu,u=1,a=1,c=null;return t.separation=function(n){return arguments.length?(o=n,t):o},t.size=function(n){return arguments.length?(c=!1,u=+n[0],a=+n[1],t):c?null:[u,a]},t.nodeSize=function(n){return arguments.length?(c=!0,u=+n[0],a=+n[1],t):c?[u,a]:null},t},$y=function(t,n,e,r,i){for(var o,u=t.children,a=-1,c=u.length,s=t.value&&(i-e)/t.value;++a<c;)o=u[a],o.x0=n,o.x1=r,o.y0=e,o.y1=e+=o.value*s},Wy=(1+Math.sqrt(5))/2,Zy=function t(n){function e(t,e,r,i,o){su(n,t,e,r,i,o)}return e.ratio=function(n){return t((n=+n)>1?n:1)},e}(Wy),Gy=function(){function t(t){return t.x0=t.y0=0,t.x1=i,t.y1=o,t.eachBefore(n),u=[0],r&&t.eachBefore(Fy),t}function n(t){var n=u[t.depth],r=t.x0+n,i=t.y0+n,o=t.x1-n,h=t.y1-n;o<r&&(r=o=(r+o)/2),h<i&&(i=h=(i+h)/2),t.x0=r,t.y0=i,t.x1=o,t.y1=h,t.children&&(n=u[t.depth+1]=a(t)/2,r+=l(t)-n,i+=c(t)-n,o-=s(t)-n,h-=f(t)-n,o<r&&(r=o=(r+o)/2),h<i&&(i=h=(i+h)/2),e(t,r,i,o,h))}var e=Zy,r=!1,i=1,o=1,u=[0],a=Wo,c=Wo,s=Wo,f=Wo,l=Wo;return t.round=function(n){return arguments.length?(r=!!n,t):r},t.size=function(n){return arguments.length?(i=+n[0],o=+n[1],t):[i,o]},t.tile=function(n){return arguments.length?(e=$o(n),t):e},t.padding=function(n){return arguments.length?t.paddingInner(n).paddingOuter(n):t.paddingInner()},t.paddingInner=function(n){return arguments.length?(a="function"==typeof n?n:Dy(+n),t):a},t.paddingOuter=function(n){return arguments.length?t.paddingTop(n).paddingRight(n).paddingBottom(n).paddingLeft(n):t.paddingTop()},t.paddingTop=function(n){return arguments.length?(c="function"==typeof n?n:Dy(+n),t):c},t.paddingRight=function(n){return arguments.length?(s="function"==typeof n?n:Dy(+n),t):s},t.paddingBottom=function(n){return arguments.length?(f="function"==typeof n?n:Dy(+n),t):f},t.paddingLeft=function(n){return arguments.length?(l="function"==typeof n?n:Dy(+n),t):l},t},Jy=function(t,n,e,r,i){function o(t,n,e,r,i,u,a){if(t>=n-1){var s=c[t];return s.x0=r,s.y0=i,s.x1=u,s.y1=a,void 0}for(var l=f[t],h=e/2+l,p=t+1,d=n-1;p<d;){var v=p+d>>>1;f[v]<h?p=v+1:d=v}h-f[p-1]<f[p]-h&&t+1<p&&--p;var _=f[p]-l,g=e-_;if(u-r>a-i){var y=(r*g+u*_)/e;o(t,p,_,r,i,y,a),o(p,n,g,y,i,u,a)}else{var m=(i*g+a*_)/e;o(t,p,_,r,i,u,m),o(p,n,g,r,m,u,a)}}var u,a,c=t.children,s=c.length,f=new Array(s+1);for(f[0]=a=u=0;u<s;++u)f[u+1]=a+=c[u].value;o(0,s,t.value,n,e,r,i)},Qy=function(t,n,e,r,i){(1&t.depth?$y:Iy)(t,n,e,r,i)},Ky=function t(n){function e(t,e,r,i,o){if((u=t._squarify)&&u.ratio===n)for(var u,a,c,s,f,l=-1,h=u.length,p=t.value;++l<h;){for(a=u[l],c=a.children,s=a.value=0,f=c.length;s<f;++s)a.value+=c[s].value;a.dice?Iy(a,e,r,i,r+=(o-r)*a.value/p):$y(a,e,r,e+=(i-e)*a.value/p,o),p-=a.value}else t._squarify=u=su(n,t,e,r,i,o),u.ratio=n}return e.ratio=function(n){return t((n=+n)>1?n:1)},e
 }(Wy),tm=function(t){for(var n,e=-1,r=t.length,i=t[r-1],o=0;++e<r;)n=i,i=t[e],o+=n[1]*i[0]-n[0]*i[1];return o/2},nm=function(t){for(var n,e,r=-1,i=t.length,o=0,u=0,a=t[i-1],c=0;++r<i;)n=a,a=t[r],c+=e=n[0]*a[1]-a[0]*n[1],o+=(n[0]+a[0])*e,u+=(n[1]+a[1])*e;return c*=3,[o/c,u/c]},em=function(t,n,e){return(n[0]-t[0])*(e[1]-t[1])-(n[1]-t[1])*(e[0]-t[0])},rm=function(t){if((e=t.length)<3)return null;var n,e,r=new Array(e),i=new Array(e);for(n=0;n<e;++n)r[n]=[+t[n][0],+t[n][1],n];for(r.sort(fu),n=0;n<e;++n)i[n]=[r[n][0],-r[n][1]];var o=lu(r),u=lu(i),a=u[0]===o[0],c=u[u.length-1]===o[o.length-1],s=[];for(n=o.length-1;n>=0;--n)s.push(t[r[o[n]][2]]);for(n=+a;n<u.length-c;++n)s.push(t[r[u[n]][2]]);return s},im=function(t,n){for(var e,r,i=t.length,o=t[i-1],u=n[0],a=n[1],c=o[0],s=o[1],f=!1,l=0;l<i;++l)o=t[l],e=o[0],r=o[1],r>a!=s>a&&u<(c-e)*(a-r)/(s-r)+e&&(f=!f),c=e,s=r;return f},om=function(t){for(var n,e,r=-1,i=t.length,o=t[i-1],u=o[0],a=o[1],c=0;++r<i;)n=u,e=a,o=t[r],u=o[0],a=o[1],n-=u,e-=a,c+=Math.sqrt(n*n+e*e);return c},um=[].slice,am={};hu.prototype=yu.prototype={constructor:hu,defer:function(t){if("function"!=typeof t||this._call)throw new Error;if(null!=this._error)return this;var n=um.call(arguments,1);return n.push(t),++this._waiting,this._tasks.push(n),pu(this),this},abort:function(){return null==this._error&&_u(this,new Error("abort")),this},await:function(t){if("function"!=typeof t||this._call)throw new Error;return this._call=function(n,e){t.apply(null,[n].concat(e))},gu(this),this},awaitAll:function(t){if("function"!=typeof t||this._call)throw new Error;return this._call=t,gu(this),this}};var cm=function(t,n){return t=null==t?0:+t,n=null==n?1:+n,1===arguments.length?(n=t,t=0):n-=t,function(){return Math.random()*n+t}},sm=function(t,n){var e,r;return t=null==t?0:+t,n=null==n?1:+n,function(){var i;if(null!=e)i=e,e=null;else do{e=2*Math.random()-1,i=2*Math.random()-1,r=e*e+i*i}while(!r||r>1);return t+n*i*Math.sqrt(-2*Math.log(r)/r)}},fm=function(){var t=sm.apply(this,arguments);return function(){return Math.exp(t())}},lm=function(t){return function(){for(var n=0,e=0;e<t;++e)n+=Math.random();return n}},hm=function(t){var n=lm(t);return function(){return n()/t}},pm=function(t){return function(){return-Math.log(1-Math.random())/t}},dm=function(t,n){function e(t){var n,e=s.status;if(!e&&xu(s)||e>=200&&e<300||304===e){if(o)try{n=o.call(r,s)}catch(t){return void a.call("error",r,t)}else n=s;a.call("load",r,n)}else a.call("error",r,t)}var r,i,o,u,a=d("beforesend","progress","load","error"),c=Ye(),s=new XMLHttpRequest,f=null,l=null,h=0;if("undefined"==typeof XDomainRequest||"withCredentials"in s||!/^(http(s)?:)?\/\//.test(t)||(s=new XDomainRequest),"onload"in s?s.onload=s.onerror=s.ontimeout=e:s.onreadystatechange=function(t){s.readyState>3&&e(t)},s.onprogress=function(t){a.call("progress",r,t)},r={header:function(t,n){return t=(t+"").toLowerCase(),arguments.length<2?c.get(t):(null==n?c.remove(t):c.set(t,n+""),r)},mimeType:function(t){return arguments.length?(i=null==t?null:t+"",r):i},responseType:function(t){return arguments.length?(u=t,r):u},timeout:function(t){return arguments.length?(h=+t,r):h},user:function(t){return arguments.length<1?f:(f=null==t?null:t+"",r)},password:function(t){return arguments.length<1?l:(l=null==t?null:t+"",r)},response:function(t){return o=t,r},get:function(t,n){return r.send("GET",t,n)},post:function(t,n){return r.send("POST",t,n)},send:function(n,e,o){return s.open(n,t,!0,f,l),null==i||c.has("accept")||c.set("accept",i+",*/*"),s.setRequestHeader&&c.each(function(t,n){s.setRequestHeader(n,t)}),null!=i&&s.overrideMimeType&&s.overrideMimeType(i),null!=u&&(s.responseType=u),h>0&&(s.timeout=h),null==o&&"function"==typeof e&&(o=e,e=null),null!=o&&1===o.length&&(o=mu(o)),null!=o&&r.on("error",o).on("load",function(t){o(null,t)}),a.call("beforesend",r,s),s.send(null==e?null:e),r},abort:function(){return s.abort(),r},on:function(){var t=a.on.apply(a,arguments);return t===a?r:t}},null!=n){if("function"!=typeof n)throw new Error("invalid callback: "+n);return r.get(n)}return r},vm=function(t,n){return function(e,r){var i=dm(e).mimeType(t).response(n);if(null!=r){if("function"!=typeof r)throw new Error("invalid callback: "+r);return i.get(r)}return i}},_m=vm("text/html",function(t){return document.createRange().createContextualFragment(t.responseText)}),gm=vm("application/json",function(t){return JSON.parse(t.responseText)}),ym=vm("text/plain",function(t){return t.responseText}),mm=vm("application/xml",function(t){var n=t.responseXML;if(!n)throw new Error("parse error");return n}),xm=function(t,n){return function(e,r,i){arguments.length<3&&(i=r,r=null);var o=dm(e).mimeType(t);return o.row=function(t){return arguments.length?o.response(bu(n,r=t)):r},o.row(r),i?o.get(i):o}},bm=xm("text/csv",Od),wm=xm("text/tab-separated-values",jd),Mm=Array.prototype,Tm=Mm.map,km=Mm.slice,Sm={name:"implicit"},Nm=function(t){return function(){return t}},Em=function(t){return+t},Am=[0,1],Cm=function(n,e,i){var o,u=n[0],a=n[n.length-1],c=r(u,a,null==e?10:e);switch(i=lr(null==i?",f":i),i.type){case"s":var s=Math.max(Math.abs(u),Math.abs(a));return null!=i.precision||isNaN(o=Lv(c,s))||(i.precision=o),t.formatPrefix(i,s);case"":case"e":case"g":case"p":case"r":null!=i.precision||isNaN(o=Rv(c,Math.max(Math.abs(u),Math.abs(a))))||(i.precision=o-("e"===i.type));break;case"f":case"%":null!=i.precision||isNaN(o=Pv(c))||(i.precision=o-2*("%"===i.type))}return t.format(i)},zm=function(t,n){t=t.slice();var e,r=0,i=t.length-1,o=t[r],u=t[i];return u<o&&(e=r,r=i,i=e,e=o,o=u,u=e),t[r]=n.floor(o),t[i]=n.ceil(u),t},Pm=new Date,Lm=new Date,Rm=Zu(function(){},function(t,n){t.setTime(+t+n)},function(t,n){return n-t});Rm.every=function(t){return t=Math.floor(t),isFinite(t)&&t>0?t>1?Zu(function(n){n.setTime(Math.floor(n/t)*t)},function(n,e){n.setTime(+n+e*t)},function(n,e){return(e-n)/t}):Rm:null};var qm=Rm.range,Um=6e4,Dm=6048e5,Om=Zu(function(t){t.setTime(1e3*Math.floor(t/1e3))},function(t,n){t.setTime(+t+1e3*n)},function(t,n){return(n-t)/1e3},function(t){return t.getUTCSeconds()}),Fm=Om.range,Im=Zu(function(t){t.setTime(Math.floor(t/Um)*Um)},function(t,n){t.setTime(+t+n*Um)},function(t,n){return(n-t)/Um},function(t){return t.getMinutes()}),Ym=Im.range,Bm=Zu(function(t){var n=t.getTimezoneOffset()*Um%36e5;n<0&&(n+=36e5),t.setTime(36e5*Math.floor((+t-n)/36e5)+n)},function(t,n){t.setTime(+t+36e5*n)},function(t,n){return(n-t)/36e5},function(t){return t.getHours()}),jm=Bm.range,Hm=Zu(function(t){t.setHours(0,0,0,0)},function(t,n){t.setDate(t.getDate()+n)},function(t,n){return(n-t-(n.getTimezoneOffset()-t.getTimezoneOffset())*Um)/864e5},function(t){return t.getDate()-1}),Xm=Hm.range,Vm=Gu(0),$m=Gu(1),Wm=Gu(2),Zm=Gu(3),Gm=Gu(4),Jm=Gu(5),Qm=Gu(6),Km=Vm.range,tx=$m.range,nx=Wm.range,ex=Zm.range,rx=Gm.range,ix=Jm.range,ox=Qm.range,ux=Zu(function(t){t.setDate(1),t.setHours(0,0,0,0)},function(t,n){t.setMonth(t.getMonth()+n)},function(t,n){return n.getMonth()-t.getMonth()+12*(n.getFullYear()-t.getFullYear())},function(t){return t.getMonth()}),ax=ux.range,cx=Zu(function(t){t.setMonth(0,1),t.setHours(0,0,0,0)},function(t,n){t.setFullYear(t.getFullYear()+n)},function(t,n){return n.getFullYear()-t.getFullYear()},function(t){return t.getFullYear()});cx.every=function(t){return isFinite(t=Math.floor(t))&&t>0?Zu(function(n){n.setFullYear(Math.floor(n.getFullYear()/t)*t),n.setMonth(0,1),n.setHours(0,0,0,0)},function(n,e){n.setFullYear(n.getFullYear()+e*t)}):null};var sx=cx.range,fx=Zu(function(t){t.setUTCSeconds(0,0)},function(t,n){t.setTime(+t+n*Um)},function(t,n){return(n-t)/Um},function(t){return t.getUTCMinutes()}),lx=fx.range,hx=Zu(function(t){t.setUTCMinutes(0,0,0)},function(t,n){t.setTime(+t+36e5*n)},function(t,n){return(n-t)/36e5},function(t){return t.getUTCHours()}),px=hx.range,dx=Zu(function(t){t.setUTCHours(0,0,0,0)},function(t,n){t.setUTCDate(t.getUTCDate()+n)},function(t,n){return(n-t)/864e5},function(t){return t.getUTCDate()-1}),vx=dx.range,_x=Ju(0),gx=Ju(1),yx=Ju(2),mx=Ju(3),xx=Ju(4),bx=Ju(5),wx=Ju(6),Mx=_x.range,Tx=gx.range,kx=yx.range,Sx=mx.range,Nx=xx.range,Ex=bx.range,Ax=wx.range,Cx=Zu(function(t){t.setUTCDate(1),t.setUTCHours(0,0,0,0)},function(t,n){t.setUTCMonth(t.getUTCMonth()+n)},function(t,n){return n.getUTCMonth()-t.getUTCMonth()+12*(n.getUTCFullYear()-t.getUTCFullYear())},function(t){return t.getUTCMonth()}),zx=Cx.range,Px=Zu(function(t){t.setUTCMonth(0,1),t.setUTCHours(0,0,0,0)},function(t,n){t.setUTCFullYear(t.getUTCFullYear()+n)},function(t,n){return n.getUTCFullYear()-t.getUTCFullYear()},function(t){return t.getUTCFullYear()});Px.every=function(t){return isFinite(t=Math.floor(t))&&t>0?Zu(function(n){n.setUTCFullYear(Math.floor(n.getUTCFullYear()/t)*t),n.setUTCMonth(0,1),n.setUTCHours(0,0,0,0)},function(n,e){n.setUTCFullYear(n.getUTCFullYear()+e*t)}):null};var Lx,Rx=Px.range,qx={"-":"",_:" ",0:"0"},Ux=/^\s*\d+/,Dx=/^%/,Ox=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;Za({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});var Fx=Date.prototype.toISOString?Ga:t.utcFormat("%Y-%m-%dT%H:%M:%S.%LZ"),Ix=+new Date("2000-01-01T00:00:00.000Z")?Ja:t.utcParse("%Y-%m-%dT%H:%M:%S.%LZ"),Yx=1e3,Bx=60*Yx,jx=60*Bx,Hx=24*jx,Xx=7*Hx,Vx=30*Hx,$x=365*Hx,Wx=function(){return tc(cx,ux,Vm,Hm,Bm,Im,Om,Rm,t.timeFormat).domain([new Date(2e3,0,1),new Date(2e3,0,2)])},Zx=function(){return tc(Px,Cx,_x,dx,hx,fx,Om,Rm,t.utcFormat).domain([Date.UTC(2e3,0,1),Date.UTC(2e3,0,2)])},Gx=function(t){return t.match(/.{6}/g).map(function(t){return"#"+t})},Jx=Gx("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf"),Qx=Gx("393b795254a36b6ecf9c9ede6379398ca252b5cf6bcedb9c8c6d31bd9e39e7ba52e7cb94843c39ad494ad6616be7969c7b4173a55194ce6dbdde9ed6"),Kx=Gx("3182bd6baed69ecae1c6dbefe6550dfd8d3cfdae6bfdd0a231a35474c476a1d99bc7e9c0756bb19e9ac8bcbddcdadaeb636363969696bdbdbdd9d9d9"),tb=Gx("1f77b4aec7e8ff7f0effbb782ca02c98df8ad62728ff98969467bdc5b0d58c564bc49c94e377c2f7b6d27f7f7fc7c7c7bcbd22dbdb8d17becf9edae5"),nb=Oh(Vt(300,.5,0),Vt(-240,.5,1)),eb=Oh(Vt(-100,.75,.35),Vt(80,1.5,.8)),rb=Oh(Vt(260,.75,.35),Vt(80,1.5,.8)),ib=Vt(),ob=function(t){(t<0||t>1)&&(t-=Math.floor(t));var n=Math.abs(t-.5);return ib.h=360*t-100,ib.s=1.5-1.5*n,ib.l=.8-.9*n,ib+""},ub=nc(Gx("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725")),ab=nc(Gx("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf")),cb=nc(Gx("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4")),sb=nc(Gx("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921")),fb=function(t){return function(){return t}},lb=Math.abs,hb=Math.atan2,pb=Math.cos,db=Math.max,vb=Math.min,_b=Math.sin,gb=Math.sqrt,yb=1e-12,mb=Math.PI,xb=mb/2,bb=2*mb,wb=function(){function t(){var t,s,f=+n.apply(this,arguments),l=+e.apply(this,arguments),h=o.apply(this,arguments)-xb,p=u.apply(this,arguments)-xb,d=lb(p-h),v=p>h;if(c||(c=t=Re()),l<f&&(s=l,l=f,f=s),l>yb)if(d>bb-yb)c.moveTo(l*pb(h),l*_b(h)),c.arc(0,0,l,h,p,!v),f>yb&&(c.moveTo(f*pb(p),f*_b(p)),c.arc(0,0,f,p,h,v));else{var _,g,y=h,m=p,x=h,b=p,w=d,M=d,T=a.apply(this,arguments)/2,k=T>yb&&(i?+i.apply(this,arguments):gb(f*f+l*l)),S=vb(lb(l-f)/2,+r.apply(this,arguments)),N=S,E=S;if(k>yb){var A=ic(k/f*_b(T)),C=ic(k/l*_b(T));(w-=2*A)>yb?(A*=v?1:-1,x+=A,b-=A):(w=0,x=b=(h+p)/2),(M-=2*C)>yb?(C*=v?1:-1,y+=C,m-=C):(M=0,y=m=(h+p)/2)}var z=l*pb(y),P=l*_b(y),L=f*pb(b),R=f*_b(b);if(S>yb){var q=l*pb(m),U=l*_b(m),D=f*pb(x),O=f*_b(x);if(d<mb){var F=w>yb?fc(z,P,D,O,q,U,L,R):[L,R],I=z-F[0],Y=P-F[1],B=q-F[0],j=U-F[1],H=1/_b(rc((I*B+Y*j)/(gb(I*I+Y*Y)*gb(B*B+j*j)))/2),X=gb(F[0]*F[0]+F[1]*F[1]);N=vb(S,(f-X)/(H-1)),E=vb(S,(l-X)/(H+1))}}M>yb?E>yb?(_=lc(D,O,z,P,l,E,v),g=lc(q,U,L,R,l,E,v),c.moveTo(_.cx+_.x01,_.cy+_.y01),E<S?c.arc(_.cx,_.cy,E,hb(_.y01,_.x01),hb(g.y01,g.x01),!v):(c.arc(_.cx,_.cy,E,hb(_.y01,_.x01),hb(_.y11,_.x11),!v),c.arc(0,0,l,hb(_.cy+_.y11,_.cx+_.x11),hb(g.cy+g.y11,g.cx+g.x11),!v),c.arc(g.cx,g.cy,E,hb(g.y11,g.x11),hb(g.y01,g.x01),!v))):(c.moveTo(z,P),c.arc(0,0,l,y,m,!v)):c.moveTo(z,P),f>yb&&w>yb?N>yb?(_=lc(L,R,q,U,f,-N,v),g=lc(z,P,D,O,f,-N,v),c.lineTo(_.cx+_.x01,_.cy+_.y01),N<S?c.arc(_.cx,_.cy,N,hb(_.y01,_.x01),hb(g.y01,g.x01),!v):(c.arc(_.cx,_.cy,N,hb(_.y01,_.x01),hb(_.y11,_.x11),!v),c.arc(0,0,f,hb(_.cy+_.y11,_.cx+_.x11),hb(g.cy+g.y11,g.cx+g.x11),v),c.arc(g.cx,g.cy,N,hb(g.y11,g.x11),hb(g.y01,g.x01),!v))):c.arc(0,0,f,b,x,v):c.lineTo(L,R)}else c.moveTo(0,0);if(c.closePath(),t)return c=null,t+""||null}var n=oc,e=uc,r=fb(0),i=null,o=ac,u=cc,a=sc,c=null;return t.centroid=function(){var t=(+n.apply(this,arguments)+ +e.apply(this,arguments))/2,r=(+o.apply(this,arguments)+ +u.apply(this,arguments))/2-mb/2;return[pb(r)*t,_b(r)*t]},t.innerRadius=function(e){return arguments.length?(n="function"==typeof e?e:fb(+e),t):n},t.outerRadius=function(n){return arguments.length?(e="function"==typeof n?n:fb(+n),t):e},t.cornerRadius=function(n){return arguments.length?(r="function"==typeof n?n:fb(+n),t):r},t.padRadius=function(n){return arguments.length?(i=null==n?null:"function"==typeof n?n:fb(+n),t):i},t.startAngle=function(n){return arguments.length?(o="function"==typeof n?n:fb(+n),t):o},t.endAngle=function(n){return arguments.length?(u="function"==typeof n?n:fb(+n),t):u},t.padAngle=function(n){return arguments.length?(a="function"==typeof n?n:fb(+n),t):a},t.context=function(n){return arguments.length?(c=null==n?null:n,t):c},t};hc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:this._context.lineTo(t,n)}}};var Mb=function(t){return new hc(t)},Tb=function(){function t(t){var a,c,s,f=t.length,l=!1;for(null==i&&(u=o(s=Re())),a=0;a<=f;++a)!(a<f&&r(c=t[a],a,t))===l&&((l=!l)?u.lineStart():u.lineEnd()),l&&u.point(+n(c,a,t),+e(c,a,t));if(s)return u=null,s+""||null}var n=pc,e=dc,r=fb(!0),i=null,o=Mb,u=null;return t.x=function(e){return arguments.length?(n="function"==typeof e?e:fb(+e),t):n},t.y=function(n){return arguments.length?(e="function"==typeof n?n:fb(+n),t):e},t.defined=function(n){return arguments.length?(r="function"==typeof n?n:fb(!!n),t):r},t.curve=function(n){return arguments.length?(o=n,null!=i&&(u=o(i)),t):o},t.context=function(n){return arguments.length?(null==n?i=u=null:u=o(i=n),t):i},t},kb=function(){function t(t){var n,f,l,h,p,d=t.length,v=!1,_=new Array(d),g=new Array(d);for(null==a&&(s=c(p=Re())),n=0;n<=d;++n){if(!(n<d&&u(h=t[n],n,t))===v)if(v=!v)f=n,s.areaStart(),s.lineStart();else{for(s.lineEnd(),s.lineStart(),l=n-1;l>=f;--l)s.point(_[l],g[l]);s.lineEnd(),s.areaEnd()}v&&(_[n]=+e(h,n,t),g[n]=+i(h,n,t),s.point(r?+r(h,n,t):_[n],o?+o(h,n,t):g[n]))}if(p)return s=null,p+""||null}function n(){return Tb().defined(u).curve(c).context(a)}var e=pc,r=null,i=fb(0),o=dc,u=fb(!0),a=null,c=Mb,s=null;return t.x=function(n){return arguments.length?(e="function"==typeof n?n:fb(+n),r=null,t):e},t.x0=function(n){return arguments.length?(e="function"==typeof n?n:fb(+n),t):e},t.x1=function(n){return arguments.length?(r=null==n?null:"function"==typeof n?n:fb(+n),t):r},t.y=function(n){return arguments.length?(i="function"==typeof n?n:fb(+n),o=null,t):i},t.y0=function(n){return arguments.length?(i="function"==typeof n?n:fb(+n),t):i},t.y1=function(n){return arguments.length?(o=null==n?null:"function"==typeof n?n:fb(+n),t):o},t.lineX0=t.lineY0=function(){return n().x(e).y(i)},t.lineY1=function(){return n().x(e).y(o)},t.lineX1=function(){return n().x(r).y(i)},t.defined=function(n){return arguments.length?(u="function"==typeof n?n:fb(!!n),t):u},t.curve=function(n){return arguments.length?(c=n,null!=a&&(s=c(a)),t):c},t.context=function(n){return arguments.length?(null==n?a=s=null:s=c(a=n),t):a},t},Sb=function(t,n){return n<t?-1:n>t?1:n>=t?0:NaN},Nb=function(t){return t},Eb=function(){function t(t){var a,c,s,f,l,h=t.length,p=0,d=new Array(h),v=new Array(h),_=+i.apply(this,arguments),g=Math.min(bb,Math.max(-bb,o.apply(this,arguments)-_)),y=Math.min(Math.abs(g)/h,u.apply(this,arguments)),m=y*(g<0?-1:1);for(a=0;a<h;++a)(l=v[d[a]=a]=+n(t[a],a,t))>0&&(p+=l);for(null!=e?d.sort(function(t,n){return e(v[t],v[n])}):null!=r&&d.sort(function(n,e){return r(t[n],t[e])}),a=0,s=p?(g-h*m)/p:0;a<h;++a,_=f)c=d[a],l=v[c],f=_+(l>0?l*s:0)+m,v[c]={data:t[c],index:a,value:l,startAngle:_,endAngle:f,padAngle:y};return v}var n=Nb,e=Sb,r=null,i=fb(0),o=fb(bb),u=fb(0);return t.value=function(e){return arguments.length?(n="function"==typeof e?e:fb(+e),t):n},t.sortValues=function(n){return arguments.length?(e=n,r=null,t):e},t.sort=function(n){return arguments.length?(r=n,e=null,t):r},t.startAngle=function(n){return arguments.length?(i="function"==typeof n?n:fb(+n),t):i},t.endAngle=function(n){return arguments.length?(o="function"==typeof n?n:fb(+n),t):o},t.padAngle=function(n){return arguments.length?(u="function"==typeof n?n:fb(+n),t):u},t},Ab=_c(Mb);vc.prototype={areaStart:function(){this._curve.areaStart()},areaEnd:function(){this._curve.areaEnd()},lineStart:function(){this._curve.lineStart()},lineEnd:function(){this._curve.lineEnd()},point:function(t,n){this._curve.point(n*Math.sin(t),n*-Math.cos(t))}};var Cb=function(){return gc(Tb().curve(Ab))},zb=function(){var t=kb().curve(Ab),n=t.curve,e=t.lineX0,r=t.lineX1,i=t.lineY0,o=t.lineY1;return t.angle=t.x,delete t.x,t.startAngle=t.x0,delete t.x0,t.endAngle=t.x1,delete t.x1,t.radius=t.y,delete t.y,t.innerRadius=t.y0,delete t.y0,t.outerRadius=t.y1,delete t.y1,t.lineStartAngle=function(){return gc(e())},delete t.lineX0,t.lineEndAngle=function(){return gc(r())},delete t.lineX1,t.lineInnerRadius=function(){return gc(i())},delete t.lineY0,t.lineOuterRadius=function(){return gc(o())},delete t.lineY1,t.curve=function(t){return arguments.length?n(_c(t)):n()._curve},t},Pb={draw:function(t,n){var e=Math.sqrt(n/mb);t.moveTo(e,0),t.arc(0,0,e,0,bb)}},Lb={draw:function(t,n){var e=Math.sqrt(n/5)/2;t.moveTo(-3*e,-e),t.lineTo(-e,-e),t.lineTo(-e,-3*e),t.lineTo(e,-3*e),t.lineTo(e,-e),t.lineTo(3*e,-e),t.lineTo(3*e,e),t.lineTo(e,e),t.lineTo(e,3*e),t.lineTo(-e,3*e),t.lineTo(-e,e),t.lineTo(-3*e,e),t.closePath()}},Rb=Math.sqrt(1/3),qb=2*Rb,Ub={draw:function(t,n){var e=Math.sqrt(n/qb),r=e*Rb;t.moveTo(0,-e),t.lineTo(r,0),t.lineTo(0,e),t.lineTo(-r,0),t.closePath()}},Db=Math.sin(mb/10)/Math.sin(7*mb/10),Ob=Math.sin(bb/10)*Db,Fb=-Math.cos(bb/10)*Db,Ib={draw:function(t,n){var e=Math.sqrt(.8908130915292852*n),r=Ob*e,i=Fb*e;t.moveTo(0,-e),t.lineTo(r,i);for(var o=1;o<5;++o){var u=bb*o/5,a=Math.cos(u),c=Math.sin(u);t.lineTo(c*e,-a*e),t.lineTo(a*r-c*i,c*r+a*i)}t.closePath()}},Yb={draw:function(t,n){var e=Math.sqrt(n),r=-e/2;t.rect(r,r,e,e)}},Bb=Math.sqrt(3),jb={draw:function(t,n){var e=-Math.sqrt(n/(3*Bb));t.moveTo(0,2*e),t.lineTo(-Bb*e,-e),t.lineTo(Bb*e,-e),t.closePath()}},Hb=-.5,Xb=Math.sqrt(3)/2,Vb=1/Math.sqrt(12),$b=3*(Vb/2+1),Wb={draw:function(t,n){var e=Math.sqrt(n/$b),r=e/2,i=e*Vb,o=r,u=e*Vb+e,a=-o,c=u;t.moveTo(r,i),t.lineTo(o,u),t.lineTo(a,c),t.lineTo(Hb*r-Xb*i,Xb*r+Hb*i),t.lineTo(Hb*o-Xb*u,Xb*o+Hb*u),t.lineTo(Hb*a-Xb*c,Xb*a+Hb*c),t.lineTo(Hb*r+Xb*i,Hb*i-Xb*r),t.lineTo(Hb*o+Xb*u,Hb*u-Xb*o),t.lineTo(Hb*a+Xb*c,Hb*c-Xb*a),t.closePath()}},Zb=[Pb,Lb,Ub,Yb,Ib,jb,Wb],Gb=function(){function t(){var t;if(r||(r=t=Re()),n.apply(this,arguments).draw(r,+e.apply(this,arguments)),t)return r=null,t+""||null}var n=fb(Pb),e=fb(64),r=null;return t.type=function(e){return arguments.length?(n="function"==typeof e?e:fb(e),t):n},t.size=function(n){return arguments.length?(e="function"==typeof n?n:fb(+n),t):e},t.context=function(n){return arguments.length?(r=null==n?null:n,t):r},t},Jb=function(){};mc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){switch(this._point){case 3:yc(this,this._x1,this._y1);case 2:this._context.lineTo(this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3,this._context.lineTo((5*this._x0+this._x1)/6,(5*this._y0+this._y1)/6);default:yc(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}};var Qb=function(t){return new mc(t)};xc.prototype={areaStart:Jb,areaEnd:Jb,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._y0=this._y1=this._y2=this._y3=this._y4=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x2,this._y2),this._context.closePath();break;case 2:this._context.moveTo((this._x2+2*this._x3)/3,(this._y2+2*this._y3)/3),this._context.lineTo((this._x3+2*this._x2)/3,(this._y3+2*this._y2)/3),this._context.closePath();break;case 3:this.point(this._x2,this._y2),this.point(this._x3,this._y3),this.point(this._x4,this._y4)}},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._x2=t,this._y2=n;break;case 1:this._point=2,this._x3=t,this._y3=n;break;case 2:this._point=3,this._x4=t,this._y4=n,this._context.moveTo((this._x0+4*this._x1+t)/6,(this._y0+4*this._y1+n)/6);break;default:yc(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}};var Kb=function(t){return new xc(t)};bc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3;var e=(this._x0+4*this._x1+t)/6,r=(this._y0+4*this._y1+n)/6;this._line?this._context.lineTo(e,r):this._context.moveTo(e,r);break;case 3:this._point=4;default:yc(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}};var tw=function(t){return new bc(t)};wc.prototype={lineStart:function(){this._x=[],this._y=[],this._basis.lineStart()},lineEnd:function(){var t=this._x,n=this._y,e=t.length-1;if(e>0)for(var r,i=t[0],o=n[0],u=t[e]-i,a=n[e]-o,c=-1;++c<=e;)r=c/e,this._basis.point(this._beta*t[c]+(1-this._beta)*(i+r*u),this._beta*n[c]+(1-this._beta)*(o+r*a));this._x=this._y=null,this._basis.lineEnd()},point:function(t,n){this._x.push(+t),this._y.push(+n)}};var nw=function t(n){function e(t){return 1===n?new mc(t):new wc(t,n)}return e.beta=function(n){return t(+n)},e}(.85);Tc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:Mc(this,this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2,this._x1=t,this._y1=n;break;case 2:this._point=3;default:Mc(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var ew=function t(n){function e(t){return new Tc(t,n)}return e.tension=function(n){return t(+n)},e}(0);kc.prototype={areaStart:Jb,areaEnd:Jb,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath();break;case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._x3=t,this._y3=n;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3,this._x5=t,this._y5=n;break;default:Mc(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var rw=function t(n){function e(t){return new kc(t,n)}return e.tension=function(n){return t(+n)},e}(0);Sc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Mc(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var iw=function t(n){function e(t){return new Sc(t,n)}return e.tension=function(n){return t(+n)},e}(0);Ec.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:this.point(this._x2,this._y2)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:
-this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3;default:Nc(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var ow=function t(n){function e(t){return n?new Ec(t,n):new Tc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);Ac.prototype={areaStart:Jb,areaEnd:Jb,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath();break;case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._x3=t,this._y3=n;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3,this._x5=t,this._y5=n;break;default:Nc(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var uw=function t(n){function e(t){return n?new Ac(t,n):new kc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);Cc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Nc(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var aw=function t(n){function e(t){return n?new Cc(t,n):new Sc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);zc.prototype={areaStart:Jb,areaEnd:Jb,lineStart:function(){this._point=0},lineEnd:function(){this._point&&this._context.closePath()},point:function(t,n){t=+t,n=+n,this._point?this._context.lineTo(t,n):(this._point=1,this._context.moveTo(t,n))}};var cw=function(t){return new zc(t)};Uc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1);break;case 3:qc(this,this._t0,Rc(this,this._t0))}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){var e=NaN;if(t=+t,n=+n,t!==this._x1||n!==this._y1){switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3,qc(this,Rc(this,e=Lc(this,t,n)),e);break;default:qc(this,this._t0,e=Lc(this,t,n))}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n,this._t0=e}}},(Dc.prototype=Object.create(Uc.prototype)).point=function(t,n){Uc.prototype.point.call(this,n,t)},Oc.prototype={moveTo:function(t,n){this._context.moveTo(n,t)},closePath:function(){this._context.closePath()},lineTo:function(t,n){this._context.lineTo(n,t)},bezierCurveTo:function(t,n,e,r,i,o){this._context.bezierCurveTo(n,t,r,e,o,i)}},Yc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=[],this._y=[]},lineEnd:function(){var t=this._x,n=this._y,e=t.length;if(e)if(this._line?this._context.lineTo(t[0],n[0]):this._context.moveTo(t[0],n[0]),2===e)this._context.lineTo(t[1],n[1]);else for(var r=Bc(t),i=Bc(n),o=0,u=1;u<e;++o,++u)this._context.bezierCurveTo(r[0][o],i[0][o],r[1][o],i[1][o],t[u],n[u]);(this._line||0!==this._line&&1===e)&&this._context.closePath(),this._line=1-this._line,this._x=this._y=null},point:function(t,n){this._x.push(+t),this._y.push(+n)}};var sw=function(t){return new Yc(t)};jc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=this._y=NaN,this._point=0},lineEnd:function(){0<this._t&&this._t<1&&2===this._point&&this._context.lineTo(this._x,this._y),(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:if(this._t<=0)this._context.lineTo(this._x,n),this._context.lineTo(t,n);else{var e=this._x*(1-this._t)+t*this._t;this._context.lineTo(e,this._y),this._context.lineTo(e,n)}}this._x=t,this._y=n}};var fw=function(t){return new jc(t,.5)},lw=Array.prototype.slice,hw=function(t,n){if((r=t.length)>1)for(var e,r,i=1,o=t[n[0]],u=o.length;i<r;++i){e=o,o=t[n[i]];for(var a=0;a<u;++a)o[a][1]+=o[a][0]=isNaN(e[a][1])?e[a][0]:e[a][1]}},pw=function(t){for(var n=t.length,e=new Array(n);--n>=0;)e[n]=n;return e},dw=function(){function t(t){var o,u,a=n.apply(this,arguments),c=t.length,s=a.length,f=new Array(s);for(o=0;o<s;++o){for(var l,h=a[o],p=f[o]=new Array(c),d=0;d<c;++d)p[d]=l=[0,+i(t[d],h,d,t)],l.data=t[d];p.key=h}for(o=0,u=e(f);o<s;++o)f[u[o]].index=o;return r(f,u),f}var n=fb([]),e=pw,r=hw,i=Vc;return t.keys=function(e){return arguments.length?(n="function"==typeof e?e:fb(lw.call(e)),t):n},t.value=function(n){return arguments.length?(i="function"==typeof n?n:fb(+n),t):i},t.order=function(n){return arguments.length?(e=null==n?pw:"function"==typeof n?n:fb(lw.call(n)),t):e},t.offset=function(n){return arguments.length?(r=null==n?hw:n,t):r},t},vw=function(t,n){if((r=t.length)>0){for(var e,r,i,o=0,u=t[0].length;o<u;++o){for(i=e=0;e<r;++e)i+=t[e][o][1]||0;if(i)for(e=0;e<r;++e)t[e][o][1]/=i}hw(t,n)}},_w=function(t,n){if((e=t.length)>0){for(var e,r=0,i=t[n[0]],o=i.length;r<o;++r){for(var u=0,a=0;u<e;++u)a+=t[u][r][1]||0;i[r][1]+=i[r][0]=-a/2}hw(t,n)}},gw=function(t,n){if((i=t.length)>0&&(r=(e=t[n[0]]).length)>0){for(var e,r,i,o=0,u=1;u<r;++u){for(var a=0,c=0,s=0;a<i;++a){for(var f=t[n[a]],l=f[u][1]||0,h=f[u-1][1]||0,p=(l-h)/2,d=0;d<a;++d){var v=t[n[d]];p+=(v[u][1]||0)-(v[u-1][1]||0)}c+=l,s+=p*l}e[u-1][1]+=e[u-1][0]=o,c&&(o-=s/c)}e[u-1][1]+=e[u-1][0]=o,hw(t,n)}},yw=function(t){var n=t.map($c);return pw(t).sort(function(t,e){return n[t]-n[e]})},mw=function(t){return yw(t).reverse()},xw=function(t){var n,e,r=t.length,i=t.map($c),o=pw(t).sort(function(t,n){return i[n]-i[t]}),u=0,a=0,c=[],s=[];for(n=0;n<r;++n)e=o[n],u<a?(u+=i[e],c.push(e)):(a+=i[e],s.push(e));return s.reverse().concat(c)},bw=function(t){return pw(t).reverse()},ww=function(t){return function(){return t}};Gc.prototype={constructor:Gc,insert:function(t,n){var e,r,i;if(t){if(n.P=t,n.N=t.N,t.N&&(t.N.P=n),t.N=n,t.R){for(t=t.R;t.L;)t=t.L;t.L=n}else t.R=n;e=t}else this._?(t=ts(this._),n.P=null,n.N=t,t.P=t.L=n,e=t):(n.P=n.N=null,this._=n,e=null);for(n.L=n.R=null,n.U=e,n.C=!0,t=n;e&&e.C;)r=e.U,e===r.L?(i=r.R,i&&i.C?(e.C=i.C=!1,r.C=!0,t=r):(t===e.R&&(Qc(this,e),t=e,e=t.U),e.C=!1,r.C=!0,Kc(this,r))):(i=r.L,i&&i.C?(e.C=i.C=!1,r.C=!0,t=r):(t===e.L&&(Kc(this,e),t=e,e=t.U),e.C=!1,r.C=!0,Qc(this,r))),e=t.U;this._.C=!1},remove:function(t){t.N&&(t.N.P=t.P),t.P&&(t.P.N=t.N),t.N=t.P=null;var n,e,r,i=t.U,o=t.L,u=t.R;if(e=o?u?ts(u):o:u,i?i.L===t?i.L=e:i.R=e:this._=e,o&&u?(r=e.C,e.C=t.C,e.L=o,o.U=e,e!==u?(i=e.U,e.U=t.U,t=e.R,i.L=t,e.R=u,u.U=e):(e.U=i,i=e,t=e.R)):(r=t.C,t=e),t&&(t.U=i),!r){if(t&&t.C)return void(t.C=!1);do{if(t===this._)break;if(t===i.L){if(n=i.R,n.C&&(n.C=!1,i.C=!0,Qc(this,i),n=i.R),n.L&&n.L.C||n.R&&n.R.C){n.R&&n.R.C||(n.L.C=!1,n.C=!0,Kc(this,n),n=i.R),n.C=i.C,i.C=n.R.C=!1,Qc(this,i),t=this._;break}}else if(n=i.L,n.C&&(n.C=!1,i.C=!0,Kc(this,i),n=i.L),n.L&&n.L.C||n.R&&n.R.C){n.L&&n.L.C||(n.R.C=!1,n.C=!0,Qc(this,n),n=i.L),n.C=i.C,i.C=n.L.C=!1,Kc(this,i),t=this._;break}n.C=!0,t=i,i=i.U}while(!t.C);t&&(t.C=!1)}}};var Mw,Tw,kw,Sw,Nw,Ew=[],Aw=[],Cw=1e-6,zw=1e-12;ks.prototype={constructor:ks,polygons:function(){var t=this.edges;return this.cells.map(function(n){var e=n.halfedges.map(function(e){return ss(n,t[e])});return e.data=n.site.data,e})},triangles:function(){var t=[],n=this.edges;return this.cells.forEach(function(e,r){if(o=(i=e.halfedges).length)for(var i,o,u,a=e.site,c=-1,s=n[i[o-1]],f=s.left===a?s.right:s.left;++c<o;)u=f,s=n[i[c]],f=s.left===a?s.right:s.left,u&&f&&r<u.index&&r<f.index&&Ms(a,u,f)<0&&t.push([a.data,u.data,f.data])}),t},links:function(){return this.edges.filter(function(t){return t.right}).map(function(t){return{source:t.left.data,target:t.right.data}})},find:function(t,n,e){for(var r,i,o=this,u=o._found||0,a=o.cells.length;!(i=o.cells[u]);)if(++u>=a)return null;var c=t-i.site[0],s=n-i.site[1],f=c*c+s*s;do{i=o.cells[r=u],u=null,i.halfedges.forEach(function(e){var r=o.edges[e],a=r.left;if(a!==i.site&&a||(a=r.right)){var c=t-a[0],s=n-a[1],l=c*c+s*s;l<f&&(f=l,u=a.index)}})}while(null!==u);return o._found=r,null==e||f<=e*e?i.site:null}};var Pw=function(){function t(t){return new ks(t.map(function(r,i){var o=[Math.round(n(r,i,t)/Cw)*Cw,Math.round(e(r,i,t)/Cw)*Cw];return o.index=i,o.data=r,o}),r)}var n=Wc,e=Zc,r=null;return t.polygons=function(n){return t(n).polygons()},t.links=function(n){return t(n).links()},t.triangles=function(n){return t(n).triangles()},t.x=function(e){return arguments.length?(n="function"==typeof e?e:ww(+e),t):n},t.y=function(n){return arguments.length?(e="function"==typeof n?n:ww(+n),t):e},t.extent=function(n){return arguments.length?(r=null==n?null:[[+n[0][0],+n[0][1]],[+n[1][0],+n[1][1]]],t):r&&[[r[0][0],r[0][1]],[r[1][0],r[1][1]]]},t.size=function(n){return arguments.length?(r=null==n?null:[[0,0],[+n[0],+n[1]]],t):r&&[r[1][0]-r[0][0],r[1][1]-r[0][1]]},t},Lw=function(t){return function(){return t}};Ns.prototype={constructor:Ns,scale:function(t){return 1===t?this:new Ns(this.k*t,this.x,this.y)},translate:function(t,n){return 0===t&0===n?this:new Ns(this.k,this.x+this.k*t,this.y+this.k*n)},apply:function(t){return[t[0]*this.k+this.x,t[1]*this.k+this.y]},applyX:function(t){return t*this.k+this.x},applyY:function(t){return t*this.k+this.y},invert:function(t){return[(t[0]-this.x)/this.k,(t[1]-this.y)/this.k]},invertX:function(t){return(t-this.x)/this.k},invertY:function(t){return(t-this.y)/this.k},rescaleX:function(t){return t.copy().domain(t.range().map(this.invertX,this).map(t.invert,t))},rescaleY:function(t){return t.copy().domain(t.range().map(this.invertY,this).map(t.invert,t))},toString:function(){return"translate("+this.x+","+this.y+") scale("+this.k+")"}};var Rw=new Ns(1,0,0);Es.prototype=Ns.prototype;var qw=function(){t.event.preventDefault(),t.event.stopImmediatePropagation()},Uw=function(){function n(t){t.on("wheel.zoom",s).on("mousedown.zoom",f).on("dblclick.zoom",l).on("touchstart.zoom",h).on("touchmove.zoom",p).on("touchend.zoom touchcancel.zoom",v).style("-webkit-tap-highlight-color","rgba(0,0,0,0)").property("__zoom",Ps)}function e(t,n){return n=Math.max(x,Math.min(b,n)),n===t.k?t:new Ns(n,t.x,t.y)}function r(t,n,e){var r=n[0]-e[0]*t.k,i=n[1]-e[1]*t.k;return r===t.x&&i===t.y?t:new Ns(t.k,r,i)}function i(t,n){var e=t.invertX(n[0][0])-w,r=t.invertX(n[1][0])-M,i=t.invertY(n[0][1])-T,o=t.invertY(n[1][1])-k;return t.translate(r>e?(e+r)/2:Math.min(0,e)||Math.max(0,r),o>i?(i+o)/2:Math.min(0,i)||Math.max(0,o))}function o(t){return[(+t[0][0]+ +t[1][0])/2,(+t[0][1]+ +t[1][1])/2]}function u(t,n,e){t.on("start.zoom",function(){a(this,arguments).start()}).on("interrupt.zoom end.zoom",function(){a(this,arguments).end()}).tween("zoom",function(){var t=this,r=arguments,i=a(t,r),u=m.apply(t,r),c=e||o(u),s=Math.max(u[1][0]-u[0][0],u[1][1]-u[0][1]),f=t.__zoom,l="function"==typeof n?n.apply(t,r):n,h=N(f.invert(c).concat(s/f.k),l.invert(c).concat(s/l.k));return function(t){if(1===t)t=l;else{var n=h(t),e=s/n[2];t=new Ns(e,c[0]-n[0]*e,c[1]-n[1]*e)}i.zoom(null,t)}})}function a(t,n){for(var e,r=0,i=A.length;r<i;++r)if((e=A[r]).that===t)return e;return new c(t,n)}function c(t,n){this.that=t,this.args=n,this.index=-1,this.active=0,this.extent=m.apply(t,n)}function s(){function n(){o.wheel=null,o.end()}if(y.apply(this,arguments)){var o=a(this,arguments),u=this.__zoom,c=Math.max(x,Math.min(b,u.k*Math.pow(2,-t.event.deltaY*(t.event.deltaMode?120:1)/500))),s=Ff(this);if(o.wheel)o.mouse[0][0]===s[0]&&o.mouse[0][1]===s[1]||(o.mouse[1]=u.invert(o.mouse[0]=s)),clearTimeout(o.wheel);else{if(u.k===c)return;o.mouse=[s,u.invert(s)],ap(this),o.start()}qw(),o.wheel=setTimeout(n,P),o.zoom("mouse",i(r(e(u,c),o.mouse[0],o.mouse[1]),o.extent))}}function f(){function n(){qw(),o.moved=!0,o.zoom("mouse",i(r(o.that.__zoom,o.mouse[0]=Ff(o.that),o.mouse[1]),o.extent))}function e(){u.on("mousemove.zoom mouseup.zoom",null),gt(t.event.view,o.moved),qw(),o.end()}if(!g&&y.apply(this,arguments)){var o=a(this,arguments),u=bl(t.event.view).on("mousemove.zoom",n,!0).on("mouseup.zoom",e,!0),c=Ff(this);Sl(t.event.view),As(),o.mouse=[c,this.__zoom.invert(c)],ap(this),o.start()}}function l(){if(y.apply(this,arguments)){var o=this.__zoom,a=Ff(this),c=o.invert(a),s=o.k*(t.event.shiftKey?.5:2),f=i(r(e(o,s),a,c),m.apply(this,arguments));qw(),S>0?bl(this).transition().duration(S).call(u,f,a):bl(this).call(n.transform,f)}}function h(){if(y.apply(this,arguments)){var n,e,r,i,o=a(this,arguments),u=t.event.changedTouches,c=u.length;for(As(),e=0;e<c;++e)r=u[e],i=Ml(this,u,r.identifier),i=[i,this.__zoom.invert(i),r.identifier],o.touch0?o.touch1||(o.touch1=i):(o.touch0=i,n=!0);if(_&&(_=clearTimeout(_),!o.touch1))return o.end(),void((i=bl(this).on("dblclick.zoom"))&&i.apply(this,arguments));n&&(_=setTimeout(function(){_=null},z),ap(this),o.start())}}function p(){var n,o,u,c,s=a(this,arguments),f=t.event.changedTouches,l=f.length;for(qw(),_&&(_=clearTimeout(_)),n=0;n<l;++n)o=f[n],u=Ml(this,f,o.identifier),s.touch0&&s.touch0[2]===o.identifier?s.touch0[0]=u:s.touch1&&s.touch1[2]===o.identifier&&(s.touch1[0]=u);if(o=s.that.__zoom,s.touch1){var h=s.touch0[0],p=s.touch0[1],d=s.touch1[0],v=s.touch1[1],g=(g=d[0]-h[0])*g+(g=d[1]-h[1])*g,y=(y=v[0]-p[0])*y+(y=v[1]-p[1])*y;o=e(o,Math.sqrt(g/y)),u=[(h[0]+d[0])/2,(h[1]+d[1])/2],c=[(p[0]+v[0])/2,(p[1]+v[1])/2]}else{if(!s.touch0)return;u=s.touch0[0],c=s.touch0[1]}s.zoom("touch",i(r(o,u,c),s.extent))}function v(){var n,e,r=a(this,arguments),i=t.event.changedTouches,o=i.length;for(As(),g&&clearTimeout(g),g=setTimeout(function(){g=null},z),n=0;n<o;++n)e=i[n],r.touch0&&r.touch0[2]===e.identifier?delete r.touch0:r.touch1&&r.touch1[2]===e.identifier&&delete r.touch1;r.touch1&&!r.touch0&&(r.touch0=r.touch1,delete r.touch1),r.touch0?r.touch0[1]=this.__zoom.invert(r.touch0[0]):r.end()}var _,g,y=Cs,m=zs,x=0,b=1/0,w=-b,M=b,T=w,k=M,S=250,N=Ph,A=[],C=d("start","zoom","end"),z=500,P=150;return n.transform=function(t,n){var e=t.selection?t.selection():t;e.property("__zoom",Ps),t!==e?u(t,n):e.interrupt().each(function(){a(this,arguments).start().zoom(null,"function"==typeof n?n.apply(this,arguments):n).end()})},n.scaleBy=function(t,e){n.scaleTo(t,function(){return this.__zoom.k*("function"==typeof e?e.apply(this,arguments):e)})},n.scaleTo=function(t,u){n.transform(t,function(){var t=m.apply(this,arguments),n=this.__zoom,a=o(t),c=n.invert(a);return i(r(e(n,"function"==typeof u?u.apply(this,arguments):u),a,c),t)})},n.translateBy=function(t,e,r){n.transform(t,function(){return i(this.__zoom.translate("function"==typeof e?e.apply(this,arguments):e,"function"==typeof r?r.apply(this,arguments):r),m.apply(this,arguments))})},c.prototype={start:function(){return 1==++this.active&&(this.index=A.push(this)-1,this.emit("start")),this},zoom:function(t,n){return this.mouse&&"mouse"!==t&&(this.mouse[1]=n.invert(this.mouse[0])),this.touch0&&"touch"!==t&&(this.touch0[1]=n.invert(this.touch0[0])),this.touch1&&"touch"!==t&&(this.touch1[1]=n.invert(this.touch1[0])),this.that.__zoom=n,this.emit("zoom"),this},end:function(){return 0==--this.active&&(A.splice(this.index,1),this.index=-1,this.emit("end")),this},emit:function(t){E(new Ss(n,t,this.that.__zoom),C.apply,C,[t,this.that,this.args])}},n.filter=function(t){return arguments.length?(y="function"==typeof t?t:Lw(!!t),n):y},n.extent=function(t){return arguments.length?(m="function"==typeof t?t:Lw([[+t[0][0],+t[0][1]],[+t[1][0],+t[1][1]]]),n):m},n.scaleExtent=function(t){return arguments.length?(x=+t[0],b=+t[1],n):[x,b]},n.translateExtent=function(t){return arguments.length?(w=+t[0][0],M=+t[1][0],T=+t[0][1],k=+t[1][1],n):[[w,T],[M,k]]},n.duration=function(t){return arguments.length?(S=+t,n):S},n.interpolate=function(t){return arguments.length?(N=t,n):N},n.on=function(){var t=C.on.apply(C,arguments);return t===C?n:t},n};t.version="4.7.4",t.bisect=Us,t.bisectRight=Us,t.bisectLeft=Ds,t.ascending=Ls,t.bisector=Rs,t.cross=Fs,t.descending=Is,t.deviation=js,t.extent=Hs,t.histogram=ef,t.thresholdFreedmanDiaconis=of,t.thresholdScott=uf,t.thresholdSturges=nf,t.max=af,t.mean=cf,t.median=sf,t.merge=ff,t.min=lf,t.pairs=Os,t.permute=hf,t.quantile=rf,t.range=Gs,t.scan=pf,t.shuffle=df,t.sum=vf,t.ticks=tf,t.tickStep=r,t.transpose=_f,t.variance=Bs,t.zip=gf,t.axisTop=f,t.axisRight=l,t.axisBottom=h,t.axisLeft=p,t.brush=gd,t.brushX=Ae,t.brushY=Ce,t.brushSelection=Ee,t.chord=Td,t.ribbon=Cd,t.nest=zd,t.set=$e,t.map=Ye,t.keys=Ld,t.values=Rd,t.entries=qd,t.color=Tt,t.rgb=Et,t.hsl=Pt,t.lab=Ut,t.hcl=jt,t.cubehelix=Vt,t.dispatch=d,t.drag=El,t.dragDisable=Sl,t.dragEnable=gt,t.dsvFormat=Ud,t.csvParse=Od,t.csvParseRows=Fd,t.csvFormat=Id,t.csvFormatRows=Yd,t.tsvParse=jd,t.tsvParseRows=Hd,t.tsvFormat=Xd,t.tsvFormatRows=Vd,t.easeLinear=ee,t.easeQuad=oe,t.easeQuadIn=re,t.easeQuadOut=ie,t.easeQuadInOut=oe,t.easeCubic=ce,t.easeCubicIn=ue,t.easeCubicOut=ae,t.easeCubicInOut=ce,t.easePoly=Pp,t.easePolyIn=Cp,t.easePolyOut=zp,t.easePolyInOut=Pp,t.easeSin=le,t.easeSinIn=se,t.easeSinOut=fe,t.easeSinInOut=le,t.easeExp=de,t.easeExpIn=he,t.easeExpOut=pe,t.easeExpInOut=de,t.easeCircle=ge,t.easeCircleIn=ve,t.easeCircleOut=_e,t.easeCircleInOut=ge,t.easeBounce=me,t.easeBounceIn=ye,t.easeBounceOut=me,t.easeBounceInOut=xe,t.easeBack=$p,t.easeBackIn=Xp,t.easeBackOut=Vp,t.easeBackInOut=$p,t.easeElastic=Gp,t.easeElasticIn=Zp,t.easeElasticOut=Gp,t.easeElasticInOut=Jp,t.forceCenter=$d,t.forceCollide=lv,t.forceLink=hv,t.forceManyBody=_v,t.forceSimulation=vv,t.forceX=gv,t.forceY=yv,t.formatDefaultLocale=pr,t.formatLocale=zv,t.formatSpecifier=lr,t.precisionFixed=Pv,t.precisionPrefix=Lv,t.precisionRound=Rv,t.geoArea=F_,t.geoBounds=B_,t.geoCentroid=H_,t.geoCircle=og,t.geoClipExtent=hg,t.geoContains=Mg,t.geoDistance=xg,t.geoGraticule=wi,t.geoGraticule10=Mi,t.geoInterpolate=Tg,t.geoLength=gg,t.geoPath=Jg,t.geoAlbers=ay,t.geoAlbersUsa=cy,t.geoAzimuthalEqualArea=fy,t.geoAzimuthalEqualAreaRaw=sy,t.geoAzimuthalEquidistant=hy,t.geoAzimuthalEquidistantRaw=ly,t.geoConicConformal=dy,t.geoConicConformalRaw=lo,t.geoConicEqualArea=uy,t.geoConicEqualAreaRaw=io,t.geoConicEquidistant=_y,t.geoConicEquidistantRaw=po,t.geoEquirectangular=vy,t.geoEquirectangularRaw=ho,t.geoGnomonic=gy,t.geoGnomonicRaw=vo,t.geoIdentity=yy,t.geoProjection=to,t.geoProjectionMutator=no,t.geoMercator=py,t.geoMercatorRaw=co,t.geoOrthographic=my,t.geoOrthographicRaw=go,t.geoStereographic=xy,t.geoStereographicRaw=yo,t.geoTransverseMercator=by,t.geoTransverseMercatorRaw=mo,t.geoRotation=ig,t.geoStream=q_,t.geoTransform=ny,t.cluster=wy,t.hierarchy=Ao,t.pack=Oy,t.packSiblings=Uy,t.packEnclose=qy,t.partition=Yy,t.stratify=Xy,t.tree=Vy,t.treemap=Gy,t.treemapBinary=Jy,t.treemapDice=Iy,t.treemapSlice=$y,t.treemapSliceDice=Qy,t.treemapSquarify=Zy,t.treemapResquarify=Ky,t.interpolate=Th,t.interpolateArray=gh,t.interpolateBasis=lh,t.interpolateBasisClosed=hh,t.interpolateDate=yh,t.interpolateNumber=mh,t.interpolateObject=xh,t.interpolateRound=kh,t.interpolateString=Mh,t.interpolateTransformCss=Ah,t.interpolateTransformSvg=Ch,t.interpolateZoom=Ph,t.interpolateRgb=dh,t.interpolateRgbBasis=vh,t.interpolateRgbBasisClosed=_h,t.interpolateHsl=Lh,t.interpolateHslLong=Rh,t.interpolateLab=ln,t.interpolateHcl=qh,t.interpolateHclLong=Uh,t.interpolateCubehelix=Dh,t.interpolateCubehelixLong=Oh,t.quantize=Fh,t.path=Re,t.polygonArea=tm,t.polygonCentroid=nm,t.polygonHull=rm;t.polygonContains=im,t.polygonLength=om,t.quadtree=er,t.queue=yu,t.randomUniform=cm,t.randomNormal=sm,t.randomLogNormal=fm,t.randomBates=hm,t.randomIrwinHall=lm,t.randomExponential=pm,t.request=dm,t.html=_m,t.json=gm,t.text=ym,t.xml=mm,t.csv=bm,t.tsv=wm,t.scaleBand=Mu,t.scalePoint=ku,t.scaleIdentity=qu,t.scaleLinear=Ru,t.scaleLog=Bu,t.scaleOrdinal=wu,t.scaleImplicit=Sm,t.scalePow=Hu,t.scaleSqrt=Xu,t.scaleQuantile=Vu,t.scaleQuantize=$u,t.scaleThreshold=Wu,t.scaleTime=Wx,t.scaleUtc=Zx,t.schemeCategory10=Jx,t.schemeCategory20b=Qx,t.schemeCategory20c=Kx,t.schemeCategory20=tb,t.interpolateCubehelixDefault=nb,t.interpolateRainbow=ob,t.interpolateWarm=eb,t.interpolateCool=rb,t.interpolateViridis=ub,t.interpolateMagma=ab,t.interpolateInferno=cb,t.interpolatePlasma=sb,t.scaleSequential=ec,t.creator=Af,t.local=b,t.matcher=Rf,t.mouse=Ff,t.namespace=Ef,t.namespaces=Nf,t.select=bl,t.selectAll=wl,t.selection=vt,t.selector=If,t.selectorAll=Bf,t.touch=Ml,t.touches=Tl,t.window=al,t.customEvent=E,t.arc=wb,t.area=kb,t.line=Tb,t.pie=Eb,t.radialArea=zb,t.radialLine=Cb,t.symbol=Gb,t.symbols=Zb,t.symbolCircle=Pb,t.symbolCross=Lb,t.symbolDiamond=Ub,t.symbolSquare=Yb,t.symbolStar=Ib,t.symbolTriangle=jb,t.symbolWye=Wb,t.curveBasisClosed=Kb,t.curveBasisOpen=tw,t.curveBasis=Qb,t.curveBundle=nw,t.curveCardinalClosed=rw,t.curveCardinalOpen=iw,t.curveCardinal=ew,t.curveCatmullRomClosed=uw,t.curveCatmullRomOpen=aw,t.curveCatmullRom=ow,t.curveLinearClosed=cw,t.curveLinear=Mb,t.curveMonotoneX=Fc,t.curveMonotoneY=Ic,t.curveNatural=sw,t.curveStep=fw,t.curveStepAfter=Xc,t.curveStepBefore=Hc,t.stack=dw,t.stackOffsetExpand=vw,t.stackOffsetNone=hw,t.stackOffsetSilhouette=_w,t.stackOffsetWiggle=gw,t.stackOrderAscending=yw,t.stackOrderDescending=mw,t.stackOrderInsideOut=xw,t.stackOrderNone=pw,t.stackOrderReverse=bw,t.timeInterval=Zu,t.timeMillisecond=Rm,t.timeMilliseconds=qm,t.utcMillisecond=Rm,t.utcMilliseconds=qm,t.timeSecond=Om,t.timeSeconds=Fm,t.utcSecond=Om,t.utcSeconds=Fm,t.timeMinute=Im,t.timeMinutes=Ym,t.timeHour=Bm,t.timeHours=jm,t.timeDay=Hm,t.timeDays=Xm,t.timeWeek=Vm,t.timeWeeks=Km,t.timeSunday=Vm,t.timeSundays=Km,t.timeMonday=$m,t.timeMondays=tx,t.timeTuesday=Wm,t.timeTuesdays=nx,t.timeWednesday=Zm,t.timeWednesdays=ex,t.timeThursday=Gm,t.timeThursdays=rx,t.timeFriday=Jm,t.timeFridays=ix,t.timeSaturday=Qm,t.timeSaturdays=ox,t.timeMonth=ux,t.timeMonths=ax,t.timeYear=cx,t.timeYears=sx,t.utcMinute=fx,t.utcMinutes=lx,t.utcHour=hx,t.utcHours=px,t.utcDay=dx,t.utcDays=vx,t.utcWeek=_x,t.utcWeeks=Mx,t.utcSunday=_x,t.utcSundays=Mx,t.utcMonday=gx,t.utcMondays=Tx,t.utcTuesday=yx,t.utcTuesdays=kx,t.utcWednesday=mx,t.utcWednesdays=Sx,t.utcThursday=xx,t.utcThursdays=Nx,t.utcFriday=bx,t.utcFridays=Ex,t.utcSaturday=wx,t.utcSaturdays=Ax,t.utcMonth=Cx,t.utcMonths=zx,t.utcYear=Px,t.utcYears=Rx,t.timeFormatDefaultLocale=Za,t.timeFormatLocale=na,t.isoFormat=Fx,t.isoParse=Ix,t.now=dn,t.timer=gn,t.timerFlush=yn,t.timeout=Zh,t.interval=Gh,t.transition=te,t.active=nd,t.interrupt=ap,t.voronoi=Pw,t.zoom=Uw,t.zoomTransform=Es,t.zoomIdentity=Rw,Object.defineProperty(t,"__esModule",{value:!0})});
\ No newline at end of file
+this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3;default:Nc(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var ow=function t(n){function e(t){return n?new Ec(t,n):new Tc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);Ac.prototype={areaStart:Jb,areaEnd:Jb,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath();break;case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._x3=t,this._y3=n;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3,this._x5=t,this._y5=n;break;default:Nc(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var uw=function t(n){function e(t){return n?new Ac(t,n):new kc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);Cc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Nc(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var aw=function t(n){function e(t){return n?new Cc(t,n):new Sc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);zc.prototype={areaStart:Jb,areaEnd:Jb,lineStart:function(){this._point=0},lineEnd:function(){this._point&&this._context.closePath()},point:function(t,n){t=+t,n=+n,this._point?this._context.lineTo(t,n):(this._point=1,this._context.moveTo(t,n))}};var cw=function(t){return new zc(t)};Uc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1);break;case 3:qc(this,this._t0,Rc(this,this._t0))}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){var e=NaN;if(t=+t,n=+n,t!==this._x1||n!==this._y1){switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3,qc(this,Rc(this,e=Lc(this,t,n)),e);break;default:qc(this,this._t0,e=Lc(this,t,n))}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n,this._t0=e}}},(Dc.prototype=Object.create(Uc.prototype)).point=function(t,n){Uc.prototype.point.call(this,n,t)},Oc.prototype={moveTo:function(t,n){this._context.moveTo(n,t)},closePath:function(){this._context.closePath()},lineTo:function(t,n){this._context.lineTo(n,t)},bezierCurveTo:function(t,n,e,r,i,o){this._context.bezierCurveTo(n,t,r,e,o,i)}},Yc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=[],this._y=[]},lineEnd:function(){var t=this._x,n=this._y,e=t.length;if(e)if(this._line?this._context.lineTo(t[0],n[0]):this._context.moveTo(t[0],n[0]),2===e)this._context.lineTo(t[1],n[1]);else for(var r=Bc(t),i=Bc(n),o=0,u=1;u<e;++o,++u)this._context.bezierCurveTo(r[0][o],i[0][o],r[1][o],i[1][o],t[u],n[u]);(this._line||0!==this._line&&1===e)&&this._context.closePath(),this._line=1-this._line,this._x=this._y=null},point:function(t,n){this._x.push(+t),this._y.push(+n)}};var sw=function(t){return new Yc(t)};jc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=this._y=NaN,this._point=0},lineEnd:function(){0<this._t&&this._t<1&&2===this._point&&this._context.lineTo(this._x,this._y),(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:if(this._t<=0)this._context.lineTo(this._x,n),this._context.lineTo(t,n);else{var e=this._x*(1-this._t)+t*this._t;this._context.lineTo(e,this._y),this._context.lineTo(e,n)}}this._x=t,this._y=n}};var fw=function(t){return new jc(t,.5)},lw=Array.prototype.slice,hw=function(t,n){if((r=t.length)>1)for(var e,r,i=1,o=t[n[0]],u=o.length;i<r;++i){e=o,o=t[n[i]];for(var a=0;a<u;++a)o[a][1]+=o[a][0]=isNaN(e[a][1])?e[a][0]:e[a][1]}},pw=function(t){for(var n=t.length,e=new Array(n);--n>=0;)e[n]=n;return e},dw=function(){function t(t){var o,u,a=n.apply(this,arguments),c=t.length,s=a.length,f=new Array(s);for(o=0;o<s;++o){for(var l,h=a[o],p=f[o]=new Array(c),d=0;d<c;++d)p[d]=l=[0,+i(t[d],h,d,t)],l.data=t[d];p.key=h}for(o=0,u=e(f);o<s;++o)f[u[o]].index=o;return r(f,u),f}var n=fb([]),e=pw,r=hw,i=Vc;return t.keys=function(e){return arguments.length?(n="function"==typeof e?e:fb(lw.call(e)),t):n},t.value=function(n){return arguments.length?(i="function"==typeof n?n:fb(+n),t):i},t.order=function(n){return arguments.length?(e=null==n?pw:"function"==typeof n?n:fb(lw.call(n)),t):e},t.offset=function(n){return arguments.length?(r=null==n?hw:n,t):r},t},vw=function(t,n){if((r=t.length)>0){for(var e,r,i,o=0,u=t[0].length;o<u;++o){for(i=e=0;e<r;++e)i+=t[e][o][1]||0;if(i)for(e=0;e<r;++e)t[e][o][1]/=i}hw(t,n)}},_w=function(t,n){if((e=t.length)>0){for(var e,r=0,i=t[n[0]],o=i.length;r<o;++r){for(var u=0,a=0;u<e;++u)a+=t[u][r][1]||0;i[r][1]+=i[r][0]=-a/2}hw(t,n)}},gw=function(t,n){if((i=t.length)>0&&(r=(e=t[n[0]]).length)>0){for(var e,r,i,o=0,u=1;u<r;++u){for(var a=0,c=0,s=0;a<i;++a){for(var f=t[n[a]],l=f[u][1]||0,h=f[u-1][1]||0,p=(l-h)/2,d=0;d<a;++d){var v=t[n[d]];p+=(v[u][1]||0)-(v[u-1][1]||0)}c+=l,s+=p*l}e[u-1][1]+=e[u-1][0]=o,c&&(o-=s/c)}e[u-1][1]+=e[u-1][0]=o,hw(t,n)}},yw=function(t){var n=t.map($c);return pw(t).sort(function(t,e){return n[t]-n[e]})},mw=function(t){return yw(t).reverse()},xw=function(t){var n,e,r=t.length,i=t.map($c),o=pw(t).sort(function(t,n){return i[n]-i[t]}),u=0,a=0,c=[],s=[];for(n=0;n<r;++n)e=o[n],u<a?(u+=i[e],c.push(e)):(a+=i[e],s.push(e));return s.reverse().concat(c)},bw=function(t){return pw(t).reverse()},ww=function(t){return function(){return t}};Gc.prototype={constructor:Gc,insert:function(t,n){var e,r,i;if(t){if(n.P=t,n.N=t.N,t.N&&(t.N.P=n),t.N=n,t.R){for(t=t.R;t.L;)t=t.L;t.L=n}else t.R=n;e=t}else this._?(t=ts(this._),n.P=null,n.N=t,t.P=t.L=n,e=t):(n.P=n.N=null,this._=n,e=null);for(n.L=n.R=null,n.U=e,n.C=!0,t=n;e&&e.C;)r=e.U,e===r.L?(i=r.R,i&&i.C?(e.C=i.C=!1,r.C=!0,t=r):(t===e.R&&(Qc(this,e),t=e,e=t.U),e.C=!1,r.C=!0,Kc(this,r))):(i=r.L,i&&i.C?(e.C=i.C=!1,r.C=!0,t=r):(t===e.L&&(Kc(this,e),t=e,e=t.U),e.C=!1,r.C=!0,Qc(this,r))),e=t.U;this._.C=!1},remove:function(t){t.N&&(t.N.P=t.P),t.P&&(t.P.N=t.N),t.N=t.P=null;var n,e,r,i=t.U,o=t.L,u=t.R;if(e=o?u?ts(u):o:u,i?i.L===t?i.L=e:i.R=e:this._=e,o&&u?(r=e.C,e.C=t.C,e.L=o,o.U=e,e!==u?(i=e.U,e.U=t.U,t=e.R,i.L=t,e.R=u,u.U=e):(e.U=i,i=e,t=e.R)):(r=t.C,t=e),t&&(t.U=i),!r){if(t&&t.C)return void(t.C=!1);do{if(t===this._)break;if(t===i.L){if(n=i.R,n.C&&(n.C=!1,i.C=!0,Qc(this,i),n=i.R),n.L&&n.L.C||n.R&&n.R.C){n.R&&n.R.C||(n.L.C=!1,n.C=!0,Kc(this,n),n=i.R),n.C=i.C,i.C=n.R.C=!1,Qc(this,i),t=this._;break}}else if(n=i.L,n.C&&(n.C=!1,i.C=!0,Kc(this,i),n=i.L),n.L&&n.L.C||n.R&&n.R.C){n.L&&n.L.C||(n.R.C=!1,n.C=!0,Qc(this,n),n=i.L),n.C=i.C,i.C=n.L.C=!1,Kc(this,i),t=this._;break}n.C=!0,t=i,i=i.U}while(!t.C);t&&(t.C=!1)}}};var Mw,Tw,kw,Sw,Nw,Ew=[],Aw=[],Cw=1e-6,zw=1e-12;ks.prototype={constructor:ks,polygons:function(){var t=this.edges;return this.cells.map(function(n){var e=n.halfedges.map(function(e){return ss(n,t[e])});return e.data=n.site.data,e})},triangles:function(){var t=[],n=this.edges;return this.cells.forEach(function(e,r){if(o=(i=e.halfedges).length)for(var i,o,u,a=e.site,c=-1,s=n[i[o-1]],f=s.left===a?s.right:s.left;++c<o;)u=f,s=n[i[c]],f=s.left===a?s.right:s.left,u&&f&&r<u.index&&r<f.index&&Ms(a,u,f)<0&&t.push([a.data,u.data,f.data])}),t},links:function(){return this.edges.filter(function(t){return t.right}).map(function(t){return{source:t.left.data,target:t.right.data}})},find:function(t,n,e){for(var r,i,o=this,u=o._found||0,a=o.cells.length;!(i=o.cells[u]);)if(++u>=a)return null;var c=t-i.site[0],s=n-i.site[1],f=c*c+s*s;do{i=o.cells[r=u],u=null,i.halfedges.forEach(function(e){var r=o.edges[e],a=r.left;if(a!==i.site&&a||(a=r.right)){var c=t-a[0],s=n-a[1],l=c*c+s*s;l<f&&(f=l,u=a.index)}})}while(null!==u);return o._found=r,null==e||f<=e*e?i.site:null}};var Pw=function(){function t(t){return new ks(t.map(function(r,i){var o=[Math.round(n(r,i,t)/Cw)*Cw,Math.round(e(r,i,t)/Cw)*Cw];return o.index=i,o.data=r,o}),r)}var n=Wc,e=Zc,r=null;return t.polygons=function(n){return t(n).polygons()},t.links=function(n){return t(n).links()},t.triangles=function(n){return t(n).triangles()},t.x=function(e){return arguments.length?(n="function"==typeof e?e:ww(+e),t):n},t.y=function(n){return arguments.length?(e="function"==typeof n?n:ww(+n),t):e},t.extent=function(n){return arguments.length?(r=null==n?null:[[+n[0][0],+n[0][1]],[+n[1][0],+n[1][1]]],t):r&&[[r[0][0],r[0][1]],[r[1][0],r[1][1]]]},t.size=function(n){return arguments.length?(r=null==n?null:[[0,0],[+n[0],+n[1]]],t):r&&[r[1][0]-r[0][0],r[1][1]-r[0][1]]},t},Lw=function(t){return function(){return t}};Ns.prototype={constructor:Ns,scale:function(t){return 1===t?this:new Ns(this.k*t,this.x,this.y)},translate:function(t,n){return 0===t&0===n?this:new Ns(this.k,this.x+this.k*t,this.y+this.k*n)},apply:function(t){return[t[0]*this.k+this.x,t[1]*this.k+this.y]},applyX:function(t){return t*this.k+this.x},applyY:function(t){return t*this.k+this.y},invert:function(t){return[(t[0]-this.x)/this.k,(t[1]-this.y)/this.k]},invertX:function(t){return(t-this.x)/this.k},invertY:function(t){return(t-this.y)/this.k},rescaleX:function(t){return t.copy().domain(t.range().map(this.invertX,this).map(t.invert,t))},rescaleY:function(t){return t.copy().domain(t.range().map(this.invertY,this).map(t.invert,t))},toString:function(){return"translate("+this.x+","+this.y+") scale("+this.k+")"}};var Rw=new Ns(1,0,0);Es.prototype=Ns.prototype;var qw=function(){t.event.preventDefault(),t.event.stopImmediatePropagation()},Uw=function(){function n(t){t.on("wheel.zoom",s).on("mousedown.zoom",f).on("dblclick.zoom",l).on("touchstart.zoom",h).on("touchmove.zoom",p).on("touchend.zoom touchcancel.zoom",v).style("-webkit-tap-highlight-color","rgba(0,0,0,0)").property("__zoom",Ps)}function e(t,n){return n=Math.max(x,Math.min(b,n)),n===t.k?t:new Ns(n,t.x,t.y)}function r(t,n,e){var r=n[0]-e[0]*t.k,i=n[1]-e[1]*t.k;return r===t.x&&i===t.y?t:new Ns(t.k,r,i)}function i(t,n){var e=t.invertX(n[0][0])-w,r=t.invertX(n[1][0])-M,i=t.invertY(n[0][1])-T,o=t.invertY(n[1][1])-k;return t.translate(r>e?(e+r)/2:Math.min(0,e)||Math.max(0,r),o>i?(i+o)/2:Math.min(0,i)||Math.max(0,o))}function o(t){return[(+t[0][0]+ +t[1][0])/2,(+t[0][1]+ +t[1][1])/2]}function u(t,n,e){t.on("start.zoom",function(){a(this,arguments).start()}).on("interrupt.zoom end.zoom",function(){a(this,arguments).end()}).tween("zoom",function(){var t=this,r=arguments,i=a(t,r),u=m.apply(t,r),c=e||o(u),s=Math.max(u[1][0]-u[0][0],u[1][1]-u[0][1]),f=t.__zoom,l="function"==typeof n?n.apply(t,r):n,h=N(f.invert(c).concat(s/f.k),l.invert(c).concat(s/l.k));return function(t){if(1===t)t=l;else{var n=h(t),e=s/n[2];t=new Ns(e,c[0]-n[0]*e,c[1]-n[1]*e)}i.zoom(null,t)}})}function a(t,n){for(var e,r=0,i=A.length;r<i;++r)if((e=A[r]).that===t)return e;return new c(t,n)}function c(t,n){this.that=t,this.args=n,this.index=-1,this.active=0,this.extent=m.apply(t,n)}function s(){function n(){o.wheel=null,o.end()}if(y.apply(this,arguments)){var o=a(this,arguments),u=this.__zoom,c=Math.max(x,Math.min(b,u.k*Math.pow(2,-t.event.deltaY*(t.event.deltaMode?120:1)/500))),s=Ff(this);if(o.wheel)o.mouse[0][0]===s[0]&&o.mouse[0][1]===s[1]||(o.mouse[1]=u.invert(o.mouse[0]=s)),clearTimeout(o.wheel);else{if(u.k===c)return;o.mouse=[s,u.invert(s)],ap(this),o.start()}qw(),o.wheel=setTimeout(n,P),o.zoom("mouse",i(r(e(u,c),o.mouse[0],o.mouse[1]),o.extent))}}function f(){function n(){qw(),o.moved=!0,o.zoom("mouse",i(r(o.that.__zoom,o.mouse[0]=Ff(o.that),o.mouse[1]),o.extent))}function e(){u.on("mousemove.zoom mouseup.zoom",null),gt(t.event.view,o.moved),qw(),o.end()}if(!g&&y.apply(this,arguments)){var o=a(this,arguments),u=bl(t.event.view).on("mousemove.zoom",n,!0).on("mouseup.zoom",e,!0),c=Ff(this);Sl(t.event.view),As(),o.mouse=[c,this.__zoom.invert(c)],ap(this),o.start()}}function l(){if(y.apply(this,arguments)){var o=this.__zoom,a=Ff(this),c=o.invert(a),s=o.k*(t.event.shiftKey?.5:2),f=i(r(e(o,s),a,c),m.apply(this,arguments));qw(),S>0?bl(this).transition().duration(S).call(u,f,a):bl(this).call(n.transform,f)}}function h(){if(y.apply(this,arguments)){var n,e,r,i,o=a(this,arguments),u=t.event.changedTouches,c=u.length;for(As(),e=0;e<c;++e)r=u[e],i=Ml(this,u,r.identifier),i=[i,this.__zoom.invert(i),r.identifier],o.touch0?o.touch1||(o.touch1=i):(o.touch0=i,n=!0);if(_&&(_=clearTimeout(_),!o.touch1))return o.end(),void((i=bl(this).on("dblclick.zoom"))&&i.apply(this,arguments));n&&(_=setTimeout(function(){_=null},z),ap(this),o.start())}}function p(){var n,o,u,c,s=a(this,arguments),f=t.event.changedTouches,l=f.length;for(qw(),_&&(_=clearTimeout(_)),n=0;n<l;++n)o=f[n],u=Ml(this,f,o.identifier),s.touch0&&s.touch0[2]===o.identifier?s.touch0[0]=u:s.touch1&&s.touch1[2]===o.identifier&&(s.touch1[0]=u);if(o=s.that.__zoom,s.touch1){var h=s.touch0[0],p=s.touch0[1],d=s.touch1[0],v=s.touch1[1],g=(g=d[0]-h[0])*g+(g=d[1]-h[1])*g,y=(y=v[0]-p[0])*y+(y=v[1]-p[1])*y;o=e(o,Math.sqrt(g/y)),u=[(h[0]+d[0])/2,(h[1]+d[1])/2],c=[(p[0]+v[0])/2,(p[1]+v[1])/2]}else{if(!s.touch0)return;u=s.touch0[0],c=s.touch0[1]}s.zoom("touch",i(r(o,u,c),s.extent))}function v(){var n,e,r=a(this,arguments),i=t.event.changedTouches,o=i.length;for(As(),g&&clearTimeout(g),g=setTimeout(function(){g=null},z),n=0;n<o;++n)e=i[n],r.touch0&&r.touch0[2]===e.identifier?delete r.touch0:r.touch1&&r.touch1[2]===e.identifier&&delete r.touch1;r.touch1&&!r.touch0&&(r.touch0=r.touch1,delete r.touch1),r.touch0?r.touch0[1]=this.__zoom.invert(r.touch0[0]):r.end()}var _,g,y=Cs,m=zs,x=0,b=1/0,w=-b,M=b,T=w,k=M,S=250,N=Ph,A=[],C=d("start","zoom","end"),z=500,P=150;return n.transform=function(t,n){var e=t.selection?t.selection():t;e.property("__zoom",Ps),t!==e?u(t,n):e.interrupt().each(function(){a(this,arguments).start().zoom(null,"function"==typeof n?n.apply(this,arguments):n).end()})},n.scaleBy=function(t,e){n.scaleTo(t,function(){return this.__zoom.k*("function"==typeof e?e.apply(this,arguments):e)})},n.scaleTo=function(t,u){n.transform(t,function(){var t=m.apply(this,arguments),n=this.__zoom,a=o(t),c=n.invert(a);return i(r(e(n,"function"==typeof u?u.apply(this,arguments):u),a,c),t)})},n.translateBy=function(t,e,r){n.transform(t,function(){return i(this.__zoom.translate("function"==typeof e?e.apply(this,arguments):e,"function"==typeof r?r.apply(this,arguments):r),m.apply(this,arguments))})},c.prototype={start:function(){return 1==++this.active&&(this.index=A.push(this)-1,this.emit("start")),this},zoom:function(t,n){return this.mouse&&"mouse"!==t&&(this.mouse[1]=n.invert(this.mouse[0])),this.touch0&&"touch"!==t&&(this.touch0[1]=n.invert(this.touch0[0])),this.touch1&&"touch"!==t&&(this.touch1[1]=n.invert(this.touch1[0])),this.that.__zoom=n,this.emit("zoom"),this},end:function(){return 0==--this.active&&(A.splice(this.index,1),this.index=-1,this.emit("end")),this},emit:function(t){E(new Ss(n,t,this.that.__zoom),C.apply,C,[t,this.that,this.args])}},n.filter=function(t){return arguments.length?(y="function"==typeof t?t:Lw(!!t),n):y},n.extent=function(t){return arguments.length?(m="function"==typeof t?t:Lw([[+t[0][0],+t[0][1]],[+t[1][0],+t[1][1]]]),n):m},n.scaleExtent=function(t){return arguments.length?(x=+t[0],b=+t[1],n):[x,b]},n.translateExtent=function(t){return arguments.length?(w=+t[0][0],M=+t[1][0],T=+t[0][1],k=+t[1][1],n):[[w,T],[M,k]]},n.duration=function(t){return arguments.length?(S=+t,n):S},n.interpolate=function(t){return arguments.length?(N=t,n):N},n.on=function(){var t=C.on.apply(C,arguments);return t===C?n:t},n};t.version="4.7.4",t.bisect=Us,t.bisectRight=Us,t.bisectLeft=Ds,t.ascending=Ls,t.bisector=Rs,t.cross=Fs,t.descending=Is,t.deviation=js,t.extent=Hs,t.histogram=ef,t.thresholdFreedmanDiaconis=of,t.thresholdScott=uf,t.thresholdSturges=nf,t.max=af,t.mean=cf,t.median=sf,t.merge=ff,t.min=lf,t.pairs=Os,t.permute=hf,t.quantile=rf,t.range=Gs,t.scan=pf,t.shuffle=df,t.sum=vf,t.ticks=tf,t.tickStep=r,t.transpose=_f,t.variance=Bs,t.zip=gf,t.axisTop=f,t.axisRight=l,t.axisBottom=h,t.axisLeft=p,t.brush=gd,t.brushX=Ae,t.brushY=Ce,t.brushSelection=Ee,t.chord=Td,t.ribbon=Cd,t.nest=zd,t.set=$e,t.map=Ye,t.keys=Ld,t.values=Rd,t.entries=qd,t.color=Tt,t.rgb=Et,t.hsl=Pt,t.lab=Ut,t.hcl=jt,t.cubehelix=Vt,t.dispatch=d,t.drag=El,t.dragDisable=Sl,t.dragEnable=gt,t.dsvFormat=Ud,t.csvParse=Od,t.csvParseRows=Fd,t.csvFormat=Id,t.csvFormatRows=Yd,t.tsvParse=jd,t.tsvParseRows=Hd,t.tsvFormat=Xd,t.tsvFormatRows=Vd,t.easeLinear=ee,t.easeQuad=oe,t.easeQuadIn=re,t.easeQuadOut=ie,t.easeQuadInOut=oe,t.easeCubic=ce,t.easeCubicIn=ue,t.easeCubicOut=ae,t.easeCubicInOut=ce,t.easePoly=Pp,t.easePolyIn=Cp,t.easePolyOut=zp,t.easePolyInOut=Pp,t.easeSin=le,t.easeSinIn=se,t.easeSinOut=fe,t.easeSinInOut=le,t.easeExp=de,t.easeExpIn=he,t.easeExpOut=pe,t.easeExpInOut=de,t.easeCircle=ge,t.easeCircleIn=ve,t.easeCircleOut=_e,t.easeCircleInOut=ge,t.easeBounce=me,t.easeBounceIn=ye,t.easeBounceOut=me,t.easeBounceInOut=xe,t.easeBack=$p,t.easeBackIn=Xp,t.easeBackOut=Vp,t.easeBackInOut=$p,t.easeElastic=Gp,t.easeElasticIn=Zp,t.easeElasticOut=Gp,t.easeElasticInOut=Jp,t.forceCenter=$d,t.forceCollide=lv,t.forceLink=hv,t.forceManyBody=_v,t.forceSimulation=vv,t.forceX=gv,t.forceY=yv,t.formatDefaultLocale=pr,t.formatLocale=zv,t.formatSpecifier=lr,t.precisionFixed=Pv,t.precisionPrefix=Lv,t.precisionRound=Rv,t.geoArea=F_,t.geoBounds=B_,t.geoCentroid=H_,t.geoCircle=og,t.geoClipExtent=hg,t.geoContains=Mg,t.geoDistance=xg,t.geoGraticule=wi,t.geoGraticule10=Mi,t.geoInterpolate=Tg,t.geoLength=gg,t.geoPath=Jg,t.geoAlbers=ay,t.geoAlbersUsa=cy,t.geoAzimuthalEqualArea=fy,t.geoAzimuthalEqualAreaRaw=sy,t.geoAzimuthalEquidistant=hy,t.geoAzimuthalEquidistantRaw=ly,t.geoConicConformal=dy,t.geoConicConformalRaw=lo,t.geoConicEqualArea=uy,t.geoConicEqualAreaRaw=io,t.geoConicEquidistant=_y,t.geoConicEquidistantRaw=po,t.geoEquirectangular=vy,t.geoEquirectangularRaw=ho,t.geoGnomonic=gy,t.geoGnomonicRaw=vo,t.geoIdentity=yy,t.geoProjection=to,t.geoProjectionMutator=no,t.geoMercator=py,t.geoMercatorRaw=co,t.geoOrthographic=my,t.geoOrthographicRaw=go,t.geoStereographic=xy,t.geoStereographicRaw=yo,t.geoTransverseMercator=by,t.geoTransverseMercatorRaw=mo,t.geoRotation=ig,t.geoStream=q_,t.geoTransform=ny,t.cluster=wy,t.hierarchy=Ao,t.pack=Oy,t.packSiblings=Uy,t.packEnclose=qy,t.partition=Yy,t.stratify=Xy,t.tree=Vy,t.treemap=Gy,t.treemapBinary=Jy,t.treemapDice=Iy,t.treemapSlice=$y,t.treemapSliceDice=Qy,t.treemapSquarify=Zy,t.treemapResquarify=Ky,t.interpolate=Th,t.interpolateArray=gh,t.interpolateBasis=lh,t.interpolateBasisClosed=hh,t.interpolateDate=yh,t.interpolateNumber=mh,t.interpolateObject=xh,t.interpolateRound=kh,t.interpolateString=Mh,t.interpolateTransformCss=Ah,t.interpolateTransformSvg=Ch,t.interpolateZoom=Ph,t.interpolateRgb=dh,t.interpolateRgbBasis=vh,t.interpolateRgbBasisClosed=_h,t.interpolateHsl=Lh,t.interpolateHslLong=Rh,t.interpolateLab=ln,t.interpolateHcl=qh,t.interpolateHclLong=Uh,t.interpolateCubehelix=Dh,t.interpolateCubehelixLong=Oh,t.quantize=Fh,t.path=Re,t.polygonArea=tm,t.polygonCentroid=nm,t.polygonHull=rm;t.polygonContains=im,t.polygonLength=om,t.quadtree=er,t.queue=yu,t.randomUniform=cm,t.randomNormal=sm,t.randomLogNormal=fm,t.randomBates=hm,t.randomIrwinHall=lm,t.randomExponential=pm,t.request=dm,t.html=_m,t.json=gm,t.text=ym,t.xml=mm,t.csv=bm,t.tsv=wm,t.scaleBand=Mu,t.scalePoint=ku,t.scaleIdentity=qu,t.scaleLinear=Ru,t.scaleLog=Bu,t.scaleOrdinal=wu,t.scaleImplicit=Sm,t.scalePow=Hu,t.scaleSqrt=Xu,t.scaleQuantile=Vu,t.scaleQuantize=$u,t.scaleThreshold=Wu,t.scaleTime=Wx,t.scaleUtc=Zx,t.schemeCategory10=Jx,t.schemeCategory20b=Qx,t.schemeCategory20c=Kx,t.schemeCategory20=tb,t.interpolateCubehelixDefault=nb,t.interpolateRainbow=ob,t.interpolateWarm=eb,t.interpolateCool=rb,t.interpolateViridis=ub,t.interpolateMagma=ab,t.interpolateInferno=cb,t.interpolatePlasma=sb,t.scaleSequential=ec,t.creator=Af,t.local=b,t.matcher=Rf,t.mouse=Ff,t.namespace=Ef,t.namespaces=Nf,t.select=bl,t.selectAll=wl,t.selection=vt,t.selector=If,t.selectorAll=Bf,t.touch=Ml,t.touches=Tl,t.window=al,t.customEvent=E,t.arc=wb,t.area=kb,t.line=Tb,t.pie=Eb,t.radialArea=zb,t.radialLine=Cb,t.symbol=Gb,t.symbols=Zb,t.symbolCircle=Pb,t.symbolCross=Lb,t.symbolDiamond=Ub,t.symbolSquare=Yb,t.symbolStar=Ib,t.symbolTriangle=jb,t.symbolWye=Wb,t.curveBasisClosed=Kb,t.curveBasisOpen=tw,t.curveBasis=Qb,t.curveBundle=nw,t.curveCardinalClosed=rw,t.curveCardinalOpen=iw,t.curveCardinal=ew,t.curveCatmullRomClosed=uw,t.curveCatmullRomOpen=aw,t.curveCatmullRom=ow,t.curveLinearClosed=cw,t.curveLinear=Mb,t.curveMonotoneX=Fc,t.curveMonotoneY=Ic,t.curveNatural=sw,t.curveStep=fw,t.curveStepAfter=Xc,t.curveStepBefore=Hc,t.stack=dw,t.stackOffsetExpand=vw,t.stackOffsetNone=hw,t.stackOffsetSilhouette=_w,t.stackOffsetWiggle=gw,t.stackOrderAscending=yw,t.stackOrderDescending=mw,t.stackOrderInsideOut=xw,t.stackOrderNone=pw,t.stackOrderReverse=bw,t.timeInterval=Zu,t.timeMillisecond=Rm,t.timeMilliseconds=qm,t.utcMillisecond=Rm,t.utcMilliseconds=qm,t.timeSecond=Om,t.timeSeconds=Fm,t.utcSecond=Om,t.utcSeconds=Fm,t.timeMinute=Im,t.timeMinutes=Ym,t.timeHour=Bm,t.timeHours=jm,t.timeDay=Hm,t.timeDays=Xm,t.timeWeek=Vm,t.timeWeeks=Km,t.timeSunday=Vm,t.timeSundays=Km,t.timeMonday=$m,t.timeMondays=tx,t.timeTuesday=Wm,t.timeTuesdays=nx,t.timeWednesday=Zm,t.timeWednesdays=ex,t.timeThursday=Gm,t.timeThursdays=rx,t.timeFriday=Jm,t.timeFridays=ix,t.timeSaturday=Qm,t.timeSaturdays=ox,t.timeMonth=ux,t.timeMonths=ax,t.timeYear=cx,t.timeYears=sx,t.utcMinute=fx,t.utcMinutes=lx,t.utcHour=hx,t.utcHours=px,t.utcDay=dx,t.utcDays=vx,t.utcWeek=_x,t.utcWeeks=Mx,t.utcSunday=_x,t.utcSundays=Mx,t.utcMonday=gx,t.utcMondays=Tx,t.utcTuesday=yx,t.utcTuesdays=kx,t.utcWednesday=mx,t.utcWednesdays=Sx,t.utcThursday=xx,t.utcThursdays=Nx,t.utcFriday=bx,t.utcFridays=Ex,t.utcSaturday=wx,t.utcSaturdays=Ax,t.utcMonth=Cx,t.utcMonths=zx,t.utcYear=Px,t.utcYears=Rx,t.timeFormatDefaultLocale=Za,t.timeFormatLocale=na,t.isoFormat=Fx,t.isoParse=Ix,t.now=dn,t.timer=gn,t.timerFlush=yn,t.timeout=Zh,t.interval=Gh,t.transition=te,t.active=nd,t.interrupt=ap,t.voronoi=Pw,t.zoom=Uw,t.zoomTransform=Es,t.zoomIdentity=Rw,Object.defineProperty(t,"__esModule",{value:!0})});
diff --git a/webapp/src/main/webapp/js/homePageMaps.js b/webapp/src/main/webapp/js/homePageMaps.js
index 8610d67737..d217418828 100644
--- a/webapp/src/main/webapp/js/homePageMaps.js
+++ b/webapp/src/main/webapp/js/homePageMaps.js
@@ -1,20 +1,20 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 $(document).ready(function(){
-    
+
     var globalMapBuilt = false;
     var countryMapBuilt = false;
     var localMapBuilt = false;
     var legendIsVisible = false;
     var researchAreas = { "type": "FeatureCollection", "features": []};
     var geoResearcherCount = "0";
-    
+
     $.extend(this, urlsBase);
     $.extend(this, i18nStrings);
-    
+
     getGeoFocusResearcherCount();
-    
-    
+
+
     $('a#globalLink').click(function() {
         buildGlobalMap();
         $(this).addClass("selected");
@@ -35,7 +35,7 @@ $(document).ready(function(){
         $('a#countryLink').removeClass("selected");
         $('a#globalLink').removeClass("selected");
     });
-    
+
     function getLatLong(localName,popup) {
         var lat = [];
         jQuery.map(latLongJson, function (json) {
@@ -71,7 +71,7 @@ $(document).ready(function(){
                 if ( json.name == popup) {
                     mt = json.data["mapType"];
                 }
-            });            
+            });
         }
         return(mt);
     }
@@ -83,7 +83,7 @@ $(document).ready(function(){
                 gc = json.data["geoClass"];
             }
         });
-        if ( gc.length == 0 ) { 
+        if ( gc.length == 0 ) {
             jQuery.map(latLongJson, function (json) {
                 if ( json.name == popup) {
                     gc = json.data["geoClass"];
@@ -96,7 +96,7 @@ $(document).ready(function(){
 	function onEachFeature(feature, layer) {
 		var popupContent = "";
         var uri = "";
-        
+
 		if (feature.properties && feature.properties.popupContent) {
 			popupContent += feature.properties.popupContent;
 		}
@@ -156,7 +156,7 @@ $(document).ready(function(){
 			geoClass = feature.properties.geoClass;
 		}
 		if ( geoClass == "region") {
-		    fillColor = "#abf7f8"; 
+		    fillColor = "#abf7f8";
 		}
 		else {
 		    fillColor = "#fdf9cd"
@@ -188,16 +188,16 @@ $(document).ready(function(){
         if ( !theLatLng.equals([0,0]) && mt == "local" ) {
 		    return true;
 		}
-		return false;  
+		return false;
 	}
 
     function buildGlobalMap() {
         $('div#mapGlobal').show();
         $('div#mapCountry').hide();
         $('div#mapLocal').hide();
-        
+
         if ( !globalMapBuilt ) {
-        
+
             var mapGlobal = L.map('mapGlobal').setView([25.25, 23.20], 2);
             L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/World_Shaded_Relief/MapServer/tile\/{z}\/{y}\/{x}.png', {
     		    maxZoom: 12,
@@ -208,49 +208,49 @@ $(document).ready(function(){
             }).addTo(mapGlobal);
 
 	        L.geoJson(researchAreas, {
-    		
+
 		        filter: checkGlobalCoordinates,
 		        onEachFeature: onEachFeature,
 
 			    pointToLayer: function(feature, latlng) {
 		            return L.circleMarker(latlng, {
         		        radius: getMarkerRadius(feature),
-        		        fillColor: getMarkerFillColor(feature), 
+        		        fillColor: getMarkerFillColor(feature),
         		        color: "none",
         		        weight: 1,
         		        opacity: 0.8,
         		        fillOpacity: 0.8
         	        });
-        	    }       		
+        	    }
             }).addTo(mapGlobal);
 
     	    L.geoJson(researchAreas, {
 
-		        filter: checkGlobalCoordinates, 
+		        filter: checkGlobalCoordinates,
     	        onEachFeature: onEachFeature,
 
 		        pointToLayer: function(feature, latlng) {
 		            return L.marker(latlng, {
 				        icon: getDivIcon(feature)
 			        });
-			    }	
+			    }
             }).addTo(mapGlobal);
-            
+
             globalMapBuilt = true;
         }
-    
+
         getResearcherCount("global");
         appendLegendToLeafletContainer();
-    } 
+    }
 
     function buildCountryMap() {
         $('div#mapGlobal').hide();
         $('div#mapLocal').hide();
         $('div#mapCountry').show();
-        
+
         if ( !countryMapBuilt ) {
 
-            // CHANGE THE setView COORDINATES SO THAT THE COUNTRY YOU WANT TO 
+            // CHANGE THE setView COORDINATES SO THAT THE COUNTRY YOU WANT TO
             // DISPLAY IS CENTERED CORRECTLY.  THE COORDINATES BELOW CENTERS THE MAP ON THE U.S.
             var mapCountry = L.map('mapCountry').setView([46.0, -97.0], 3);
             L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/World_Shaded_Relief/MapServer/tile\/{z}\/{y}\/{x}.png', {
@@ -270,41 +270,41 @@ $(document).ready(function(){
     			pointToLayer: function(feature, latlng) {
     		        return L.circleMarker(latlng, {
             		    radius: getMarkerRadius(feature),
-            		    fillColor: "#fdf9cd", //fdf38a", 
+            		    fillColor: "#fdf9cd", //fdf38a",
             		    color: "none",
             		    weight: 1,
             		    opacity: 0.8,
             		    fillOpacity: 0.8
             	    });
-            	}       		
+            	}
             }).addTo(mapCountry);
 
         	L.geoJson(researchAreas, {
 
-    		    filter: checkCountryCoordinates, 
+    		    filter: checkCountryCoordinates,
         	    onEachFeature: onEachFeature,
 
     		    pointToLayer: function(feature, latlng) {
     		        return L.marker(latlng, {
     				    icon: getDivIcon(feature)
     			    });
-    			}	
+    			}
             }).addTo(mapCountry);
-            
+
             countryMapBuilt = true;
         }
-            
+
         getResearcherCount("country");
-    } 
+    }
 
     function buildLocalMap() {
         $('div#mapGlobal').hide();
         $('div#mapCountry').hide();
         $('div#mapLocal').show();
-        
+
         if ( !localMapBuilt ) {
-            
-            // CHANGE THE setView COORDINATES SO THAT THE LOCAL AREA (E.G. A STATE OR PROVINCE) YOU WANT TO 
+
+            // CHANGE THE setView COORDINATES SO THAT THE LOCAL AREA (E.G. A STATE OR PROVINCE) YOU WANT TO
             // DISPLAY IS CENTERED CORRECTLY.  THE COORDINATES BELOW CENTERS THE MAP ON NEW YORK STATE.
             var mapLocal = L.map('mapLocal').setView([42.83, -75.50], 7);
             L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/World_Shaded_Relief/MapServer/tile\/{z}\/{y}\/{x}.png', {
@@ -330,27 +330,27 @@ $(document).ready(function(){
     			pointToLayer: function(feature, latlng) {
     		        return L.circleMarker(latlng, {
             		    radius: getMarkerRadius(feature) + 3,
-            		    fillColor: "#fdf9cd", 
+            		    fillColor: "#fdf9cd",
             		    color: "none",
             		    weight: 1,
             		    opacity: 0.8,
             		    fillOpacity: 0.8
             	    });
-            	}       		
+            	}
             }).addTo(mapLocal);
 
         	L.geoJson(researchAreas, {
 
-    		    filter: checkLocalCoordinates, 
+    		    filter: checkLocalCoordinates,
         	    onEachFeature: onEachFeature,
 
     		    pointToLayer: function(feature, latlng) {
     		        return L.marker(latlng, {
     				    icon: getDivIcon(feature)
     			    });
-    			}	
+    			}
             }).addTo(mapLocal);
-                        
+
             localMapBuilt = true;
         }
 
@@ -389,7 +389,7 @@ $(document).ready(function(){
                     $('div#timeIndicatorGeo').hide();
                 }
             }
-       });        
+       });
     }
 
     function getGeoFocusResearcherCount() {
@@ -400,7 +400,7 @@ $(document).ready(function(){
                 action: "getGeoFocusResearcherCount",
             },
             complete: function(xhr, status) {
-                
+
                 var results = $.parseJSON(xhr.responseText);
                 // there will only ever be one key/value pair
                 if ( results != null ) {
@@ -408,11 +408,11 @@ $(document).ready(function(){
                 }
                 getGeoJsonForMaps();
             }
-       });        
+       });
     }
 
     function getResearcherCount(area) {
-        
+
         var localResearcherCount = 0;
         var areaCount = 0;
         var displayCount = "";
@@ -430,14 +430,14 @@ $(document).ready(function(){
         $.each(researchAreas.features, function() {
             if ( this.properties.mapType == area ) {
                 localResearcherCount = localResearcherCount + this.properties.html ;
-                areaCount = areaCount + 1; 
+                areaCount = areaCount + 1;
             }
         });
 
         if ( areaCount == 1 && text == " states.") {
             text = " " + i18nStrings.stateString;
         }
-        
+
         if ( area == "global" ) {
             if ( geoResearcherCount == 1 ) {
                 researcherText = " " + i18nStrings.researcherString + " " + i18nStrings.inString;
@@ -445,7 +445,7 @@ $(document).ready(function(){
             else {
                 researcherText = " " + i18nStrings.researchersString + " " + i18nStrings.inString;
             }
-            
+
             displayCount = geoResearcherCount;
         }
         else {
@@ -455,27 +455,27 @@ $(document).ready(function(){
             else {
                 researcherText = " " + i18nStrings.researchersString + " " + i18nStrings.inString;
             }
-            
+
             displayCount = localResearcherCount;
         }
 
-        $('div#researcherTotal').html("<font style='font-size:1.05em;color:#167093'>" 
-                                        + displayCount 
-                                        + "</font> " + researcherText + " <font style='font-size:1.05em;color:#167093'>" 
+        $('div#researcherTotal').html("<font style='font-size:1.05em;color:#167093'>"
+                                        + displayCount
+                                        + "</font> " + researcherText + " <font style='font-size:1.05em;color:#167093'>"
                                         + areaCount + "</font>" + text);
     }
     function appendLegendToLeafletContainer() {
         if ( !this.legendIsVisible ) {
             var htmlString = "<div class='leaflet-bottom leaflet-left' style='padding:0 0 8px 12px'><ul><li>"
-                        + "<img alt='" + i18nStrings.regionsString + "' src='" + urlsBase 
-                        + "/images/map_legend_countries.png' style='margin-right:5px'><font style='color:#555'>" 
-                        + i18nStrings.countriesString + "</font></li><li><img alt='" + i18nStrings.regionsString 
-                        + "' src='" + urlsBase 
-                        + "/images/map_legend_regions.png' style='margin-right:5px'><font style='color:#555'>" 
+                        + "<img alt='" + i18nStrings.regionsString + "' src='" + urlsBase
+                        + "/images/map_legend_countries.png' style='margin-right:5px'><font style='color:#555'>"
+                        + i18nStrings.countriesString + "</font></li><li><img alt='" + i18nStrings.regionsString
+                        + "' src='" + urlsBase
+                        + "/images/map_legend_regions.png' style='margin-right:5px'><font style='color:#555'>"
                         + i18nStrings.regionsString + "</font></li></ul></div>";
             $('div.leaflet-control-container').append(htmlString);
             this.legendIsVisible = true;
         }
     }
-    
-}); 
+
+});
diff --git a/webapp/src/main/webapp/js/homePageUtils.js b/webapp/src/main/webapp/js/homePageUtils.js
index ef6809a1f0..c2bdb68d85 100644
--- a/webapp/src/main/webapp/js/homePageUtils.js
+++ b/webapp/src/main/webapp/js/homePageUtils.js
@@ -1,39 +1,39 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 $(document).ready(function(){
-    
+
     $.extend(this, urlsBase);
     $.extend(this, facultyMemberCount);
     $.extend(this, i18nStrings);
 
     var retryCount = 0;
-    
+
     // this will ensure that the hidden classgroup input is cleared if the back button is used
     // to return to th ehome page from the search results
-    $('input[name="classgroup"]').val("");    
+    $('input[name="classgroup"]').val("");
 
-    getFacultyMembers();  
-    buildAcademicDepartments(); 
+    getFacultyMembers();
+    buildAcademicDepartments();
 
     if ( $('section#home-geo-focus').length == 0 ) {
         $('section#home-stats').css("display","inline-block").css("margin-top","20px");
-    } 
-        
+    }
+
     function getFacultyMembers() {
         var individualList = "";
 
-        if ( facultyMemberCount > 0 ) {        
+        if ( facultyMemberCount > 0 ) {
             // determine the row at which to start the search query
             var rowStart = Math.floor((Math.random()*facultyMemberCount));
             var diff;
             var pageSize = 4; // the number of faculty to display on the home page
-            
+
             // could have fewer than 4 in a test or dev environment
             if ( facultyMemberCount < pageSize ) {
                 pageSize = facultyMemberCount;
             }
 
-            // in case the random number is equal to or within 3 of the facultyMemberCount 
+            // in case the random number is equal to or within 3 of the facultyMemberCount
             // subtract 1 from the facultyMemberCount because the search rows begin at 0, not 1
             if ( (rowStart + (pageSize-1)) > (facultyMemberCount-1) ) {
                 diff = (rowStart + (pageSize-1)) - (facultyMemberCount-1);
@@ -53,7 +53,7 @@ $(document).ready(function(){
             url += "&page=" + rowStart + "&pageSize=" + pageSize;
 
             $.getJSON(url, function(results) {
-            
+
                 if ( results == null || results.individuals.length == 0 ) {
                     if ( retryCount < 5 ) {
                         retryCount = retryCount + 1;
@@ -64,7 +64,7 @@ $(document).ready(function(){
                         $('div#tempSpacing').hide();
                         $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList);
                     }
-                } 
+                }
                 else {
                     var vclassName = results.vclass.name;
                     $.each(results.individuals, function(i, item) {
@@ -73,13 +73,13 @@ $(document).ready(function(){
                     });
                     $('div#tempSpacing').hide();
                     $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList);
-                
+
                     $.each($('div#research-faculty-mbrs ul#facultyThumbs li.individual'), function() {
                         if ( $(this).children('img').length == 0 ) {
                             var imgHtml = "<img width='60' alt='" + i18nStrings.placeholderImage + "' src='" + urlsBase + "/images/placeholders/person.bordered.thumbnail.jpg'>";
                             $(this).prepend(imgHtml);
                         }
-                        else { 
+                        else {
                             $(this).children('img').on("load", function() {
                                 adjustImageHeight($(this));
                             });
@@ -87,7 +87,7 @@ $(document).ready(function(){
                     });
                     var viewMore = "<ul id='viewMoreFac'><li><a href='"
                                 + urlsBase
-                                + "/people#http://vivoweb.org/ontology/core#FacultyMember' alt='" 
+                                + "/people#http://vivoweb.org/ontology/core#FacultyMember' alt='"
                                 + i18nStrings.viewAllFaculty + "'>"
                                 + i18nStrings.viewAllString + "</a></li?</ul>";
                     $('div#research-faculty-mbrs').append(viewMore);
@@ -117,7 +117,7 @@ $(document).ready(function(){
         var deptNbr = academicDepartments.length;
         var html = "<ul>";
         var index = Math.floor((Math.random()*deptNbr)+1)-1;
-        
+
         if ( deptNbr == 0 ) {
             html = "<ul style='list-style:none'><p><li style='padding-top:0.3em'>"
                    + i18nStrings.noDepartmentsFound + "</li></p></ul>";
@@ -134,8 +134,8 @@ $(document).ready(function(){
                 //Check to see if this index hasn't already been employed
                 if(!indexFound) {
                 	//if this index hasn't already been employed then utilize it
-                	 html += "<li><a href='" + urlsBase + "/individual?uri=" 
-                     + academicDepartments[index].uri + "'>" 
+                	 html += "<li><a href='" + urlsBase + "/individual?uri="
+                     + academicDepartments[index].uri + "'>"
                      + academicDepartments[index].name + "</a></li>";
                 	 //add this index to the set of already used indices
                 	 indicesUsed[index] = true;
@@ -146,20 +146,20 @@ $(document).ready(function(){
         }
         else {
             for ( var i=0;i<deptNbr;i++) {
-                html += "<li><a href='" + urlsBase + "/individual?uri=" 
-                        + academicDepartments[i].uri + "'>" 
+                html += "<li><a href='" + urlsBase + "/individual?uri="
+                        + academicDepartments[i].uri + "'>"
                         + academicDepartments[i].name + "</a></li>";
             }
         }
         if ( deptNbr > 0 ) {
             html += "</ul><ul style='list-style:none'>"
-                    + "<li style='font-size:0.9em;text-align:right;padding: 6px 16px 0 0'><a href='" 
-                    + urlsBase 
-                    + "/organizations#http://vivoweb.org/ontology/core#AcademicDepartment' alt='" 
-                    + i18nStrings.viewAllDepartments + "'>" 
+                    + "<li style='font-size:0.9em;text-align:right;padding: 6px 16px 0 0'><a href='"
+                    + urlsBase
+                    + "/organizations#http://vivoweb.org/ontology/core#AcademicDepartment' alt='"
+                    + i18nStrings.viewAllDepartments + "'>"
                     + i18nStrings.viewAllString + "</a></li></ul>";
         }
         $('div#academic-depts').html(html);
     }
-    
-}); 
+
+});
diff --git a/webapp/src/main/webapp/js/individual/individualProfilePageType.js b/webapp/src/main/webapp/js/individual/individualProfilePageType.js
index 17a6d01892..2758549e1a 100644
--- a/webapp/src/main/webapp/js/individual/individualProfilePageType.js
+++ b/webapp/src/main/webapp/js/individual/individualProfilePageType.js
@@ -3,14 +3,14 @@
 var profilePageType = {
 
     /* *** Initial page setup *** */
-   
+
     onLoad: function() {
-    
-            this.mixIn();   
+
+            this.mixIn();
             // in the event that the individual does not have a profile type set,
             // the controller returns "none" and the select is set to "standard".
             // we need to distinguish these when it comes time to do a retraction or
-            // not. So "default" = the type defined by the triple; "selected" = 
+            // not. So "default" = the type defined by the triple; "selected" =
             // the selected option.
             var selectedProfileType = "";
             this.initPage();
@@ -25,14 +25,14 @@ var profilePageType = {
 
     // Initial page setup. Called only at page load.
     initPage: function() {
-        
+
         profilePageType.selectedProfileType = $('select#profilePageType').val();
         this.bindEventListeners();
-                       
+
     },
-    
+
     bindEventListeners: function() {
-               
+
         $('select#profilePageType').change( function() {
             profilePageType.processSelection($('select#profilePageType').val())
         });
@@ -45,7 +45,7 @@ var profilePageType = {
         var retract = "";
         var add = "<" + profilePageType.individualUri + "> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasDefaultProfilePageType> "
                       + "<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#" + newType + "> .";
-        
+
         if ( profilePageType.defaultProfileType != "none" ) {
             retract = "<" + profilePageType.individualUri + "> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasDefaultProfilePageType> "
                           + "<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#" + profilePageType.selectedProfileType + "> .";
@@ -53,7 +53,7 @@ var profilePageType = {
 
         $.ajax({
             url: profilePageType.processingUrl,
-            type: 'POST', 
+            type: 'POST',
             data: {
                 additions: add,
                 retractions: retract
@@ -61,7 +61,7 @@ var profilePageType = {
             dataType: 'json',
             context: newType, // context for callback
             complete: function(request, status) {
-                
+
                 if (status == 'success') {
                     location.reload(true);
                 }
@@ -70,10 +70,10 @@ var profilePageType = {
                     $('select#profilePageType').val(profilePageType.selectedProfileType);
                 }
             }
-        });        
+        });
     }
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     profilePageType.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/js/individual/individualQtipBubble.js b/webapp/src/main/webapp/js/individual/individualQtipBubble.js
index 974acafea7..78d484acc9 100644
--- a/webapp/src/main/webapp/js/individual/individualQtipBubble.js
+++ b/webapp/src/main/webapp/js/individual/individualQtipBubble.js
@@ -2,14 +2,14 @@
 
 $(document).ready(function(){
     // This function creates and styles the "qTip" tooltip that displays the bubble text when the user hovers
-    // over the research area "group" icon. 
-    
+    // over the research area "group" icon.
+
     $.extend(this, i18nStrings);
 
     $('head').append('<style id="researchAreaCSS">.qtip { font-size: 14px; max-width: none !important; } .researchAreaTip { background: url(' + imagesPath + '/individual/researchAreaBubble.png) no-repeat; } </style>');
 
     $('#researchAreaIcon').each(function()
-    {   
+    {
         $(this).qtip(
         {
             prerender: true,
diff --git a/webapp/src/main/webapp/js/individual/individualUtils.js b/webapp/src/main/webapp/js/individual/individualUtils.js
index 430cf057bf..85014189c9 100644
--- a/webapp/src/main/webapp/js/individual/individualUtils.js
+++ b/webapp/src/main/webapp/js/individual/individualUtils.js
@@ -14,16 +14,16 @@ $(document).ready(function(){
 
     // "more"/"less" HTML truncator for showing more or less content in data property core:overview
     $('.overview-value').truncate({max_length: 500});
-        
+
     // Change background color button when verbose mode is off
     $('a#verbosePropertySwitch:contains("' + i18nStrings.verboseTurnOff + '")').addClass('verbose-off');
-    
+
     // Reveal vCard QR code when QR icon is clicked
     $('#qrIcon, .qrCloseLink').click(function() {
-	
-		
+
+
 		// only create the img the first time, so check if it already exists
-		if ( !$('img#codeImage').length ) {		
+		if ( !$('img#codeImage').length ) {
 			$.ajax({
             	url: baseUrl + "/qrCodeAjax",
             	dataType: "json",
@@ -63,38 +63,38 @@ $(document).ready(function(){
 								vcard += "PHOTO;VALUE=URL;TYPE=JPG:" + individualPhoto + String.fromCharCode(13);
 							}
 							vcard += "END:VCARD";
-							
+
 							spanStr = "<a title='${i18n().export_qr_codes}' href='"
 							          + exportQrCodeUrl + "'>"
 							          + "<img id='codeImage' src='https://chart.googleapis.com/chart?cht=qr&amp;chs=125x125&amp;chl="
-									  + vcard 
+									  + vcard
 									  + "&amp;choe=UTF-8'/>"
 									  + "</a>";
-									
+
 							$('#qrCodeImage').prepend(spanStr);
 							$('#qrCodeImage').toggleClass('hidden');
 						}
                  	}
             	}
-       		});        
-        } 
-		else { 
+       		});
+        }
+		else {
 			$('#qrCodeImage').toggleClass('hidden');
 		}
     });
 
     // For pubs and grants on the foaf:person profile, and affiliated people
-    // on the foaf:organization profile -- if a pub/grant/person has been hidden 
+    // on the foaf:organization profile -- if a pub/grant/person has been hidden
     // via the "manage" link, we need to ensure that the subclass heading gets removed
     // if there are no items to display for that subclass.
     $.each($('h3'), function() {
         if ( $(this).next().attr('class') == "subclass-property-list hideThis" ) {
-            if ( $(this).next().children().length == 0 ) {       
+            if ( $(this).next().children().length == 0 ) {
                     $(this).closest('li').remove();
             }
         }
     });
-        
+
     // if there are no selected pubs, hide the manage link; same for grants
     // and affiliated people on the org profile page
     if ( $('ul#relatedBy-Authorship-List').children('li').length < 1 && $('h3#relatedBy-Authorship').attr('class') != "hiddenPubs" ) {
@@ -112,12 +112,12 @@ $(document).ready(function(){
     if ( $('ul#relatedBy-Position-List').children('li').length < 1 && $('h3#relatedBy-Position').attr('class') != "hiddenPeople" ) {
         $('a#managePeopleLink').hide();
     }
-   
+
     // if there are webpages but no contacts (email/phone), extend
     // the webpage border the full width. Used with "2 column" profile view.
     if ( $('h2#contactHeading').length < 1 ) {
         if ( $('div#webpagesContainer').length ) {
              $('div#webpagesContainer').css('width', '100%').css('clear','both');
         }
-    }    
+    }
 });
diff --git a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap.js
index 417aec3d07..6276732fd0 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap.js
@@ -155,7 +155,7 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
 	};
 
 	// IE9 throws an 'unknown error' if document.activeElement is used
-	// inside an iframe or frame. 
+	// inside an iframe or frame.
 	var activeEl;
 
 	try {
@@ -179,4 +179,4 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
 
 
 return DataTable;
-}));
\ No newline at end of file
+}));
diff --git a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap4.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap4.js
index e49d95f33b..992d76198c 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap4.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.bootstrap4.js
@@ -157,7 +157,7 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
 	};
 
 	// IE9 throws an 'unknown error' if document.activeElement is used
-	// inside an iframe or frame. 
+	// inside an iframe or frame.
 	var activeEl;
 
 	try {
@@ -181,4 +181,4 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
 
 
 return DataTable;
-}));
\ No newline at end of file
+}));
diff --git a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.material.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.material.js
index 93d62aaab9..559173b76d 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.material.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.material.js
@@ -164,7 +164,7 @@ DataTable.ext.renderer.pageButton.material = function ( settings, host, idx, but
 	};
 
 	// IE9 throws an 'unknown error' if document.activeElement is used
-	// inside an iframe or frame. 
+	// inside an iframe or frame.
 	var activeEl;
 
 	try {
@@ -188,4 +188,4 @@ DataTable.ext.renderer.pageButton.material = function ( settings, host, idx, but
 
 
 return DataTable;
-}));
\ No newline at end of file
+}));
diff --git a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.semanticui.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.semanticui.js
index 97f797ec0c..ffb7074f5f 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.semanticui.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.semanticui.js
@@ -166,7 +166,7 @@ DataTable.ext.renderer.pageButton.semanticUI = function ( settings, host, idx, b
 	};
 
 	// IE9 throws an 'unknown error' if document.activeElement is used
-	// inside an iframe or frame. 
+	// inside an iframe or frame.
 	var activeEl;
 
 	try {
@@ -205,4 +205,4 @@ $(document).on( 'init.dt', function (e, ctx) {
 
 
 return DataTable;
-}));
\ No newline at end of file
+}));
diff --git a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.uikit.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.uikit.js
index 2e617613b3..e5749d4cf9 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.uikit.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/dataTables.uikit.js
@@ -149,7 +149,7 @@ DataTable.ext.renderer.pageButton.uikit = function ( settings, host, idx, button
 	};
 
 	// IE9 throws an 'unknown error' if document.activeElement is used
-	// inside an iframe or frame. 
+	// inside an iframe or frame.
 	var activeEl;
 
 	try {
@@ -173,4 +173,4 @@ DataTable.ext.renderer.pageButton.uikit = function ( settings, host, idx, button
 
 
 return DataTable;
-}));
\ No newline at end of file
+}));
diff --git a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/jquery.dataTables.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/jquery.dataTables.js
index 5b032aeec2..c66b3d9681 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/jquery.dataTables.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.10.12/jquery.dataTables.js
@@ -133,8 +133,8 @@
 		{
 			return this.api(true).$( sSelector, oOpts );
 		};
-		
-		
+
+
 		/**
 		 * Almost identical to $ in operation, but in this case returns the data for the matched
 		 * rows - as such, the jQuery selector used should match TR row nodes or TD/TH cell nodes
@@ -187,8 +187,8 @@
 		{
 			return this.api(true).rows( sSelector, oOpts ).data();
 		};
-		
-		
+
+
 		/**
 		 * Create a DataTables Api instance, with the currently selected tables for
 		 * the Api's context.
@@ -206,8 +206,8 @@
 				) :
 				new _Api( this );
 		};
-		
-		
+
+
 		/**
 		 * Add a single new row or multiple rows of data to the table. Please note
 		 * that this is suitable for client-side processing only - if you are using
@@ -249,20 +249,20 @@
 		this.fnAddData = function( data, redraw )
 		{
 			var api = this.api( true );
-		
+
 			/* Check if we want to add multiple rows or not */
 			var rows = $.isArray(data) && ( $.isArray(data[0]) || $.isPlainObject(data[0]) ) ?
 				api.rows.add( data ) :
 				api.row.add( data );
-		
+
 			if ( redraw === undefined || redraw ) {
 				api.draw();
 			}
-		
+
 			return rows.flatten().toArray();
 		};
-		
-		
+
+
 		/**
 		 * This function will make DataTables recalculate the column sizes, based on the data
 		 * contained in the table and the sizes applied to the columns (in the DOM, CSS or
@@ -289,7 +289,7 @@
 			var api = this.api( true ).columns.adjust();
 			var settings = api.settings()[0];
 			var scroll = settings.oScroll;
-		
+
 			if ( bRedraw === undefined || bRedraw ) {
 				api.draw( false );
 			}
@@ -298,8 +298,8 @@
 				_fnScrollDraw( settings );
 			}
 		};
-		
-		
+
+
 		/**
 		 * Quickly and simply clear a table
 		 *  @param {bool} [bRedraw=true] redraw the table or not
@@ -317,13 +317,13 @@
 		this.fnClearTable = function( bRedraw )
 		{
 			var api = this.api( true ).clear();
-		
+
 			if ( bRedraw === undefined || bRedraw ) {
 				api.draw();
 			}
 		};
-		
-		
+
+
 		/**
 		 * The exact opposite of 'opening' a row, this function will close any rows which
 		 * are currently 'open'.
@@ -352,8 +352,8 @@
 		{
 			this.api( true ).row( nTr ).child.hide();
 		};
-		
-		
+
+
 		/**
 		 * Remove a row for the table
 		 *  @param {mixed} target The index of the row from aoData to be deleted, or
@@ -378,21 +378,21 @@
 			var rows = api.rows( target );
 			var settings = rows.settings()[0];
 			var data = settings.aoData[ rows[0][0] ];
-		
+
 			rows.remove();
-		
+
 			if ( callback ) {
 				callback.call( this, settings, data );
 			}
-		
+
 			if ( redraw === undefined || redraw ) {
 				api.draw();
 			}
-		
+
 			return data;
 		};
-		
-		
+
+
 		/**
 		 * Restore the table to it's original state in the DOM by removing all of DataTables
 		 * enhancements, alterations to the DOM structure of the table and event listeners.
@@ -411,8 +411,8 @@
 		{
 			this.api( true ).destroy( remove );
 		};
-		
-		
+
+
 		/**
 		 * Redraw the table
 		 *  @param {bool} [complete=true] Re-filter and resort (if enabled) the table before the draw.
@@ -433,8 +433,8 @@
 			// into account the new data, but can hold position.
 			this.api( true ).draw( complete );
 		};
-		
-		
+
+
 		/**
 		 * Filter the input based on data
 		 *  @param {string} sInput String to filter the table on
@@ -457,18 +457,18 @@
 		this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal, bCaseInsensitive )
 		{
 			var api = this.api( true );
-		
+
 			if ( iColumn === null || iColumn === undefined ) {
 				api.search( sInput, bRegex, bSmart, bCaseInsensitive );
 			}
 			else {
 				api.column( iColumn ).search( sInput, bRegex, bSmart, bCaseInsensitive );
 			}
-		
+
 			api.draw();
 		};
-		
-		
+
+
 		/**
 		 * Get the data for the whole table, an individual row or an individual cell based on the
 		 * provided parameters.
@@ -509,19 +509,19 @@
 		this.fnGetData = function( src, col )
 		{
 			var api = this.api( true );
-		
+
 			if ( src !== undefined ) {
 				var type = src.nodeName ? src.nodeName.toLowerCase() : '';
-		
+
 				return col !== undefined || type == 'td' || type == 'th' ?
 					api.cell( src, col ).data() :
 					api.row( src ).data() || null;
 			}
-		
+
 			return api.data().toArray();
 		};
-		
-		
+
+
 		/**
 		 * Get an array of the TR nodes that are used in the table's body. Note that you will
 		 * typically want to use the '$' API method in preference to this as it is more
@@ -543,13 +543,13 @@
 		this.fnGetNodes = function( iRow )
 		{
 			var api = this.api( true );
-		
+
 			return iRow !== undefined ?
 				api.row( iRow ).node() :
 				api.rows().nodes().flatten().toArray();
 		};
-		
-		
+
+
 		/**
 		 * Get the array indexes of a particular cell from it's DOM element
 		 * and column index including hidden columns
@@ -582,13 +582,13 @@
 		{
 			var api = this.api( true );
 			var nodeName = node.nodeName.toUpperCase();
-		
+
 			if ( nodeName == 'TR' ) {
 				return api.row( node ).index();
 			}
 			else if ( nodeName == 'TD' || nodeName == 'TH' ) {
 				var cell = api.cell( node ).index();
-		
+
 				return [
 					cell.row,
 					cell.columnVisible,
@@ -597,8 +597,8 @@
 			}
 			return null;
 		};
-		
-		
+
+
 		/**
 		 * Check to see if a row is 'open' or not.
 		 *  @param {node} nTr the table row to check
@@ -626,8 +626,8 @@
 		{
 			return this.api( true ).row( nTr ).child.isShown();
 		};
-		
-		
+
+
 		/**
 		 * This function will place a new row directly after a row which is currently
 		 * on display on the page, with the HTML contents that is passed into the
@@ -666,8 +666,8 @@
 				.show()
 				.child()[0];
 		};
-		
-		
+
+
 		/**
 		 * Change the pagination - provides the internal logic for pagination in a simple API
 		 * function. With this function you can have a DataTables table go to the next,
@@ -687,13 +687,13 @@
 		this.fnPageChange = function ( mAction, bRedraw )
 		{
 			var api = this.api( true ).page( mAction );
-		
+
 			if ( bRedraw === undefined || bRedraw ) {
 				api.draw(false);
 			}
 		};
-		
-		
+
+
 		/**
 		 * Show a particular column
 		 *  @param {int} iCol The column whose display should be changed
@@ -713,13 +713,13 @@
 		this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
 		{
 			var api = this.api( true ).column( iCol ).visible( bShow );
-		
+
 			if ( bRedraw === undefined || bRedraw ) {
 				api.columns.adjust().draw();
 			}
 		};
-		
-		
+
+
 		/**
 		 * Get the settings for a particular table for external manipulation
 		 *  @returns {object} DataTables settings object. See
@@ -740,8 +740,8 @@
 		{
 			return _fnSettingsFromNode( this[_ext.iApiIndex] );
 		};
-		
-		
+
+
 		/**
 		 * Sort the table by a particular column
 		 *  @param {int} iCol the data index to sort on. Note that this will not match the
@@ -761,8 +761,8 @@
 		{
 			this.api( true ).order( aaSort ).draw();
 		};
-		
-		
+
+
 		/**
 		 * Attach a sort listener to an element for a given column
 		 *  @param {node} nNode the element to attach the sort listener to
@@ -783,8 +783,8 @@
 		{
 			this.api( true ).order.listener( nNode, iColumn, fnCallback );
 		};
-		
-		
+
+
 		/**
 		 * Update a table cell or row - this method will accept either a single value to
 		 * update the cell with, an array of values with one element for each column or
@@ -810,25 +810,25 @@
 		this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
 		{
 			var api = this.api( true );
-		
+
 			if ( iColumn === undefined || iColumn === null ) {
 				api.row( mRow ).data( mData );
 			}
 			else {
 				api.cell( mRow, iColumn ).data( mData );
 			}
-		
+
 			if ( bAction === undefined || bAction ) {
 				api.columns.adjust();
 			}
-		
+
 			if ( bRedraw === undefined || bRedraw ) {
 				api.draw();
 			}
 			return 0;
 		};
-		
-		
+
+
 		/**
 		 * Provide a common method for plug-ins to check the version of DataTables being used, in order
 		 * to ensure compatibility.
@@ -847,7 +847,7 @@
 		 *    } );
 		 */
 		this.fnVersionCheck = _ext.fnVersionCheck;
-		
+
 
 		var _that = this;
 		var emptyInit = options === undefined;
@@ -880,40 +880,40 @@
 			var bInitHandedOff = false;
 			var defaults = DataTable.defaults;
 			var $this = $(this);
-			
-			
+
+
 			/* Sanity check */
 			if ( this.nodeName.toLowerCase() != 'table' )
 			{
 				_fnLog( null, 0, 'Non-table node initialisation ('+this.nodeName+')', 2 );
 				return;
 			}
-			
+
 			/* Backwards compatibility for the defaults */
 			_fnCompatOpts( defaults );
 			_fnCompatCols( defaults.column );
-			
+
 			/* Convert the camel-case defaults to Hungarian */
 			_fnCamelToHungarian( defaults, defaults, true );
 			_fnCamelToHungarian( defaults.column, defaults.column, true );
-			
+
 			/* Setting up the initialisation object */
 			_fnCamelToHungarian( defaults, $.extend( oInit, $this.data() ) );
-			
-			
-			
+
+
+
 			/* Check to see if we are re-initialising a table */
 			var allSettings = DataTable.settings;
 			for ( i=0, iLen=allSettings.length ; i<iLen ; i++ )
 			{
 				var s = allSettings[i];
-			
+
 				/* Base check on table node */
 				if ( s.nTable == this || s.nTHead.parentNode == this || (s.nTFoot && s.nTFoot.parentNode == this) )
 				{
 					var bRetrieve = oInit.bRetrieve !== undefined ? oInit.bRetrieve : defaults.bRetrieve;
 					var bDestroy = oInit.bDestroy !== undefined ? oInit.bDestroy : defaults.bDestroy;
-			
+
 					if ( emptyInit || bRetrieve )
 					{
 						return s.oInstance;
@@ -929,7 +929,7 @@
 						return;
 					}
 				}
-			
+
 				/* If the element we are initialising has the same ID as a table which was previously
 				 * initialised, but the table nodes don't match (from before) then we destroy the old
 				 * instance by simply deleting it. This is under the assumption that the table has been
@@ -941,14 +941,14 @@
 					break;
 				}
 			}
-			
+
 			/* Ensure the table has an ID - required for accessibility */
 			if ( sId === null || sId === "" )
 			{
 				sId = "DataTables_Table_"+(DataTable.ext._unique++);
 				this.id = sId;
 			}
-			
+
 			/* Create the settings object for this table and set some of the default parameters */
 			var oSettings = $.extend( true, {}, DataTable.models.oSettings, {
 				"sDestroyWidth": $this[0].style.width,
@@ -958,33 +958,33 @@
 			oSettings.nTable = this;
 			oSettings.oApi   = _that.internal;
 			oSettings.oInit  = oInit;
-			
+
 			allSettings.push( oSettings );
-			
+
 			// Need to add the instance after the instance after the settings object has been added
 			// to the settings array, so we can self reference the table instance if more than one
 			oSettings.oInstance = (_that.length===1) ? _that : $this.dataTable();
-			
+
 			// Backwards compatibility, before we apply all the defaults
 			_fnCompatOpts( oInit );
-			
+
 			if ( oInit.oLanguage )
 			{
 				_fnLanguageCompat( oInit.oLanguage );
 			}
-			
+
 			// If the length menu is given, but the init display length is not, use the length menu
 			if ( oInit.aLengthMenu && ! oInit.iDisplayLength )
 			{
 				oInit.iDisplayLength = $.isArray( oInit.aLengthMenu[0] ) ?
 					oInit.aLengthMenu[0][0] : oInit.aLengthMenu[0];
 			}
-			
+
 			// Apply the defaults and init options to make a single init object will all
 			// options defined from defaults and instance options.
 			oInit = _fnExtend( $.extend( true, {}, defaults ), oInit );
-			
-			
+
+
 			// Map the initialisation options onto the settings object
 			_fnMap( oSettings.oFeatures, oInit, [
 				"bPaginate",
@@ -1033,7 +1033,7 @@
 				[ "bScrollCollapse", "bCollapse" ]
 			] );
 			_fnMap( oSettings.oLanguage, oInit, "fnInfoCallback" );
-			
+
 			/* Callback functions which are array driven */
 			_fnCallbackReg( oSettings, 'aoDrawCallback',       oInit.fnDrawCallback,      'user' );
 			_fnCallbackReg( oSettings, 'aoServerParams',       oInit.fnServerParams,      'user' );
@@ -1046,14 +1046,14 @@
 			_fnCallbackReg( oSettings, 'aoFooterCallback',     oInit.fnFooterCallback,    'user' );
 			_fnCallbackReg( oSettings, 'aoInitComplete',       oInit.fnInitComplete,      'user' );
 			_fnCallbackReg( oSettings, 'aoPreDrawCallback',    oInit.fnPreDrawCallback,   'user' );
-			
+
 			oSettings.rowIdFn = _fnGetObjectDataFn( oInit.rowId );
-			
+
 			/* Browser support detection */
 			_fnBrowserDetect( oSettings );
-			
+
 			var oClasses = oSettings.oClasses;
-			
+
 			// @todo Remove in 1.11
 			if ( oInit.bJQueryUI )
 			{
@@ -1061,13 +1061,13 @@
 				 * you want to have multiple tables with multiple independent classes
 				 */
 				$.extend( oClasses, DataTable.ext.oJUIClasses, oInit.oClasses );
-			
+
 				if ( oInit.sDom === defaults.sDom && defaults.sDom === "lfrtip" )
 				{
 					/* Set the DOM to use a layout suitable for jQuery UI's theming */
 					oSettings.sDom = '<"H"lfr>t<"F"ip>';
 				}
-			
+
 				if ( ! oSettings.renderer ) {
 					oSettings.renderer = 'jqueryui';
 				}
@@ -1080,15 +1080,15 @@
 				$.extend( oClasses, DataTable.ext.classes, oInit.oClasses );
 			}
 			$this.addClass( oClasses.sTable );
-			
-			
+
+
 			if ( oSettings.iInitDisplayStart === undefined )
 			{
 				/* Display start point, taking into account the save saving */
 				oSettings.iInitDisplayStart = oInit.iDisplayStart;
 				oSettings._iDisplayStart = oInit.iDisplayStart;
 			}
-			
+
 			if ( oInit.iDeferLoading !== null )
 			{
 				oSettings.bDeferLoading = true;
@@ -1096,11 +1096,11 @@
 				oSettings._iRecordsDisplay = tmp ? oInit.iDeferLoading[0] : oInit.iDeferLoading;
 				oSettings._iRecordsTotal = tmp ? oInit.iDeferLoading[1] : oInit.iDeferLoading;
 			}
-			
+
 			/* Language definitions */
 			var oLanguage = oSettings.oLanguage;
 			$.extend( true, oLanguage, oInit.oLanguage );
-			
+
 			if ( oLanguage.sUrl !== "" )
 			{
 				/* Get the language definitions from a file - because this Ajax call makes the language
@@ -1123,7 +1123,7 @@
 				} );
 				bInitHandedOff = true;
 			}
-			
+
 			/*
 			 * Stripes
 			 */
@@ -1134,7 +1134,7 @@
 					oClasses.sStripeEven
 				];
 			}
-			
+
 			/* Remove row stripe classes if they are already on the table row */
 			var stripeClasses = oSettings.asStripeClasses;
 			var rowOne = $this.children('tbody').find('tr').eq(0);
@@ -1144,7 +1144,7 @@
 				$('tbody tr', this).removeClass( stripeClasses.join(' ') );
 				oSettings.asDestroyStripes = stripeClasses.slice();
 			}
-			
+
 			/*
 			 * Columns
 			 * See if we should load columns automatically or use defined ones
@@ -1157,7 +1157,7 @@
 				_fnDetectHeader( oSettings.aoHeader, nThead[0] );
 				anThs = _fnGetUniqueThs( oSettings );
 			}
-			
+
 			/* If not given a column array, generate one with nulls */
 			if ( oInit.aoColumns === null )
 			{
@@ -1171,18 +1171,18 @@
 			{
 				aoColumnsInit = oInit.aoColumns;
 			}
-			
+
 			/* Add the columns */
 			for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
 			{
 				_fnAddColumn( oSettings, anThs ? anThs[i] : null );
 			}
-			
+
 			/* Apply the column definitions */
 			_fnApplyColumnDefs( oSettings, oInit.aoColumnDefs, aoColumnsInit, function (iCol, oDef) {
 				_fnColumnOptions( oSettings, iCol, oDef );
 			} );
-			
+
 			/* HTML5 attribute detection - build an mData object automatically if the
 			 * attributes are found
 			 */
@@ -1190,14 +1190,14 @@
 				var a = function ( cell, name ) {
 					return cell.getAttribute( 'data-'+name ) !== null ? name : null;
 				};
-			
+
 				$( rowOne[0] ).children('th, td').each( function (i, cell) {
 					var col = oSettings.aoColumns[i];
-			
+
 					if ( col.mData === i ) {
 						var sort = a( cell, 'sort' ) || a( cell, 'order' );
 						var filter = a( cell, 'filter' ) || a( cell, 'search' );
-			
+
 						if ( sort !== null || filter !== null ) {
 							col.mData = {
 								_:      i+'.display',
@@ -1205,15 +1205,15 @@
 								type:   sort !== null   ? i+'.@data-'+sort   : undefined,
 								filter: filter !== null ? i+'.@data-'+filter : undefined
 							};
-			
+
 							_fnColumnOptions( oSettings, i );
 						}
 					}
 				} );
 			}
-			
+
 			var features = oSettings.oFeatures;
-			
+
 			/* Must be done after everything which can be overridden by the state saving! */
 			if ( oInit.bStateSave )
 			{
@@ -1221,13 +1221,13 @@
 				_fnLoadState( oSettings, oInit );
 				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' );
 			}
-			
-			
+
+
 			/*
 			 * Sorting
 			 * @todo For modularisation (1.11) this needs to do into a sort start up handler
 			 */
-			
+
 			// If aaSorting is not defined, then we use the first indicator in asSorting
 			// in case that has been altered, so the default sort reflects that option
 			if ( oInit.aaSorting === undefined )
@@ -1238,60 +1238,60 @@
 					sorting[i][1] = oSettings.aoColumns[ i ].asSorting[0];
 				}
 			}
-			
+
 			/* Do a first pass on the sorting classes (allows any size changes to be taken into
 			 * account, and also will apply sorting disabled classes if disabled
 			 */
 			_fnSortingClasses( oSettings );
-			
+
 			if ( features.bSort )
 			{
 				_fnCallbackReg( oSettings, 'aoDrawCallback', function () {
 					if ( oSettings.bSorted ) {
 						var aSort = _fnSortFlatten( oSettings );
 						var sortedColumns = {};
-			
+
 						$.each( aSort, function (i, val) {
 							sortedColumns[ val.src ] = val.dir;
 						} );
-			
+
 						_fnCallbackFire( oSettings, null, 'order', [oSettings, aSort, sortedColumns] );
 						_fnSortAria( oSettings );
 					}
 				} );
 			}
-			
+
 			_fnCallbackReg( oSettings, 'aoDrawCallback', function () {
 				if ( oSettings.bSorted || _fnDataSource( oSettings ) === 'ssp' || features.bDeferRender ) {
 					_fnSortingClasses( oSettings );
 				}
 			}, 'sc' );
-			
-			
+
+
 			/*
 			 * Final init
 			 * Cache the header, body and footer as required, creating them if needed
 			 */
-			
+
 			// Work around for Webkit bug 83867 - store the caption-side before removing from doc
 			var captions = $this.children('caption').each( function () {
 				this._captionSide = $this.css('caption-side');
 			} );
-			
+
 			var thead = $this.children('thead');
 			if ( thead.length === 0 )
 			{
 				thead = $('<thead/>').appendTo(this);
 			}
 			oSettings.nTHead = thead[0];
-			
+
 			var tbody = $this.children('tbody');
 			if ( tbody.length === 0 )
 			{
 				tbody = $('<tbody/>').appendTo(this);
 			}
 			oSettings.nTBody = tbody[0];
-			
+
 			var tfoot = $this.children('tfoot');
 			if ( tfoot.length === 0 && captions.length > 0 && (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "") )
 			{
@@ -1299,7 +1299,7 @@
 				// a tfoot element for the caption element to be appended to
 				tfoot = $('<tfoot/>').appendTo(this);
 			}
-			
+
 			if ( tfoot.length === 0 || tfoot.children().length === 0 ) {
 				$this.addClass( oClasses.sNoFooter );
 			}
@@ -1307,7 +1307,7 @@
 				oSettings.nTFoot = tfoot[0];
 				_fnDetectHeader( oSettings.aoFooter, oSettings.nTFoot );
 			}
-			
+
 			/* Check if there is data passing into the constructor */
 			if ( oInit.aaData )
 			{
@@ -1324,13 +1324,13 @@
 				 */
 				_fnAddTr( oSettings, $(oSettings.nTBody).children('tr') );
 			}
-			
+
 			/* Copy the data index array */
 			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-			
+
 			/* Initialisation complete - table can be drawn */
 			oSettings.bInitialised = true;
-			
+
 			/* Check if we need to initialise the table (it might not have been handed off to the
 			 * language processor)
 			 */
@@ -1343,7 +1343,7 @@
 		return this;
 	};
 
-	
+
 	/*
 	 * It is useful to have variables which are scoped locally so only the
 	 * DataTables functions can access them and they don't leak into global space.
@@ -1352,28 +1352,28 @@
 	 * by DataTables as private variables here. This also ensures that there is no
 	 * clashing of variable names and that they can easily referenced for reuse.
 	 */
-	
-	
+
+
 	// Defined else where
 	//  _selector_run
 	//  _selector_opts
 	//  _selector_first
 	//  _selector_row_indexes
-	
+
 	var _ext; // DataTable.ext
 	var _Api; // DataTable.Api
 	var _api_register; // DataTable.Api.register
 	var _api_registerPlural; // DataTable.Api.registerPlural
-	
+
 	var _re_dic = {};
 	var _re_new_lines = /[\r\n]/g;
 	var _re_html = /<.*?>/g;
 	var _re_date_start = /^[\w\+\-]/;
 	var _re_date_end = /[\w\+\-]$/;
-	
+
 	// Escape regular expression special characters
 	var _re_escape_regex = new RegExp( '(\\' + [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^', '-' ].join('|\\') + ')', 'g' );
-	
+
 	// http://en.wikipedia.org/wiki/Foreign_exchange_market
 	// - \u20BD - Russian ruble.
 	// - \u20a9 - South Korean Won
@@ -1385,18 +1385,18 @@
 	// - \u2009 is thin space and \u202F is narrow no-break space, both used in many
 	//   standards as thousands separators.
 	var _re_formatted_numeric = /[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi;
-	
-	
+
+
 	var _empty = function ( d ) {
 		return !d || d === true || d === '-' ? true : false;
 	};
-	
-	
+
+
 	var _intVal = function ( s ) {
 		var integer = parseInt( s, 10 );
 		return !isNaN(integer) && isFinite(s) ? integer : null;
 	};
-	
+
 	// Convert from a formatted number with characters other than `.` as the
 	// decimal place, to a Javascript number
 	var _numToDecimal = function ( num, decimalPoint ) {
@@ -1408,41 +1408,41 @@
 			num.replace( /\./g, '' ).replace( _re_dic[ decimalPoint ], '.' ) :
 			num;
 	};
-	
-	
+
+
 	var _isNumber = function ( d, decimalPoint, formatted ) {
 		var strType = typeof d === 'string';
-	
+
 		// If empty return immediately so there must be a number if it is a
 		// formatted string (this stops the string "k", or "kr", etc being detected
 		// as a formatted number for currency
 		if ( _empty( d ) ) {
 			return true;
 		}
-	
+
 		if ( decimalPoint && strType ) {
 			d = _numToDecimal( d, decimalPoint );
 		}
-	
+
 		if ( formatted && strType ) {
 			d = d.replace( _re_formatted_numeric, '' );
 		}
-	
+
 		return !isNaN( parseFloat(d) ) && isFinite( d );
 	};
-	
-	
+
+
 	// A string without HTML in it can be considered to be HTML still
 	var _isHtml = function ( d ) {
 		return _empty( d ) || typeof d === 'string';
 	};
-	
-	
+
+
 	var _htmlNumeric = function ( d, decimalPoint, formatted ) {
 		if ( _empty( d ) ) {
 			return true;
 		}
-	
+
 		var html = _isHtml( d );
 		return ! html ?
 			null :
@@ -1450,12 +1450,12 @@
 				true :
 				null;
 	};
-	
-	
+
+
 	var _pluck = function ( a, prop, prop2 ) {
 		var out = [];
 		var i=0, ien=a.length;
-	
+
 		// Could have the test in the loop for slightly smaller code, but speed
 		// is essential here
 		if ( prop2 !== undefined ) {
@@ -1472,18 +1472,18 @@
 				}
 			}
 		}
-	
+
 		return out;
 	};
-	
-	
+
+
 	// Basically the same as _pluck, but rather than looping over `a` we use `order`
 	// as the indexes to pick from `a`
 	var _pluck_order = function ( a, order, prop, prop2 )
 	{
 		var out = [];
 		var i=0, ien=order.length;
-	
+
 		// Could have the test in the loop for slightly smaller code, but speed
 		// is essential here
 		if ( prop2 !== undefined ) {
@@ -1498,16 +1498,16 @@
 				out.push( a[ order[i] ][ prop ] );
 			}
 		}
-	
+
 		return out;
 	};
-	
-	
+
+
 	var _range = function ( len, start )
 	{
 		var out = [];
 		var end;
-	
+
 		if ( start === undefined ) {
 			start = 0;
 			end = len;
@@ -1516,34 +1516,34 @@
 			end = start;
 			start = len;
 		}
-	
+
 		for ( var i=start ; i<end ; i++ ) {
 			out.push( i );
 		}
-	
+
 		return out;
 	};
-	
-	
+
+
 	var _removeEmpty = function ( a )
 	{
 		var out = [];
-	
+
 		for ( var i=0, ien=a.length ; i<ien ; i++ ) {
 			if ( a[i] ) { // careful - will remove all falsy values!
 				out.push( a[i] );
 			}
 		}
-	
+
 		return out;
 	};
-	
-	
+
+
 	var _stripHtml = function ( d ) {
 		return d.replace( _re_html, '' );
 	};
-	
-	
+
+
 	/**
 	 * Find the unique elements in a source array.
 	 *
@@ -1562,27 +1562,27 @@
 			val,
 			i, ien=src.length,
 			j, k=0;
-	
+
 		again: for ( i=0 ; i<ien ; i++ ) {
 			val = src[i];
-	
+
 			for ( j=0 ; j<k ; j++ ) {
 				if ( out[j] === val ) {
 					continue again;
 				}
 			}
-	
+
 			out.push( val );
 			k++;
 		}
-	
+
 		return out;
 	};
-	
-	
+
+
 	/**
 	 * DataTables utility methods
-	 * 
+	 *
 	 * This namespace provides helper methods that DataTables uses internally to
 	 * create a DataTable, but which are not exclusively used only for DataTables.
 	 * These methods can be used by extension authors to save the duplication of
@@ -1604,16 +1604,16 @@
 				frequency = freq !== undefined ? freq : 200,
 				last,
 				timer;
-	
+
 			return function () {
 				var
 					that = this,
 					now  = +new Date(),
 					args = arguments;
-	
+
 				if ( last && now < last + frequency ) {
 					clearTimeout( timer );
-	
+
 					timer = setTimeout( function () {
 						last = undefined;
 						fn.apply( that, args );
@@ -1625,8 +1625,8 @@
 				}
 			};
 		},
-	
-	
+
+
 		/**
 		 * Escape a string such that it can be used in a regular expression
 		 *
@@ -1637,9 +1637,9 @@
 			return val.replace( _re_escape_regex, '\\$1' );
 		}
 	};
-	
-	
-	
+
+
+
 	/**
 	 * Create a mapping object that allows camel case parameters to be looked up
 	 * for their Hungarian counterparts. The mapping is stored in a private
@@ -1654,26 +1654,26 @@
 			match,
 			newKey,
 			map = {};
-	
+
 		$.each( o, function (key, val) {
 			match = key.match(/^([^A-Z]+?)([A-Z])/);
-	
+
 			if ( match && hungarian.indexOf(match[1]+' ') !== -1 )
 			{
 				newKey = key.replace( match[0], match[2].toLowerCase() );
 				map[ newKey ] = key;
-	
+
 				if ( match[1] === 'o' )
 				{
 					_fnHungarianMap( o[key] );
 				}
 			}
 		} );
-	
+
 		o._hungarianMap = map;
 	}
-	
-	
+
+
 	/**
 	 * Convert from camel case parameters to Hungarian, based on a Hungarian map
 	 * created by _fnHungarianMap.
@@ -1690,12 +1690,12 @@
 		if ( ! src._hungarianMap ) {
 			_fnHungarianMap( src );
 		}
-	
+
 		var hungarianKey;
-	
+
 		$.each( user, function (key, val) {
 			hungarianKey = src._hungarianMap[ key ];
-	
+
 			if ( hungarianKey !== undefined && (force || user[hungarianKey] === undefined) )
 			{
 				// For objects, we need to buzz down into the object to copy parameters
@@ -1706,7 +1706,7 @@
 						user[ hungarianKey ] = {};
 					}
 					$.extend( true, user[hungarianKey], user[key] );
-	
+
 					_fnCamelToHungarian( src[hungarianKey], user[hungarianKey], force );
 				}
 				else {
@@ -1715,8 +1715,8 @@
 			}
 		} );
 	}
-	
-	
+
+
 	/**
 	 * Language compatibility - when certain options are given, and others aren't, we
 	 * need to duplicate the values over, in order to provide backwards compatibility
@@ -1728,7 +1728,7 @@
 	{
 		var defaults = DataTable.defaults.oLanguage;
 		var zeroRecords = lang.sZeroRecords;
-	
+
 		/* Backwards compatibility - if there is no sEmptyTable given, then use the same as
 		 * sZeroRecords - assuming that is given.
 		 */
@@ -1737,26 +1737,26 @@
 		{
 			_fnMap( lang, lang, 'sZeroRecords', 'sEmptyTable' );
 		}
-	
+
 		/* Likewise with loading records */
 		if ( ! lang.sLoadingRecords && zeroRecords &&
 			defaults.sLoadingRecords === "Loading..." )
 		{
 			_fnMap( lang, lang, 'sZeroRecords', 'sLoadingRecords' );
 		}
-	
+
 		// Old parameter name of the thousands separator mapped onto the new
 		if ( lang.sInfoThousands ) {
 			lang.sThousands = lang.sInfoThousands;
 		}
-	
+
 		var decimal = lang.sDecimal;
 		if ( decimal ) {
 			_addNumericSort( decimal );
 		}
 	}
-	
-	
+
+
 	/**
 	 * Map one parameter onto another
 	 *  @param {object} o Object to map
@@ -1768,8 +1768,8 @@
 			o[ old ] = o[ knew ];
 		}
 	};
-	
-	
+
+
 	/**
 	 * Provide backwards compatibility for the main DT options. Note that the new
 	 * options are mapped onto the old parameters, so this is an external interface
@@ -1788,7 +1788,7 @@
 		_fnCompatMap( init, 'pagingType',    'sPaginationType' );
 		_fnCompatMap( init, 'pageLength',    'iDisplayLength' );
 		_fnCompatMap( init, 'searching',     'bFilter' );
-	
+
 		// Boolean initialisation of x-scrolling
 		if ( typeof init.sScrollX === 'boolean' ) {
 			init.sScrollX = init.sScrollX ? '100%' : '';
@@ -1796,11 +1796,11 @@
 		if ( typeof init.scrollX === 'boolean' ) {
 			init.scrollX = init.scrollX ? '100%' : '';
 		}
-	
+
 		// Column search objects are in an array, so it needs to be converted
 		// element by element
 		var searchCols = init.aoSearchCols;
-	
+
 		if ( searchCols ) {
 			for ( var i=0, ien=searchCols.length ; i<ien ; i++ ) {
 				if ( searchCols[i] ) {
@@ -1809,8 +1809,8 @@
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Provide backwards compatibility for column options. Note that the new options
 	 * are mapped onto the old parameters, so this is an external interface change
@@ -1823,15 +1823,15 @@
 		_fnCompatMap( init, 'orderData',     'aDataSort' );
 		_fnCompatMap( init, 'orderSequence', 'asSorting' );
 		_fnCompatMap( init, 'orderDataType', 'sortDataType' );
-	
+
 		// orderData can be given as an integer
 		var dataSort = init.aDataSort;
 		if ( dataSort && ! $.isArray( dataSort ) ) {
 			init.aDataSort = [ dataSort ];
 		}
 	}
-	
-	
+
+
 	/**
 	 * Browser feature detection for capabilities, quirks
 	 *  @param {object} settings dataTables settings object
@@ -1845,7 +1845,7 @@
 		if ( ! DataTable.__browser ) {
 			var browser = {};
 			DataTable.__browser = browser;
-	
+
 			// Scrolling feature / quirks detection
 			var n = $('<div/>')
 				.css( {
@@ -1874,10 +1874,10 @@
 						)
 				)
 				.appendTo( 'body' );
-	
+
 			var outer = n.children();
 			var inner = outer.children();
-	
+
 			// Numbers below, in order, are:
 			// inner.offsetWidth, inner.clientWidth, outer.offsetWidth, outer.clientWidth
 			//
@@ -1887,30 +1887,30 @@
 			// Evergreen Windows:                 83  83 100  83
 			// Evergreen Mac with scrollbars:     85  85 100  85
 			// Evergreen Mac without scrollbars: 100 100 100 100
-	
+
 			// Get scrollbar width
 			browser.barWidth = outer[0].offsetWidth - outer[0].clientWidth;
-	
+
 			// IE6/7 will oversize a width 100% element inside a scrolling element, to
 			// include the width of the scrollbar, while other browsers ensure the inner
 			// element is contained without forcing scrolling
 			browser.bScrollOversize = inner[0].offsetWidth === 100 && outer[0].clientWidth !== 100;
-	
+
 			// In rtl text layout, some browsers (most, but not all) will place the
 			// scrollbar on the left, rather than the right.
 			browser.bScrollbarLeft = Math.round( inner.offset().left ) !== 1;
-	
+
 			// IE8- don't provide height and width for getBoundingClientRect
 			browser.bBounding = n[0].getBoundingClientRect().width ? true : false;
-	
+
 			n.remove();
 		}
-	
+
 		$.extend( settings.oBrowser, DataTable.__browser );
 		settings.oScroll.iBarWidth = DataTable.__browser.barWidth;
 	}
-	
-	
+
+
 	/**
 	 * Array.prototype reduce[Right] method, used for browsers which don't support
 	 * JS 1.6. Done this way to reduce code size, since we iterate either way
@@ -1923,28 +1923,28 @@
 			i = start,
 			value,
 			isSet = false;
-	
+
 		if ( init !== undefined ) {
 			value = init;
 			isSet = true;
 		}
-	
+
 		while ( i !== end ) {
 			if ( ! that.hasOwnProperty(i) ) {
 				continue;
 			}
-	
+
 			value = isSet ?
 				fn( value, that[i], i, that ) :
 				that[i];
-	
+
 			isSet = true;
 			i += inc;
 		}
-	
+
 		return value;
 	}
-	
+
 	/**
 	 * Add a column to the list used for the table with default values
 	 *  @param {object} oSettings dataTables settings object
@@ -1964,18 +1964,18 @@
 			idx: iCol
 		} );
 		oSettings.aoColumns.push( oCol );
-	
+
 		// Add search object for column specific search. Note that the `searchCols[ iCol ]`
 		// passed into extend can be undefined. This allows the user to give a default
 		// with only some of the parameters defined, and also not give a default
 		var searchCols = oSettings.aoPreSearchCols;
 		searchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch, searchCols[ iCol ] );
-	
+
 		// Use the default column options function to initialise classes etc
 		_fnColumnOptions( oSettings, iCol, $(nTh).data() );
 	}
-	
-	
+
+
 	/**
 	 * Apply options for a column
 	 *  @param {object} oSettings dataTables settings object
@@ -1988,50 +1988,50 @@
 		var oCol = oSettings.aoColumns[ iCol ];
 		var oClasses = oSettings.oClasses;
 		var th = $(oCol.nTh);
-	
+
 		// Try to get width information from the DOM. We can't get it from CSS
 		// as we'd need to parse the CSS stylesheet. `width` option can override
 		if ( ! oCol.sWidthOrig ) {
 			// Width attribute
 			oCol.sWidthOrig = th.attr('width') || null;
-	
+
 			// Style attribute
 			var t = (th.attr('style') || '').match(/width:\s*(\d+[pxem%]+)/);
 			if ( t ) {
 				oCol.sWidthOrig = t[1];
 			}
 		}
-	
+
 		/* User specified column options */
 		if ( oOptions !== undefined && oOptions !== null )
 		{
 			// Backwards compatibility
 			_fnCompatCols( oOptions );
-	
+
 			// Map camel case parameters to their Hungarian counterparts
 			_fnCamelToHungarian( DataTable.defaults.column, oOptions );
-	
+
 			/* Backwards compatibility for mDataProp */
 			if ( oOptions.mDataProp !== undefined && !oOptions.mData )
 			{
 				oOptions.mData = oOptions.mDataProp;
 			}
-	
+
 			if ( oOptions.sType )
 			{
 				oCol._sManualType = oOptions.sType;
 			}
-	
+
 			// `class` is a reserved word in Javascript, so we need to provide
 			// the ability to use a valid name for the camel case input
 			if ( oOptions.className && ! oOptions.sClass )
 			{
 				oOptions.sClass = oOptions.className;
 			}
-	
+
 			$.extend( oCol, oOptions );
 			_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
-	
+
 			/* iDataSort to be applied (backwards compatibility), but aDataSort will take
 			 * priority if defined
 			 */
@@ -2041,12 +2041,12 @@
 			}
 			_fnMap( oCol, oOptions, "aDataSort" );
 		}
-	
+
 		/* Cache the data get and set functions for speed */
 		var mDataSrc = oCol.mData;
 		var mData = _fnGetObjectDataFn( mDataSrc );
 		var mRender = oCol.mRender ? _fnGetObjectDataFn( oCol.mRender ) : null;
-	
+
 		var attrTest = function( src ) {
 			return typeof src === 'string' && src.indexOf('@') !== -1;
 		};
@@ -2054,10 +2054,10 @@
 			attrTest(mDataSrc.sort) || attrTest(mDataSrc.type) || attrTest(mDataSrc.filter)
 		);
 		oCol._setter = null;
-	
+
 		oCol.fnGetData = function (rowData, type, meta) {
 			var innerData = mData( rowData, type, undefined, meta );
-	
+
 			return mRender && type ?
 				mRender( innerData, type, rowData, meta ) :
 				innerData;
@@ -2065,20 +2065,20 @@
 		oCol.fnSetData = function ( rowData, val, meta ) {
 			return _fnSetObjectDataFn( mDataSrc )( rowData, val, meta );
 		};
-	
+
 		// Indicate if DataTables should read DOM data as an object or array
 		// Used in _fnGetRowElements
 		if ( typeof mDataSrc !== 'number' ) {
 			oSettings._rowReadObject = true;
 		}
-	
+
 		/* Feature sorting overrides column specific when off */
 		if ( !oSettings.oFeatures.bSort )
 		{
 			oCol.bSortable = false;
 			th.addClass( oClasses.sSortableNone ); // Have to add class here as order event isn't called
 		}
-	
+
 		/* Check that the class assignment is correct for sorting */
 		var bAsc = $.inArray('asc', oCol.asSorting) !== -1;
 		var bDesc = $.inArray('desc', oCol.asSorting) !== -1;
@@ -2103,8 +2103,8 @@
 			oCol.sSortingClassJUI = oClasses.sSortJUI;
 		}
 	}
-	
-	
+
+
 	/**
 	 * Adjust the table column widths for new data. Note: you would probably want to
 	 * do a redraw after calling this function!
@@ -2117,24 +2117,24 @@
 		if ( settings.oFeatures.bAutoWidth !== false )
 		{
 			var columns = settings.aoColumns;
-	
+
 			_fnCalculateColumnWidths( settings );
 			for ( var i=0 , iLen=columns.length ; i<iLen ; i++ )
 			{
 				columns[i].nTh.style.width = columns[i].sWidth;
 			}
 		}
-	
+
 		var scroll = settings.oScroll;
 		if ( scroll.sY !== '' || scroll.sX !== '')
 		{
 			_fnScrollDraw( settings );
 		}
-	
+
 		_fnCallbackFire( settings, null, 'column-sizing', [settings] );
 	}
-	
-	
+
+
 	/**
 	 * Covert the index of a visible column to the index in the data array (take account
 	 * of hidden columns)
@@ -2146,13 +2146,13 @@
 	function _fnVisibleToColumnIndex( oSettings, iMatch )
 	{
 		var aiVis = _fnGetColumns( oSettings, 'bVisible' );
-	
+
 		return typeof aiVis[iMatch] === 'number' ?
 			aiVis[iMatch] :
 			null;
 	}
-	
-	
+
+
 	/**
 	 * Covert the index of an index in the data array and convert it to the visible
 	 *   column index (take account of hidden columns)
@@ -2165,11 +2165,11 @@
 	{
 		var aiVis = _fnGetColumns( oSettings, 'bVisible' );
 		var iPos = $.inArray( iMatch, aiVis );
-	
+
 		return iPos !== -1 ? iPos : null;
 	}
-	
-	
+
+
 	/**
 	 * Get the number of visible columns
 	 *  @param {object} oSettings dataTables settings object
@@ -2179,18 +2179,18 @@
 	function _fnVisbleColumns( oSettings )
 	{
 		var vis = 0;
-	
+
 		// No reduce in IE8, use a loop for now
 		$.each( oSettings.aoColumns, function ( i, col ) {
 			if ( col.bVisible && $(col.nTh).css('display') !== 'none' ) {
 				vis++;
 			}
 		} );
-	
+
 		return vis;
 	}
-	
-	
+
+
 	/**
 	 * Get an array of column indexes that match a given property
 	 *  @param {object} oSettings dataTables settings object
@@ -2202,17 +2202,17 @@
 	function _fnGetColumns( oSettings, sParam )
 	{
 		var a = [];
-	
+
 		$.map( oSettings.aoColumns, function(val, i) {
 			if ( val[sParam] ) {
 				a.push( i );
 			}
 		} );
-	
+
 		return a;
 	}
-	
-	
+
+
 	/**
 	 * Calculate the 'type' of a column
 	 *  @param {object} settings dataTables settings object
@@ -2225,12 +2225,12 @@
 		var types = DataTable.ext.type.detect;
 		var i, ien, j, jen, k, ken;
 		var col, cell, detectedType, cache;
-	
-		// For each column, spin over the 
+
+		// For each column, spin over the
 		for ( i=0, ien=columns.length ; i<ien ; i++ ) {
 			col = columns[i];
 			cache = [];
-	
+
 			if ( ! col.sType && col._sManualType ) {
 				col.sType = col._sManualType;
 			}
@@ -2242,9 +2242,9 @@
 						if ( cache[k] === undefined ) {
 							cache[k] = _fnGetCellData( settings, k, i, 'type' );
 						}
-	
+
 						detectedType = types[j]( cache[k], settings );
-	
+
 						// If null, then this type can't apply to this column, so
 						// rather than testing all cells, break out. There is an
 						// exception for the last type which is `html`. We need to
@@ -2253,14 +2253,14 @@
 						if ( ! detectedType && j !== types.length-1 ) {
 							break;
 						}
-	
+
 						// Only a single match is needed for html type since it is
 						// bottom of the pile and very similar to string
 						if ( detectedType === 'html' ) {
 							break;
 						}
 					}
-	
+
 					// Type is valid for all data points in the column - use this
 					// type
 					if ( detectedType ) {
@@ -2268,7 +2268,7 @@
 						break;
 					}
 				}
-	
+
 				// Fall back - if no type was detected, always use string
 				if ( ! col.sType ) {
 					col.sType = 'string';
@@ -2276,8 +2276,8 @@
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Take the column definitions and static columns arrays and calculate how
 	 * they relate to column indexes. The callback function will then apply the
@@ -2293,7 +2293,7 @@
 	{
 		var i, iLen, j, jLen, k, kLen, def;
 		var columns = oSettings.aoColumns;
-	
+
 		// Column definitions with aTargets
 		if ( aoColDefs )
 		{
@@ -2301,17 +2301,17 @@
 			for ( i=aoColDefs.length-1 ; i>=0 ; i-- )
 			{
 				def = aoColDefs[i];
-	
+
 				/* Each definition can target multiple columns, as it is an array */
 				var aTargets = def.targets !== undefined ?
 					def.targets :
 					def.aTargets;
-	
+
 				if ( ! $.isArray( aTargets ) )
 				{
 					aTargets = [ aTargets ];
 				}
-	
+
 				for ( j=0, jLen=aTargets.length ; j<jLen ; j++ )
 				{
 					if ( typeof aTargets[j] === 'number' && aTargets[j] >= 0 )
@@ -2321,7 +2321,7 @@
 						{
 							_fnAddColumn( oSettings );
 						}
-	
+
 						/* Integer, basic index */
 						fn( aTargets[j], def );
 					}
@@ -2345,7 +2345,7 @@
 				}
 			}
 		}
-	
+
 		// Statically defined columns array
 		if ( aoCols )
 		{
@@ -2355,7 +2355,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Add a data array to the table, creating DOM node etc. This is the parallel to
 	 * _fnGatherData, but for adding rows from a Javascript source, rather than a
@@ -2377,38 +2377,38 @@
 			src: nTr ? 'dom' : 'data',
 			idx: iRow
 		} );
-	
+
 		oData._aData = aDataIn;
 		oSettings.aoData.push( oData );
-	
+
 		/* Create the cells */
 		var nTd, sThisType;
 		var columns = oSettings.aoColumns;
-	
+
 		// Invalidate the column types as the new data needs to be revalidated
 		for ( var i=0, iLen=columns.length ; i<iLen ; i++ )
 		{
 			columns[i].sType = null;
 		}
-	
+
 		/* Add to the display array */
 		oSettings.aiDisplayMaster.push( iRow );
-	
+
 		var id = oSettings.rowIdFn( aDataIn );
 		if ( id !== undefined ) {
 			oSettings.aIds[ id ] = oData;
 		}
-	
+
 		/* Create the DOM information, or register it if already present */
 		if ( nTr || ! oSettings.oFeatures.bDeferRender )
 		{
 			_fnCreateTr( oSettings, iRow, nTr, anTds );
 		}
-	
+
 		return iRow;
 	}
-	
-	
+
+
 	/**
 	 * Add one or more TR elements to the table. Generally we'd expect to
 	 * use this for reading data from a DOM sourced table, but it could be
@@ -2422,19 +2422,19 @@
 	function _fnAddTr( settings, trs )
 	{
 		var row;
-	
+
 		// Allow an individual node to be passed in
 		if ( ! (trs instanceof $) ) {
 			trs = $(trs);
 		}
-	
+
 		return trs.map( function (i, el) {
 			row = _fnGetRowElements( settings, el );
 			return _fnAddData( settings, row.data, el, row.cells );
 		} );
 	}
-	
-	
+
+
 	/**
 	 * Take a TR element and convert it to an index in aoData
 	 *  @param {object} oSettings dataTables settings object
@@ -2446,8 +2446,8 @@
 	{
 		return (n._DT_RowIndex!==undefined) ? n._DT_RowIndex : null;
 	}
-	
-	
+
+
 	/**
 	 * Take a TD element and convert it into a column data index (not the visible index)
 	 *  @param {object} oSettings dataTables settings object
@@ -2460,8 +2460,8 @@
 	{
 		return $.inArray( n, oSettings.aoData[ iRow ].anCells );
 	}
-	
-	
+
+
 	/**
 	 * Get the data for a given cell from the internal cache, taking into account data mapping
 	 *  @param {object} settings dataTables settings object
@@ -2482,7 +2482,7 @@
 			row:      rowIdx,
 			col:      colIdx
 		} );
-	
+
 		if ( cellData === undefined ) {
 			if ( settings.iDrawError != draw && defaultContent === null ) {
 				_fnLog( settings, 0, "Requested unknown parameter "+
@@ -2492,7 +2492,7 @@
 			}
 			return defaultContent;
 		}
-	
+
 		// When the data source is null and a specific data type is requested (i.e.
 		// not the original data), we can use default column data
 		if ( (cellData === rowData || cellData === null) && defaultContent !== null && type !== undefined ) {
@@ -2503,14 +2503,14 @@
 			// executing in the scope of the data object (for instances)
 			return cellData.call( rowData );
 		}
-	
+
 		if ( cellData === null && type == 'display' ) {
 			return '';
 		}
 		return cellData;
 	}
-	
-	
+
+
 	/**
 	 * Set the value for a specific cell, into the internal data cache
 	 *  @param {object} settings dataTables settings object
@@ -2523,19 +2523,19 @@
 	{
 		var col     = settings.aoColumns[colIdx];
 		var rowData = settings.aoData[rowIdx]._aData;
-	
+
 		col.fnSetData( rowData, val, {
 			settings: settings,
 			row:      rowIdx,
 			col:      colIdx
 		}  );
 	}
-	
-	
+
+
 	// Private variable that is used to match action syntax in the data property object
 	var __reArray = /\[.*?\]$/;
 	var __reFn = /\(\)$/;
-	
+
 	/**
 	 * Split string on periods, taking into account escaped periods
 	 * @param  {string} str String to split
@@ -2547,8 +2547,8 @@
 			return s.replace(/\\./g, '.');
 		} );
 	}
-	
-	
+
+
 	/**
 	 * Return a function that can be used to get data from a source object, taking
 	 * into account the ability to use nested objects as a source
@@ -2567,7 +2567,7 @@
 					o[key] = _fnGetObjectDataFn( val );
 				}
 			} );
-	
+
 			return function (data, type, row, meta) {
 				var t = o[type] || o._;
 				return t !== undefined ?
@@ -2599,44 +2599,44 @@
 			 */
 			var fetchData = function (data, type, src) {
 				var arrayNotation, funcNotation, out, innerSrc;
-	
+
 				if ( src !== "" )
 				{
 					var a = _fnSplitObjNotation( src );
-	
+
 					for ( var i=0, iLen=a.length ; i<iLen ; i++ )
 					{
 						// Check if we are dealing with special notation
 						arrayNotation = a[i].match(__reArray);
 						funcNotation = a[i].match(__reFn);
-	
+
 						if ( arrayNotation )
 						{
 							// Array notation
 							a[i] = a[i].replace(__reArray, '');
-	
+
 							// Condition allows simply [] to be passed in
 							if ( a[i] !== "" ) {
 								data = data[ a[i] ];
 							}
 							out = [];
-	
+
 							// Get the remainder of the nested object to get
 							a.splice( 0, i+1 );
 							innerSrc = a.join('.');
-	
+
 							// Traverse each entry in the array getting the properties requested
 							if ( $.isArray( data ) ) {
 								for ( var j=0, jLen=data.length ; j<jLen ; j++ ) {
 									out.push( fetchData( data[j], type, innerSrc ) );
 								}
 							}
-	
+
 							// If a string is given in between the array notation indicators, that
 							// is used to join the strings together, otherwise an array is returned
 							var join = arrayNotation[0].substring(1, arrayNotation[0].length-1);
 							data = (join==="") ? out : out.join(join);
-	
+
 							// The inner call to fetchData has already traversed through the remainder
 							// of the source requested, so we exit from the loop
 							break;
@@ -2648,7 +2648,7 @@
 							data = data[ a[i] ]();
 							continue;
 						}
-	
+
 						if ( data === null || data[ a[i] ] === undefined )
 						{
 							return undefined;
@@ -2656,10 +2656,10 @@
 						data = data[ a[i] ];
 					}
 				}
-	
+
 				return data;
 			};
-	
+
 			return function (data, type) { // row and meta also passed, but not used
 				return fetchData( data, type, mSource );
 			};
@@ -2672,8 +2672,8 @@
 			};
 		}
 	}
-	
-	
+
+
 	/**
 	 * Return a function that can be used to set data from a source object, taking
 	 * into account the ability to use nested objects as a source
@@ -2711,23 +2711,23 @@
 				var a = _fnSplitObjNotation( src ), b;
 				var aLast = a[a.length-1];
 				var arrayNotation, funcNotation, o, innerSrc;
-	
+
 				for ( var i=0, iLen=a.length-1 ; i<iLen ; i++ )
 				{
 					// Check if we are dealing with an array notation request
 					arrayNotation = a[i].match(__reArray);
 					funcNotation = a[i].match(__reFn);
-	
+
 					if ( arrayNotation )
 					{
 						a[i] = a[i].replace(__reArray, '');
 						data[ a[i] ] = [];
-	
+
 						// Get the remainder of the nested object to set so we can recurse
 						b = a.slice();
 						b.splice( 0, i+1 );
 						innerSrc = b.join('.');
-	
+
 						// Traverse each entry in the array setting the properties requested
 						if ( $.isArray( val ) )
 						{
@@ -2745,7 +2745,7 @@
 							// is to just save the value.
 							data[ a[i] ] = val;
 						}
-	
+
 						// The inner call to setData has already traversed through the remainder
 						// of the source and has set the data, thus we can exit here
 						return;
@@ -2756,7 +2756,7 @@
 						a[i] = a[i].replace(__reFn, '');
 						data = data[ a[i] ]( val );
 					}
-	
+
 					// If the nested object doesn't currently exist - since we are
 					// trying to set the value - create it
 					if ( data[ a[i] ] === null || data[ a[i] ] === undefined )
@@ -2765,7 +2765,7 @@
 					}
 					data = data[ a[i] ];
 				}
-	
+
 				// Last item in the input - i.e, the actual set
 				if ( aLast.match(__reFn ) )
 				{
@@ -2779,7 +2779,7 @@
 					data[ aLast.replace(__reArray, '') ] = val;
 				}
 			};
-	
+
 			return function (data, val) { // meta is also passed in, but not used
 				return setData( data, val, mSource );
 			};
@@ -2792,8 +2792,8 @@
 			};
 		}
 	}
-	
-	
+
+
 	/**
 	 * Return an array with the full table data
 	 *  @param {object} oSettings dataTables settings object
@@ -2804,8 +2804,8 @@
 	{
 		return _pluck( settings.aoData, '_aData' );
 	}
-	
-	
+
+
 	/**
 	 * Nuke the table
 	 *  @param {object} oSettings dataTables settings object
@@ -2818,8 +2818,8 @@
 		settings.aiDisplay.length = 0;
 		settings.aIds = {};
 	}
-	
-	
+
+
 	 /**
 	 * Take an array of integers (index array) and remove a target integer (value - not
 	 * the key!)
@@ -2830,7 +2830,7 @@
 	function _fnDeleteIndex( a, iTarget, splice )
 	{
 		var iTargetIndex = -1;
-	
+
 		for ( var i=0, iLen=a.length ; i<iLen ; i++ )
 		{
 			if ( a[i] == iTarget )
@@ -2842,14 +2842,14 @@
 				a[i]--;
 			}
 		}
-	
+
 		if ( iTargetIndex != -1 && splice === undefined )
 		{
 			a.splice( iTargetIndex, 1 );
 		}
 	}
-	
-	
+
+
 	/**
 	 * Mark cached data as invalid such that a re-read of the data will occur when
 	 * the cached data is next requested. Also update from the data source object.
@@ -2877,10 +2877,10 @@
 			while ( cell.childNodes.length ) {
 				cell.removeChild( cell.firstChild );
 			}
-	
+
 			cell.innerHTML = _fnGetCellData( settings, rowIdx, col, 'display' );
 		};
-	
+
 		// Are we reading last data from DOM or the data object?
 		if ( src === 'dom' || ((! src || src === 'auto') && row.src === 'dom') ) {
 			// Read the data from the DOM
@@ -2892,7 +2892,7 @@
 		else {
 			// Reading from data object, update the DOM
 			var cells = row.anCells;
-	
+
 			if ( cells ) {
 				if ( colIdx !== undefined ) {
 					cellWrite( cells[colIdx], colIdx );
@@ -2904,12 +2904,12 @@
 				}
 			}
 		}
-	
+
 		// For both row and cell invalidation, the cached data for sorting and
 		// filtering is nulled out
 		row._aSortData = null;
 		row._aFilterData = null;
-	
+
 		// Invalidate the type for a specific column (if given) or all columns since
 		// the data might have changed
 		var cols = settings.aoColumns;
@@ -2920,13 +2920,13 @@
 			for ( i=0, ien=cols.length ; i<ien ; i++ ) {
 				cols[i].sType = null;
 			}
-	
+
 			// Update DataTables special `DT_*` attributes for the row
 			_fnRowAttributes( settings, row );
 		}
 	}
-	
-	
+
+
 	/**
 	 * Build a data source object from an HTML row, reading the contents of the
 	 * cells that are in the row.
@@ -2952,18 +2952,18 @@
 			name, col, o, i=0, contents,
 			columns = settings.aoColumns,
 			objectRead = settings._rowReadObject;
-	
+
 		// Allow the data object to be passed in, or construct
 		d = d !== undefined ?
 			d :
 			objectRead ?
 				{} :
 				[];
-	
+
 		var attr = function ( str, td  ) {
 			if ( typeof str === 'string' ) {
 				var idx = str.indexOf('@');
-	
+
 				if ( idx !== -1 ) {
 					var attr = str.substring( idx+1 );
 					var setter = _fnSetObjectDataFn( str );
@@ -2971,17 +2971,17 @@
 				}
 			}
 		};
-	
+
 		// Read data from a cell and store into the data object
 		var cellProcess = function ( cell ) {
 			if ( colIdx === undefined || colIdx === i ) {
 				col = columns[i];
 				contents = $.trim(cell.innerHTML);
-	
+
 				if ( col && col._bAttrSrc ) {
 					var setter = _fnSetObjectDataFn( col.mData._ );
 					setter( d, contents );
-	
+
 					attr( col.mData.sort, cell );
 					attr( col.mData.type, cell );
 					attr( col.mData.filter, cell );
@@ -3001,43 +3001,43 @@
 					}
 				}
 			}
-	
+
 			i++;
 		};
-	
+
 		if ( td ) {
 			// `tr` element was passed in
 			while ( td ) {
 				name = td.nodeName.toUpperCase();
-	
+
 				if ( name == "TD" || name == "TH" ) {
 					cellProcess( td );
 					tds.push( td );
 				}
-	
+
 				td = td.nextSibling;
 			}
 		}
 		else {
 			// Existing row object passed in
 			tds = row.anCells;
-	
+
 			for ( var j=0, jen=tds.length ; j<jen ; j++ ) {
 				cellProcess( tds[j] );
 			}
 		}
-	
+
 		// Read the ID from the DOM if present
 		var rowNode = row.firstChild ? row : row.nTr;
-	
+
 		if ( rowNode ) {
 			var id = rowNode.getAttribute( 'id' );
-	
+
 			if ( id ) {
 				_fnSetObjectDataFn( settings.rowId )( d, id );
 			}
 		}
-	
+
 		return {
 			data: d,
 			cells: tds
@@ -3061,48 +3061,48 @@
 			cells = [],
 			nTr, nTd, oCol,
 			i, iLen;
-	
+
 		if ( row.nTr === null )
 		{
 			nTr = nTrIn || document.createElement('tr');
-	
+
 			row.nTr = nTr;
 			row.anCells = cells;
-	
+
 			/* Use a private property on the node to allow reserve mapping from the node
 			 * to the aoData array for fast look up
 			 */
 			nTr._DT_RowIndex = iRow;
-	
+
 			/* Special parameters can be given by the data source to be used on the row */
 			_fnRowAttributes( oSettings, row );
-	
+
 			/* Process each column */
 			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
 			{
 				oCol = oSettings.aoColumns[i];
-	
+
 				nTd = nTrIn ? anTds[i] : document.createElement( oCol.sCellType );
 				nTd._DT_CellIndex = {
 					row: iRow,
 					column: i
 				};
-				
+
 				cells.push( nTd );
-	
+
 				// Need to create the HTML if new, or if a rendering function is defined
 				if ( (!nTrIn || oCol.mRender || oCol.mData !== i) &&
 					 (!$.isPlainObject(oCol.mData) || oCol.mData._ !== i+'.display')
 				) {
 					nTd.innerHTML = _fnGetCellData( oSettings, iRow, i, 'display' );
 				}
-	
+
 				/* Add user defined class */
 				if ( oCol.sClass )
 				{
 					nTd.className += ' '+oCol.sClass;
 				}
-	
+
 				// Visibility - add or remove as required
 				if ( oCol.bVisible && ! nTrIn )
 				{
@@ -3112,7 +3112,7 @@
 				{
 					nTd.parentNode.removeChild( nTd );
 				}
-	
+
 				if ( oCol.fnCreatedCell )
 				{
 					oCol.fnCreatedCell.call( oSettings.oInstance,
@@ -3120,16 +3120,16 @@
 					);
 				}
 			}
-	
+
 			_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow] );
 		}
-	
+
 		// Remove once webkit bug 131819 and Chromium bug 365619 have been resolved
 		// and deployed
 		row.nTr.setAttribute( 'role', 'row' );
 	}
-	
-	
+
+
 	/**
 	 * Add attributes to a row based on the special `DT_*` parameters in a data
 	 * source object.
@@ -3141,37 +3141,37 @@
 	{
 		var tr = row.nTr;
 		var data = row._aData;
-	
+
 		if ( tr ) {
 			var id = settings.rowIdFn( data );
-	
+
 			if ( id ) {
 				tr.id = id;
 			}
-	
+
 			if ( data.DT_RowClass ) {
 				// Remove any classes added by DT_RowClass before
 				var a = data.DT_RowClass.split(' ');
 				row.__rowc = row.__rowc ?
 					_unique( row.__rowc.concat( a ) ) :
 					a;
-	
+
 				$(tr)
 					.removeClass( row.__rowc.join(' ') )
 					.addClass( data.DT_RowClass );
 			}
-	
+
 			if ( data.DT_RowAttr ) {
 				$(tr).attr( data.DT_RowAttr );
 			}
-	
+
 			if ( data.DT_RowData ) {
 				$(tr).data( data.DT_RowData );
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Create the HTML header for the table
 	 *  @param {object} oSettings dataTables settings object
@@ -3185,71 +3185,71 @@
 		var createHeader = $('th, td', thead).length === 0;
 		var classes = oSettings.oClasses;
 		var columns = oSettings.aoColumns;
-	
+
 		if ( createHeader ) {
 			row = $('<tr/>').appendTo( thead );
 		}
-	
+
 		for ( i=0, ien=columns.length ; i<ien ; i++ ) {
 			column = columns[i];
 			cell = $( column.nTh ).addClass( column.sClass );
-	
+
 			if ( createHeader ) {
 				cell.appendTo( row );
 			}
-	
+
 			// 1.11 move into sorting
 			if ( oSettings.oFeatures.bSort ) {
 				cell.addClass( column.sSortingClass );
-	
+
 				if ( column.bSortable !== false ) {
 					cell
 						.attr( 'tabindex', oSettings.iTabIndex )
 						.attr( 'aria-controls', oSettings.sTableId );
-	
+
 					_fnSortAttachListener( oSettings, column.nTh, i );
 				}
 			}
-	
+
 			if ( column.sTitle != cell[0].innerHTML ) {
 				cell.html( column.sTitle );
 			}
-	
+
 			_fnRenderer( oSettings, 'header' )(
 				oSettings, cell, column, classes
 			);
 		}
-	
+
 		if ( createHeader ) {
 			_fnDetectHeader( oSettings.aoHeader, thead );
 		}
-		
+
 		/* ARIA role for the rows */
 	 	$(thead).find('>tr').attr('role', 'row');
-	
+
 		/* Deal with the footer - add classes if required */
 		$(thead).find('>tr>th, >tr>td').addClass( classes.sHeaderTH );
 		$(tfoot).find('>tr>th, >tr>td').addClass( classes.sFooterTH );
-	
+
 		// Cache the footer cells. Note that we only take the cells from the first
 		// row in the footer. If there is more than one row the user wants to
 		// interact with, they need to use the table().foot() method. Note also this
 		// allows cells to be used for multiple columns using colspan
 		if ( tfoot !== null ) {
 			var cells = oSettings.aoFooter[0];
-	
+
 			for ( i=0, ien=cells.length ; i<ien ; i++ ) {
 				column = columns[i];
 				column.nTf = cells[i].cell;
-	
+
 				if ( column.sClass ) {
 					$(column.nTf).addClass( column.sClass );
 				}
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Draw the header (or footer) element based on the column visibility states. The
 	 * methodology here is to use the layout array from _fnDetectHeader, modified for
@@ -3270,23 +3270,23 @@
 		var aApplied = [];
 		var iColumns = oSettings.aoColumns.length;
 		var iRowspan, iColspan;
-	
+
 		if ( ! aoSource )
 		{
 			return;
 		}
-	
+
 		if (  bIncludeHidden === undefined )
 		{
 			bIncludeHidden = false;
 		}
-	
+
 		/* Make a copy of the master layout array, but without the visible columns in it */
 		for ( i=0, iLen=aoSource.length ; i<iLen ; i++ )
 		{
 			aoLocal[i] = aoSource[i].slice();
 			aoLocal[i].nTr = aoSource[i].nTr;
-	
+
 			/* Remove any columns which are currently hidden */
 			for ( j=iColumns-1 ; j>=0 ; j-- )
 			{
@@ -3295,15 +3295,15 @@
 					aoLocal[i].splice( j, 1 );
 				}
 			}
-	
+
 			/* Prep the applied array - it needs an element for each row */
 			aApplied.push( [] );
 		}
-	
+
 		for ( i=0, iLen=aoLocal.length ; i<iLen ; i++ )
 		{
 			nLocalTr = aoLocal[i].nTr;
-	
+
 			/* All cells are going to be replaced, so empty out the row */
 			if ( nLocalTr )
 			{
@@ -3312,12 +3312,12 @@
 					nLocalTr.removeChild( n );
 				}
 			}
-	
+
 			for ( j=0, jLen=aoLocal[i].length ; j<jLen ; j++ )
 			{
 				iRowspan = 1;
 				iColspan = 1;
-	
+
 				/* Check to see if there is already a cell (row/colspan) covering our target
 				 * insert point. If there is, then there is nothing to do.
 				 */
@@ -3325,7 +3325,7 @@
 				{
 					nLocalTr.appendChild( aoLocal[i][j].cell );
 					aApplied[i][j] = 1;
-	
+
 					/* Expand the cell to cover as many rows as needed */
 					while ( aoLocal[i+iRowspan] !== undefined &&
 					        aoLocal[i][j].cell == aoLocal[i+iRowspan][j].cell )
@@ -3333,7 +3333,7 @@
 						aApplied[i+iRowspan][j] = 1;
 						iRowspan++;
 					}
-	
+
 					/* Expand the cell to cover as many columns as needed */
 					while ( aoLocal[i][j+iColspan] !== undefined &&
 					        aoLocal[i][j].cell == aoLocal[i][j+iColspan].cell )
@@ -3345,7 +3345,7 @@
 						}
 						iColspan++;
 					}
-	
+
 					/* Do the actual expansion in the DOM */
 					$(aoLocal[i][j].cell)
 						.attr('rowspan', iRowspan)
@@ -3354,8 +3354,8 @@
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Insert the required TR nodes into the table for display
 	 *  @param {object} oSettings dataTables settings object
@@ -3370,7 +3370,7 @@
 			_fnProcessingDisplay( oSettings, false );
 			return;
 		}
-	
+
 		var i, iLen, n;
 		var anRows = [];
 		var iRowCount = 0;
@@ -3381,9 +3381,9 @@
 		var iInitDisplayStart = oSettings.iInitDisplayStart;
 		var bServerSide = _fnDataSource( oSettings ) == 'ssp';
 		var aiDisplay = oSettings.aiDisplay;
-	
+
 		oSettings.bDrawing = true;
-	
+
 		/* Check and see if we have an initial draw position from state saving */
 		if ( iInitDisplayStart !== undefined && iInitDisplayStart !== -1 )
 		{
@@ -3392,13 +3392,13 @@
 				iInitDisplayStart >= oSettings.fnRecordsDisplay() ?
 					0 :
 					iInitDisplayStart;
-	
+
 			oSettings.iInitDisplayStart = -1;
 		}
-	
+
 		var iDisplayStart = oSettings._iDisplayStart;
 		var iDisplayEnd = oSettings.fnDisplayEnd();
-	
+
 		/* Server-side processing draw intercept */
 		if ( oSettings.bDeferLoading )
 		{
@@ -3414,12 +3414,12 @@
 		{
 			return;
 		}
-	
+
 		if ( aiDisplay.length !== 0 )
 		{
 			var iStart = bServerSide ? 0 : iDisplayStart;
 			var iEnd = bServerSide ? oSettings.aoData.length : iDisplayEnd;
-	
+
 			for ( var j=iStart ; j<iEnd ; j++ )
 			{
 				var iDataIndex = aiDisplay[j];
@@ -3428,9 +3428,9 @@
 				{
 					_fnCreateTr( oSettings, iDataIndex );
 				}
-	
+
 				var nRow = aoData.nTr;
-	
+
 				/* Remove the old striping classes and then add the new one */
 				if ( iStripes !== 0 )
 				{
@@ -3441,13 +3441,13 @@
 						aoData._sRowStripe = sStripe;
 					}
 				}
-	
+
 				// Row callback functions - might want to manipulate the row
 				// iRowCount and j are not currently documented. Are they at all
 				// useful?
 				_fnCallbackFire( oSettings, 'aoRowCallback', null,
 					[nRow, aoData._aData, iRowCount, j] );
-	
+
 				anRows.push( nRow );
 				iRowCount++;
 			}
@@ -3464,7 +3464,7 @@
 			{
 				sZero = oLang.sEmptyTable;
 			}
-	
+
 			anRows[ 0 ] = $( '<tr/>', { 'class': iStripes ? asStripeClasses[0] : '' } )
 				.append( $('<td />', {
 					'valign':  'top',
@@ -3472,29 +3472,29 @@
 					'class':   oSettings.oClasses.sRowEmpty
 				} ).html( sZero ) )[0];
 		}
-	
+
 		/* Header and footer callbacks */
 		_fnCallbackFire( oSettings, 'aoHeaderCallback', 'header', [ $(oSettings.nTHead).children('tr')[0],
 			_fnGetDataMaster( oSettings ), iDisplayStart, iDisplayEnd, aiDisplay ] );
-	
+
 		_fnCallbackFire( oSettings, 'aoFooterCallback', 'footer', [ $(oSettings.nTFoot).children('tr')[0],
 			_fnGetDataMaster( oSettings ), iDisplayStart, iDisplayEnd, aiDisplay ] );
-	
+
 		var body = $(oSettings.nTBody);
-	
+
 		body.children().detach();
 		body.append( $(anRows) );
-	
+
 		/* Call all required callback functions for the end of a draw */
 		_fnCallbackFire( oSettings, 'aoDrawCallback', 'draw', [oSettings] );
-	
+
 		/* Draw is complete, sorting and filtering must be as well */
 		oSettings.bSorted = false;
 		oSettings.bFiltered = false;
 		oSettings.bDrawing = false;
 	}
-	
-	
+
+
 	/**
 	 * Redraw the table - taking account of the various features which are enabled
 	 *  @param {object} oSettings dataTables settings object
@@ -3508,11 +3508,11 @@
 			features = settings.oFeatures,
 			sort     = features.bSort,
 			filter   = features.bFilter;
-	
+
 		if ( sort ) {
 			_fnSort( settings );
 		}
-	
+
 		if ( filter ) {
 			_fnFilterComplete( settings, settings.oPreviousSearch );
 		}
@@ -3520,21 +3520,21 @@
 			// No filtering, so we want to just use the display master
 			settings.aiDisplay = settings.aiDisplayMaster.slice();
 		}
-	
+
 		if ( holdPosition !== true ) {
 			settings._iDisplayStart = 0;
 		}
-	
+
 		// Let any modules know about the draw hold position state (used by
 		// scrolling internally)
 		settings._drawHold = holdPosition;
-	
+
 		_fnDraw( settings );
-	
+
 		settings._drawHold = false;
 	}
-	
-	
+
+
 	/**
 	 * Add the options to the page HTML for the table
 	 *  @param {object} oSettings dataTables settings object
@@ -3546,17 +3546,17 @@
 		var table = $(oSettings.nTable);
 		var holding = $('<div/>').insertBefore( table ); // Holding element for speed
 		var features = oSettings.oFeatures;
-	
+
 		// All DataTables are wrapped in a div
 		var insert = $('<div/>', {
 			id:      oSettings.sTableId+'_wrapper',
 			'class': classes.sWrapper + (oSettings.nTFoot ? '' : ' '+classes.sNoFooter)
 		} );
-	
+
 		oSettings.nHolding = holding[0];
 		oSettings.nTableWrapper = insert[0];
 		oSettings.nTableReinsertBefore = oSettings.nTable.nextSibling;
-	
+
 		/* Loop over the user set positioning and place the elements as needed */
 		var aDom = oSettings.sDom.split('');
 		var featureNode, cOption, nNewNode, cNext, sAttr, j;
@@ -3564,12 +3564,12 @@
 		{
 			featureNode = null;
 			cOption = aDom[i];
-	
+
 			if ( cOption == '<' )
 			{
 				/* New container div */
 				nNewNode = $('<div/>')[0];
-	
+
 				/* Check to see if we should append an id and/or a class name to the container */
 				cNext = aDom[i+1];
 				if ( cNext == "'" || cNext == '"' )
@@ -3581,7 +3581,7 @@
 						sAttr += aDom[i+j];
 						j++;
 					}
-	
+
 					/* Replace jQuery UI constants @todo depreciated */
 					if ( sAttr == "H" )
 					{
@@ -3591,7 +3591,7 @@
 					{
 						sAttr = classes.sJUIFooter;
 					}
-	
+
 					/* The attribute can be in the format of "#id.class", "#id" or "class" This logic
 					 * breaks the string into parts and applies them as needed
 					 */
@@ -3609,10 +3609,10 @@
 					{
 						nNewNode.className = sAttr;
 					}
-	
+
 					i += j; /* Move along the position array */
 				}
-	
+
 				insert.append( nNewNode );
 				insert = $(nNewNode);
 			}
@@ -3665,28 +3665,28 @@
 					}
 				}
 			}
-	
+
 			/* Add to the 2D features array */
 			if ( featureNode )
 			{
 				var aanFeatures = oSettings.aanFeatures;
-	
+
 				if ( ! aanFeatures[cOption] )
 				{
 					aanFeatures[cOption] = [];
 				}
-	
+
 				aanFeatures[cOption].push( featureNode );
 				insert.append( featureNode );
 			}
 		}
-	
+
 		/* Built our DOM structure - replace the holding div with what we want */
 		holding.replaceWith( insert );
 		oSettings.nHolding = null;
 	}
-	
-	
+
+
 	/**
 	 * Use the DOM source to create up an array of header cells. The idea here is to
 	 * create a layout grid (array) of rows x columns, which contains a reference
@@ -3709,21 +3709,21 @@
 			}
 			return j;
 		};
-	
+
 		aLayout.splice( 0, aLayout.length );
-	
+
 		/* We know how many rows there are in the layout - so prep it */
 		for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
 		{
 			aLayout.push( [] );
 		}
-	
+
 		/* Calculate a layout array */
 		for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
 		{
 			nTr = nTrs[i];
 			iColumn = 0;
-	
+
 			/* For every cell in the row... */
 			nCell = nTr.firstChild;
 			while ( nCell ) {
@@ -3735,15 +3735,15 @@
 					iRowspan = nCell.getAttribute('rowspan') * 1;
 					iColspan = (!iColspan || iColspan===0 || iColspan===1) ? 1 : iColspan;
 					iRowspan = (!iRowspan || iRowspan===0 || iRowspan===1) ? 1 : iRowspan;
-	
+
 					/* There might be colspan cells already in this row, so shift our target
 					 * accordingly
 					 */
 					iColShifted = fnShiftCol( aLayout, i, iColumn );
-	
+
 					/* Cache calculation for unique columns */
 					bUnique = iColspan === 1 ? true : false;
-	
+
 					/* If there is col / rowspan, copy the information into the layout grid */
 					for ( l=0 ; l<iColspan ; l++ )
 					{
@@ -3761,8 +3761,8 @@
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Get an array of unique th elements, one for each column
 	 *  @param {object} oSettings dataTables settings object
@@ -3783,7 +3783,7 @@
 				_fnDetectHeader( aLayout, nHeader );
 			}
 		}
-	
+
 		for ( var i=0, iLen=aLayout.length ; i<iLen ; i++ )
 		{
 			for ( var j=0, jLen=aLayout[i].length ; j<jLen ; j++ )
@@ -3795,10 +3795,10 @@
 				}
 			}
 		}
-	
+
 		return aReturn;
 	}
-	
+
 	/**
 	 * Create an Ajax call based on the table's settings, taking into account that
 	 * parameters can have multiple forms, and backwards compatibility.
@@ -3812,20 +3812,20 @@
 	{
 		// Compatibility with 1.9-, allow fnServerData and event to manipulate
 		_fnCallbackFire( oSettings, 'aoServerParams', 'serverParams', [data] );
-	
+
 		// Convert to object based for 1.10+ if using the old array scheme which can
 		// come from server-side processing or serverParams
 		if ( data && $.isArray(data) ) {
 			var tmp = {};
 			var rbracket = /(.*?)\[\]$/;
-	
+
 			$.each( data, function (key, val) {
 				var match = val.name.match(rbracket);
-	
+
 				if ( match ) {
 					// Support for arrays
 					var name = match[0];
-	
+
 					if ( ! tmp[ name ] ) {
 						tmp[ name ] = [];
 					}
@@ -3837,7 +3837,7 @@
 			} );
 			data = tmp;
 		}
-	
+
 		var ajaxData;
 		var ajax = oSettings.ajax;
 		var instance = oSettings.oInstance;
@@ -3845,25 +3845,25 @@
 			_fnCallbackFire( oSettings, null, 'xhr', [oSettings, json, oSettings.jqXHR] );
 			fn( json );
 		};
-	
+
 		if ( $.isPlainObject( ajax ) && ajax.data )
 		{
 			ajaxData = ajax.data;
-	
+
 			var newData = $.isFunction( ajaxData ) ?
 				ajaxData( data, oSettings ) :  // fn can manipulate data or return
 				ajaxData;                      // an object object or array to merge
-	
+
 			// If the function returned something, use that alone
 			data = $.isFunction( ajaxData ) && newData ?
 				newData :
 				$.extend( true, data, newData );
-	
+
 			// Remove the data property as we've resolved it already and don't want
 			// jQuery to do it again (it is restored at the end of the function)
 			delete ajax.data;
 		}
-	
+
 		var baseAjax = {
 			"data": data,
 			"success": function (json) {
@@ -3871,7 +3871,7 @@
 				if ( error ) {
 					_fnLog( oSettings, 0, error );
 				}
-	
+
 				oSettings.json = json;
 				callback( json );
 			},
@@ -3880,7 +3880,7 @@
 			"type": oSettings.sServerMethod,
 			"error": function (xhr, error, thrown) {
 				var ret = _fnCallbackFire( oSettings, null, 'xhr', [oSettings, null, oSettings.jqXHR] );
-	
+
 				if ( $.inArray( true, ret ) === -1 ) {
 					if ( error == "parsererror" ) {
 						_fnLog( oSettings, 0, 'Invalid JSON response', 1 );
@@ -3889,17 +3889,17 @@
 						_fnLog( oSettings, 0, 'Ajax error', 7 );
 					}
 				}
-	
+
 				_fnProcessingDisplay( oSettings, false );
 			}
 		};
-	
+
 		// Store the data submitted for the API
 		oSettings.oAjaxData = data;
-	
+
 		// Allow plug-ins and external processes to modify the data
 		_fnCallbackFire( oSettings, null, 'preXhr', [oSettings, data] );
-	
+
 		if ( oSettings.fnServerData )
 		{
 			// DataTables 1.9- compatibility
@@ -3928,13 +3928,13 @@
 		{
 			// Object to extend the base settings
 			oSettings.jqXHR = $.ajax( $.extend( baseAjax, ajax ) );
-	
+
 			// Restore for next time around
 			ajax.data = ajaxData;
 		}
 	}
-	
-	
+
+
 	/**
 	 * Update the table using an Ajax call
 	 *  @param {object} settings dataTables settings object
@@ -3946,7 +3946,7 @@
 		if ( settings.bAjaxDataGet ) {
 			settings.iDraw++;
 			_fnProcessingDisplay( settings, true );
-	
+
 			_fnBuildAjax(
 				settings,
 				_fnAjaxParameters( settings ),
@@ -3954,13 +3954,13 @@
 					_fnAjaxUpdateDraw( settings, json );
 				}
 			);
-	
+
 			return false;
 		}
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * Build up the parameters in an object needed for a server-side processing
 	 * request. Note that this is basically done twice, is different ways - a modern
@@ -3986,18 +3986,18 @@
 			displayLength = features.bPaginate !== false ?
 				settings._iDisplayLength :
 				-1;
-	
+
 		var param = function ( name, value ) {
 			data.push( { 'name': name, 'value': value } );
 		};
-	
+
 		// DataTables 1.9- compatible method
 		param( 'sEcho',          settings.iDraw );
 		param( 'iColumns',       columnCount );
 		param( 'sColumns',       _pluck( columns, 'sName' ).join(',') );
 		param( 'iDisplayStart',  displayStart );
 		param( 'iDisplayLength', displayLength );
-	
+
 		// DataTables 1.10+ method
 		var d = {
 			draw:    settings.iDraw,
@@ -4010,12 +4010,12 @@
 				regex: preSearch.bRegex
 			}
 		};
-	
+
 		for ( i=0 ; i<columnCount ; i++ ) {
 			column = columns[i];
 			columnSearch = preColSearch[i];
 			dataProp = typeof column.mData=="function" ? 'function' : column.mData ;
-	
+
 			d.columns.push( {
 				data:       dataProp,
 				name:       column.sName,
@@ -4026,49 +4026,49 @@
 					regex: columnSearch.bRegex
 				}
 			} );
-	
+
 			param( "mDataProp_"+i, dataProp );
-	
+
 			if ( features.bFilter ) {
 				param( 'sSearch_'+i,     columnSearch.sSearch );
 				param( 'bRegex_'+i,      columnSearch.bRegex );
 				param( 'bSearchable_'+i, column.bSearchable );
 			}
-	
+
 			if ( features.bSort ) {
 				param( 'bSortable_'+i, column.bSortable );
 			}
 		}
-	
+
 		if ( features.bFilter ) {
 			param( 'sSearch', preSearch.sSearch );
 			param( 'bRegex', preSearch.bRegex );
 		}
-	
+
 		if ( features.bSort ) {
 			$.each( sort, function ( i, val ) {
 				d.order.push( { column: val.col, dir: val.dir } );
-	
+
 				param( 'iSortCol_'+i, val.col );
 				param( 'sSortDir_'+i, val.dir );
 			} );
-	
+
 			param( 'iSortingCols', sort.length );
 		}
-	
+
 		// If the legacy.ajax parameter is null, then we automatically decide which
 		// form to use, based on sAjaxSource
 		var legacy = DataTable.ext.legacy.ajax;
 		if ( legacy === null ) {
 			return settings.sAjaxSource ? data : d;
 		}
-	
+
 		// Otherwise, if legacy has been specified then we use that to decide on the
 		// form
 		return legacy ? data : d;
 	}
-	
-	
+
+
 	/**
 	 * Data the data from the server (nuking the old) and redraw the table
 	 *  @param {object} oSettings dataTables settings object
@@ -4087,12 +4087,12 @@
 		var compat = function ( old, modern ) {
 			return json[old] !== undefined ? json[old] : json[modern];
 		};
-	
+
 		var data = _fnAjaxDataSrc( settings, json );
 		var draw            = compat( 'sEcho',                'draw' );
 		var recordsTotal    = compat( 'iTotalRecords',        'recordsTotal' );
 		var recordsFiltered = compat( 'iTotalDisplayRecords', 'recordsFiltered' );
-	
+
 		if ( draw ) {
 			// Protect against out of sequence returns
 			if ( draw*1 < settings.iDraw ) {
@@ -4100,28 +4100,28 @@
 			}
 			settings.iDraw = draw * 1;
 		}
-	
+
 		_fnClearTable( settings );
 		settings._iRecordsTotal   = parseInt(recordsTotal, 10);
 		settings._iRecordsDisplay = parseInt(recordsFiltered, 10);
-	
+
 		for ( var i=0, ien=data.length ; i<ien ; i++ ) {
 			_fnAddData( settings, data[i] );
 		}
 		settings.aiDisplay = settings.aiDisplayMaster.slice();
-	
+
 		settings.bAjaxDataGet = false;
 		_fnDraw( settings );
-	
+
 		if ( ! settings._bInitComplete ) {
 			_fnInitComplete( settings, json );
 		}
-	
+
 		settings.bAjaxDataGet = true;
 		_fnProcessingDisplay( settings, false );
 	}
-	
-	
+
+
 	/**
 	 * Get the data from the JSON data source to use for drawing a table. Using
 	 * `_fnGetObjectDataFn` allows the data to be sourced from a property of the
@@ -4135,18 +4135,18 @@
 		var dataSrc = $.isPlainObject( oSettings.ajax ) && oSettings.ajax.dataSrc !== undefined ?
 			oSettings.ajax.dataSrc :
 			oSettings.sAjaxDataProp; // Compatibility with 1.9-.
-	
+
 		// Compatibility with 1.9-. In order to read from aaData, check if the
 		// default has been changed, if not, check for aaData
 		if ( dataSrc === 'data' ) {
 			return json.aaData || json[dataSrc];
 		}
-	
+
 		return dataSrc !== "" ?
 			_fnGetObjectDataFn( dataSrc )( json ) :
 			json;
 	}
-	
+
 	/**
 	 * Generate the node required for filtering text
 	 *  @returns {node} Filter control element
@@ -4161,23 +4161,23 @@
 		var previousSearch = settings.oPreviousSearch;
 		var features = settings.aanFeatures;
 		var input = '<input type="search" class="'+classes.sFilterInput+'"/>';
-	
+
 		var str = language.sSearch;
 		str = str.match(/_INPUT_/) ?
 			str.replace('_INPUT_', input) :
 			str+input;
-	
+
 		var filter = $('<div/>', {
 				'id': ! features.f ? tableId+'_filter' : null,
 				'class': classes.sFilter
 			} )
 			.append( $('<label/>' ).append( str ) );
-	
+
 		var searchFn = function() {
 			/* Update all other filter input elements for the new display */
 			var n = features.f;
 			var val = !this.value ? "" : this.value; // mental IE8 fix :-(
-	
+
 			/* Now do the filter */
 			if ( val != previousSearch.sSearch ) {
 				_fnFilterComplete( settings, {
@@ -4186,19 +4186,19 @@
 					"bSmart": previousSearch.bSmart ,
 					"bCaseInsensitive": previousSearch.bCaseInsensitive
 				} );
-	
+
 				// Need to redraw, without resorting
 				settings._iDisplayStart = 0;
 				_fnDraw( settings );
 			}
 		};
-	
+
 		var searchDelay = settings.searchDelay !== null ?
 			settings.searchDelay :
 			_fnDataSource( settings ) === 'ssp' ?
 				400 :
 				0;
-	
+
 		var jqFilter = $('input', filter)
 			.val( previousSearch.sSearch )
 			.attr( 'placeholder', language.sSearchPlaceholder )
@@ -4215,7 +4215,7 @@
 				}
 			} )
 			.attr('aria-controls', tableId);
-	
+
 		// Update the input elements whenever the table is filtered
 		$(settings.nTable).on( 'search.dt.DT', function ( ev, s ) {
 			if ( settings === s ) {
@@ -4229,11 +4229,11 @@
 				catch ( e ) {}
 			}
 		} );
-	
+
 		return filter[0];
 	}
-	
-	
+
+
 	/**
 	 * Filter the table using both the global filter and column based filtering
 	 *  @param {object} oSettings dataTables settings object
@@ -4256,25 +4256,25 @@
 			// Backwards compatibility with the bEscapeRegex option
 			return o.bEscapeRegex !== undefined ? !o.bEscapeRegex : o.bRegex;
 		};
-	
+
 		// Resolve any column types that are unknown due to addition or invalidation
 		// @todo As per sort - can this be moved into an event handler?
 		_fnColumnTypes( oSettings );
-	
+
 		/* In server-side processing all filtering is done by the server, so no point hanging around here */
 		if ( _fnDataSource( oSettings ) != 'ssp' )
 		{
 			/* Global filter */
 			_fnFilter( oSettings, oInput.sSearch, iForce, fnRegex(oInput), oInput.bSmart, oInput.bCaseInsensitive );
 			fnSaveFilter( oInput );
-	
+
 			/* Now do the individual column filter */
 			for ( var i=0 ; i<aoPrevSearch.length ; i++ )
 			{
 				_fnFilterColumn( oSettings, aoPrevSearch[i].sSearch, i, fnRegex(aoPrevSearch[i]),
 					aoPrevSearch[i].bSmart, aoPrevSearch[i].bCaseInsensitive );
 			}
-	
+
 			/* Custom filtering */
 			_fnFilterCustom( oSettings );
 		}
@@ -4282,13 +4282,13 @@
 		{
 			fnSaveFilter( oInput );
 		}
-	
+
 		/* Tell the draw function we have been filtering */
 		oSettings.bFiltered = true;
 		_fnCallbackFire( oSettings, null, 'search', [oSettings] );
 	}
-	
-	
+
+
 	/**
 	 * Apply custom filtering functions
 	 *  @param {object} oSettings dataTables settings object
@@ -4299,28 +4299,28 @@
 		var filters = DataTable.ext.search;
 		var displayRows = settings.aiDisplay;
 		var row, rowIdx;
-	
+
 		for ( var i=0, ien=filters.length ; i<ien ; i++ ) {
 			var rows = [];
-	
+
 			// Loop over each row and see if it should be included
 			for ( var j=0, jen=displayRows.length ; j<jen ; j++ ) {
 				rowIdx = displayRows[ j ];
 				row = settings.aoData[ rowIdx ];
-	
+
 				if ( filters[i]( settings, row._aFilterData, rowIdx, row._aData, j ) ) {
 					rows.push( rowIdx );
 				}
 			}
-	
+
 			// So the array reference doesn't break set the results into the
 			// existing array
 			displayRows.length = 0;
 			$.merge( displayRows, rows );
 		}
 	}
-	
-	
+
+
 	/**
 	 * Filter the table on a per-column basis
 	 *  @param {object} oSettings dataTables settings object
@@ -4336,21 +4336,21 @@
 		if ( searchStr === '' ) {
 			return;
 		}
-	
+
 		var data;
 		var display = settings.aiDisplay;
 		var rpSearch = _fnFilterCreateSearch( searchStr, regex, smart, caseInsensitive );
-	
+
 		for ( var i=display.length-1 ; i>=0 ; i-- ) {
 			data = settings.aoData[ display[i] ]._aFilterData[ colIdx ];
-	
+
 			if ( ! rpSearch.test( data ) ) {
 				display.splice( i, 1 );
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Filter the data table based on user input and draw the table
 	 *  @param {object} settings dataTables settings object
@@ -4367,15 +4367,15 @@
 		var prevSearch = settings.oPreviousSearch.sSearch;
 		var displayMaster = settings.aiDisplayMaster;
 		var display, invalidated, i;
-	
+
 		// Need to take account of custom filtering functions - always filter
 		if ( DataTable.ext.search.length !== 0 ) {
 			force = true;
 		}
-	
+
 		// Check if any of the rows were invalidated
 		invalidated = _fnFilterData( settings );
-	
+
 		// If the input is blank - we just want the full data set
 		if ( input.length <= 0 ) {
 			settings.aiDisplay = displayMaster.slice();
@@ -4391,10 +4391,10 @@
 			) {
 				settings.aiDisplay = displayMaster.slice();
 			}
-	
+
 			// Search the display array
 			display = settings.aiDisplay;
-	
+
 			for ( i=display.length-1 ; i>=0 ; i-- ) {
 				if ( ! rpSearch.test( settings.aoData[ display[i] ]._sFilterRow ) ) {
 					display.splice( i, 1 );
@@ -4402,8 +4402,8 @@
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Build a regular expression object suitable for searching a table
 	 *  @param {string} sSearch string to search for
@@ -4418,13 +4418,13 @@
 		search = regex ?
 			search :
 			_fnEscapeRegex( search );
-		
+
 		if ( smart ) {
 			/* For smart filtering we want to allow the search to work regardless of
 			 * word order. We also want double quoted text to be preserved, so word
 			 * order is important - a la google. So this is what we want to
 			 * generate:
-			 * 
+			 *
 			 * ^(?=.*?\bone\b)(?=.*?\btwo three\b)(?=.*?\bfour\b).*$
 			 */
 			var a = $.map( search.match( /"[^"]+"|[^ ]+/g ) || [''], function ( word ) {
@@ -4432,17 +4432,17 @@
 					var m = word.match( /^"(.*)"$/ );
 					word = m ? m[1] : word;
 				}
-	
+
 				return word.replace('"', '');
 			} );
-	
+
 			search = '^(?=.*?'+a.join( ')(?=.*?' )+').*$';
 		}
-	
+
 		return new RegExp( search, caseInsensitive ? 'i' : '' );
 	}
-	
-	
+
+
 	/**
 	 * Escape a string such that it can be used in a regular expression
 	 *  @param {string} sVal string to escape
@@ -4450,10 +4450,10 @@
 	 *  @memberof DataTable#oApi
 	 */
 	var _fnEscapeRegex = DataTable.util.escapeRegex;
-	
+
 	var __filter_div = $('<div>')[0];
 	var __filter_div_textContent = __filter_div.textContent !== undefined;
-	
+
 	// Update the filtering data for each row if needed (by invalidation or first run)
 	function _fnFilterData ( settings )
 	{
@@ -4462,29 +4462,29 @@
 		var i, j, ien, jen, filterData, cellData, row;
 		var fomatters = DataTable.ext.type.search;
 		var wasInvalidated = false;
-	
+
 		for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
 			row = settings.aoData[i];
-	
+
 			if ( ! row._aFilterData ) {
 				filterData = [];
-	
+
 				for ( j=0, jen=columns.length ; j<jen ; j++ ) {
 					column = columns[j];
-	
+
 					if ( column.bSearchable ) {
 						cellData = _fnGetCellData( settings, i, j, 'filter' );
-	
+
 						if ( fomatters[ column.sType ] ) {
 							cellData = fomatters[ column.sType ]( cellData );
 						}
-	
+
 						// Search in DataTables 1.10 is string based. In 1.11 this
 						// should be altered to also allow strict type checking.
 						if ( cellData === null ) {
 							cellData = '';
 						}
-	
+
 						if ( typeof cellData !== 'string' && cellData.toString ) {
 							cellData = cellData.toString();
 						}
@@ -4492,7 +4492,7 @@
 					else {
 						cellData = '';
 					}
-	
+
 					// If it looks like there is an HTML entity in the string,
 					// attempt to decode it so sorting works as expected. Note that
 					// we could use a single line of jQuery to do this, but the DOM
@@ -4503,24 +4503,24 @@
 							__filter_div.textContent :
 							__filter_div.innerText;
 					}
-	
+
 					if ( cellData.replace ) {
 						cellData = cellData.replace(/[\r\n]/g, '');
 					}
-	
+
 					filterData.push( cellData );
 				}
-	
+
 				row._aFilterData = filterData;
 				row._sFilterRow = filterData.join('  ');
 				wasInvalidated = true;
 			}
 		}
-	
+
 		return wasInvalidated;
 	}
-	
-	
+
+
 	/**
 	 * Convert from the internal Hungarian notation to camelCase for external
 	 * interaction
@@ -4537,9 +4537,9 @@
 			caseInsensitive: obj.bCaseInsensitive
 		};
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Convert from camelCase notation to the internal Hungarian. We could use the
 	 * Hungarian convert function here, but this is cleaner
@@ -4556,7 +4556,7 @@
 			bCaseInsensitive: obj.caseInsensitive
 		};
 	}
-	
+
 	/**
 	 * Generate the node required for the info display
 	 *  @param {object} oSettings dataTables settings object
@@ -4572,26 +4572,26 @@
 				'class': settings.oClasses.sInfo,
 				'id': ! nodes ? tid+'_info' : null
 			} );
-	
+
 		if ( ! nodes ) {
 			// Update display on each draw
 			settings.aoDrawCallback.push( {
 				"fn": _fnUpdateInfo,
 				"sName": "information"
 			} );
-	
+
 			n
 				.attr( 'role', 'status' )
 				.attr( 'aria-live', 'polite' );
-	
+
 			// Table is described by our info div
 			$(settings.nTable).attr( 'aria-describedby', tid+'_info' );
 		}
-	
+
 		return n[0];
 	}
-	
-	
+
+
 	/**
 	 * Update the information elements in the display
 	 *  @param {object} settings dataTables settings object
@@ -4604,7 +4604,7 @@
 		if ( nodes.length === 0 ) {
 			return;
 		}
-	
+
 		var
 			lang  = settings.oLanguage,
 			start = settings._iDisplayStart+1,
@@ -4614,27 +4614,27 @@
 			out   = total ?
 				lang.sInfo :
 				lang.sInfoEmpty;
-	
+
 		if ( total !== max ) {
 			/* Record set after filtering */
 			out += ' ' + lang.sInfoFiltered;
 		}
-	
+
 		// Convert the macros
 		out += lang.sInfoPostFix;
 		out = _fnInfoMacros( settings, out );
-	
+
 		var callback = lang.fnInfoCallback;
 		if ( callback !== null ) {
 			out = callback.call( settings.oInstance,
 				settings, start, end, max, total, out
 			);
 		}
-	
+
 		$(nodes).html( out );
 	}
-	
-	
+
+
 	function _fnInfoMacros ( settings, str )
 	{
 		// When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
@@ -4645,7 +4645,7 @@
 			len        = settings._iDisplayLength,
 			vis        = settings.fnRecordsDisplay(),
 			all        = len === -1;
-	
+
 		return str.
 			replace(/_START_/g, formatter.call( settings, start ) ).
 			replace(/_END_/g,   formatter.call( settings, settings.fnDisplayEnd() ) ).
@@ -4654,9 +4654,9 @@
 			replace(/_PAGE_/g,  formatter.call( settings, all ? 1 : Math.ceil( start / len ) ) ).
 			replace(/_PAGES_/g, formatter.call( settings, all ? 1 : Math.ceil( vis / len ) ) );
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Draw the table for the first time, adding all required features
 	 *  @param {object} settings dataTables settings object
@@ -4668,45 +4668,45 @@
 		var columns = settings.aoColumns, column;
 		var features = settings.oFeatures;
 		var deferLoading = settings.bDeferLoading; // value modified by the draw
-	
+
 		/* Ensure that the table data is fully initialised */
 		if ( ! settings.bInitialised ) {
 			setTimeout( function(){ _fnInitialise( settings ); }, 200 );
 			return;
 		}
-	
+
 		/* Show the display HTML options */
 		_fnAddOptionsHtml( settings );
-	
+
 		/* Build and draw the header / footer for the table */
 		_fnBuildHead( settings );
 		_fnDrawHead( settings, settings.aoHeader );
 		_fnDrawHead( settings, settings.aoFooter );
-	
+
 		/* Okay to show that something is going on now */
 		_fnProcessingDisplay( settings, true );
-	
+
 		/* Calculate sizes for columns */
 		if ( features.bAutoWidth ) {
 			_fnCalculateColumnWidths( settings );
 		}
-	
+
 		for ( i=0, iLen=columns.length ; i<iLen ; i++ ) {
 			column = columns[i];
-	
+
 			if ( column.sWidth ) {
 				column.nTh.style.width = _fnStringToCss( column.sWidth );
 			}
 		}
-	
+
 		_fnCallbackFire( settings, null, 'preInit', [settings] );
-	
+
 		// If there is default sorting required - let's do it. The sort function
 		// will do the drawing for us. Otherwise we draw the table regardless of the
 		// Ajax source - this allows the table to look initialised for Ajax sourcing
 		// data (show 'loading' message possibly)
 		_fnReDraw( settings );
-	
+
 		// Server-side processing init complete is done by _fnAjaxUpdateDraw
 		var dataSrc = _fnDataSource( settings );
 		if ( dataSrc != 'ssp' || deferLoading ) {
@@ -4714,19 +4714,19 @@
 			if ( dataSrc == 'ajax' ) {
 				_fnBuildAjax( settings, [], function(json) {
 					var aData = _fnAjaxDataSrc( settings, json );
-	
+
 					// Got the data - add it to the table
 					for ( i=0 ; i<aData.length ; i++ ) {
 						_fnAddData( settings, aData[i] );
 					}
-	
+
 					// Reset the init display for cookie saving. We've already done
 					// a filter, and therefore cleared it before. So we need to make
 					// it appear 'fresh'
 					settings.iInitDisplayStart = iAjaxStart;
-	
+
 					_fnReDraw( settings );
-	
+
 					_fnProcessingDisplay( settings, false );
 					_fnInitComplete( settings, json );
 				}, settings );
@@ -4737,8 +4737,8 @@
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * Draw the table for the first time, adding all required features
 	 *  @param {object} oSettings dataTables settings object
@@ -4749,30 +4749,30 @@
 	function _fnInitComplete ( settings, json )
 	{
 		settings._bInitComplete = true;
-	
+
 		// When data was added after the initialisation (data or Ajax) we need to
 		// calculate the column sizing
 		if ( json || settings.oInit.aaData ) {
 			_fnAdjustColumnSizing( settings );
 		}
-	
+
 		_fnCallbackFire( settings, null, 'plugin-init', [settings, json] );
 		_fnCallbackFire( settings, 'aoInitComplete', 'init', [settings, json] );
 	}
-	
-	
+
+
 	function _fnLengthChange ( settings, val )
 	{
 		var len = parseInt( val, 10 );
 		settings._iDisplayLength = len;
-	
+
 		_fnLengthOverflow( settings );
-	
+
 		// Fire length change event
 		_fnCallbackFire( settings, null, 'length', [settings, len] );
 	}
-	
-	
+
+
 	/**
 	 * Generate the node required for user display length changing
 	 *  @param {object} settings dataTables settings object
@@ -4788,26 +4788,26 @@
 			d2       = $.isArray( menu[0] ),
 			lengths  = d2 ? menu[0] : menu,
 			language = d2 ? menu[1] : menu;
-	
+
 		var select = $('<select/>', {
 			'name':          tableId+'_length',
 			'aria-controls': tableId,
 			'class':         classes.sLengthSelect
 		} );
-	
+
 		for ( var i=0, ien=lengths.length ; i<ien ; i++ ) {
 			select[0][ i ] = new Option( language[i], lengths[i] );
 		}
-	
+
 		var div = $('<div><label/></div>').addClass( classes.sLength );
 		if ( ! settings.aanFeatures.l ) {
 			div[0].id = tableId+'_length';
 		}
-	
+
 		div.children().append(
 			settings.oLanguage.sLengthMenu.replace( '_MENU_', select[0].outerHTML )
 		);
-	
+
 		// Can't use `select` variable as user might provide their own and the
 		// reference is broken by the use of outerHTML
 		$('select', div)
@@ -4816,24 +4816,24 @@
 				_fnLengthChange( settings, $(this).val() );
 				_fnDraw( settings );
 			} );
-	
+
 		// Update node value whenever anything changes the table's length
 		$(settings.nTable).bind( 'length.dt.DT', function (e, s, len) {
 			if ( settings === s ) {
 				$('select', div).val( len );
 			}
 		} );
-	
+
 		return div[0];
 	}
-	
-	
-	
+
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Note that most of the paging logic is done in
 	 * DataTable.ext.pager
 	 */
-	
+
 	/**
 	 * Generate the node required for default pagination
 	 *  @param {object} oSettings dataTables settings object
@@ -4851,16 +4851,16 @@
 			},
 			node = $('<div/>').addClass( settings.oClasses.sPaging + type )[0],
 			features = settings.aanFeatures;
-	
+
 		if ( ! modern ) {
 			plugin.fnInit( settings, node, redraw );
 		}
-	
+
 		/* Add a draw callback for the pagination on first instance, to update the paging display */
 		if ( ! features.p )
 		{
 			node.id = settings.sTableId+'_paginate';
-	
+
 			settings.aoDrawCallback.push( {
 				"fn": function( settings ) {
 					if ( modern ) {
@@ -4873,7 +4873,7 @@
 							pages = all ? 1 : Math.ceil( visRecords / len ),
 							buttons = plugin(page, pages),
 							i, ien;
-	
+
 						for ( i=0, ien=features.p.length ; i<ien ; i++ ) {
 							_fnRenderer( settings, 'pageButton' )(
 								settings, features.p[i], i, buttons, page, pages
@@ -4887,11 +4887,11 @@
 				"sName": "pagination"
 			} );
 		}
-	
+
 		return node;
 	}
-	
-	
+
+
 	/**
 	 * Alter the display settings to change the page
 	 *  @param {object} settings DataTables settings object
@@ -4907,7 +4907,7 @@
 			start     = settings._iDisplayStart,
 			len       = settings._iDisplayLength,
 			records   = settings.fnRecordsDisplay();
-	
+
 		if ( records === 0 || len === -1 )
 		{
 			start = 0;
@@ -4915,7 +4915,7 @@
 		else if ( typeof action === "number" )
 		{
 			start = action * len;
-	
+
 			if ( start > records )
 			{
 				start = 0;
@@ -4930,7 +4930,7 @@
 			start = len >= 0 ?
 				start - len :
 				0;
-	
+
 			if ( start < 0 )
 			{
 			  start = 0;
@@ -4951,23 +4951,23 @@
 		{
 			_fnLog( settings, 0, "Unknown paging action: "+action, 5 );
 		}
-	
+
 		var changed = settings._iDisplayStart !== start;
 		settings._iDisplayStart = start;
-	
+
 		if ( changed ) {
 			_fnCallbackFire( settings, null, 'page', [settings] );
-	
+
 			if ( redraw ) {
 				_fnDraw( settings );
 			}
 		}
-	
+
 		return changed;
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Generate the node required for the processing node
 	 *  @param {object} settings dataTables settings object
@@ -4983,8 +4983,8 @@
 			.html( settings.oLanguage.sProcessing )
 			.insertBefore( settings.nTable )[0];
 	}
-	
-	
+
+
 	/**
 	 * Display or hide the processing indicator
 	 *  @param {object} settings dataTables settings object
@@ -4996,10 +4996,10 @@
 		if ( settings.oFeatures.bProcessing ) {
 			$(settings.aanFeatures.r).css( 'display', show ? 'block' : 'none' );
 		}
-	
+
 		_fnCallbackFire( settings, null, 'processing', [settings, show] );
 	}
-	
+
 	/**
 	 * Add any control elements for the table - specifically scrolling
 	 *  @param {object} settings dataTables settings object
@@ -5009,17 +5009,17 @@
 	function _fnFeatureHtmlTable ( settings )
 	{
 		var table = $(settings.nTable);
-	
+
 		// Add the ARIA grid role to the table
 		table.attr( 'role', 'grid' );
-	
+
 		// Scrolling from here on in
 		var scroll = settings.oScroll;
-	
+
 		if ( scroll.sX === '' && scroll.sY === '' ) {
 			return settings.nTable;
 		}
-	
+
 		var scrollX = scroll.sX;
 		var scrollY = scroll.sY;
 		var classes = settings.oClasses;
@@ -5032,11 +5032,11 @@
 		var size = function ( s ) {
 			return !s ? null : _fnStringToCss( s );
 		};
-	
+
 		if ( ! footer.length ) {
 			footer = null;
 		}
-	
+
 		/*
 		 * The HTML structure that we want to generate in this function is:
 		 *  div - scroller
@@ -5088,7 +5088,7 @@
 					} )
 					.append( table )
 			);
-	
+
 		if ( footer ) {
 			scroller.append(
 				$(_div, { 'class': classes.sScrollFoot } )
@@ -5111,45 +5111,45 @@
 					)
 			);
 		}
-	
+
 		var children = scroller.children();
 		var scrollHead = children[0];
 		var scrollBody = children[1];
 		var scrollFoot = footer ? children[2] : null;
-	
+
 		// When the body is scrolled, then we also want to scroll the headers
 		if ( scrollX ) {
 			$(scrollBody).on( 'scroll.DT', function (e) {
 				var scrollLeft = this.scrollLeft;
-	
+
 				scrollHead.scrollLeft = scrollLeft;
-	
+
 				if ( footer ) {
 					scrollFoot.scrollLeft = scrollLeft;
 				}
 			} );
 		}
-	
+
 		$(scrollBody).css(
-			scrollY && scroll.bCollapse ? 'max-height' : 'height', 
+			scrollY && scroll.bCollapse ? 'max-height' : 'height',
 			scrollY
 		);
-	
+
 		settings.nScrollHead = scrollHead;
 		settings.nScrollBody = scrollBody;
 		settings.nScrollFoot = scrollFoot;
-	
+
 		// On redraw - align columns
 		settings.aoDrawCallback.push( {
 			"fn": _fnScrollDraw,
 			"sName": "scrolling"
 		} );
-	
+
 		return scroller[0];
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Update the header, footer and body tables for resizing - i.e. column
 	 * alignment.
@@ -5207,12 +5207,12 @@
 				style.borderBottomWidth = "0";
 				style.height = 0;
 			};
-	
+
 		// If the scrollbar visibility has changed from the last draw, we need to
 		// adjust the column sizes as the table width will have changed to account
 		// for the scrollbar
 		var scrollBarVis = divBodyEl.scrollHeight > divBodyEl.clientHeight;
-		
+
 		if ( settings.scrollBarVis !== scrollBarVis && settings.scrollBarVis !== undefined ) {
 			settings.scrollBarVis = scrollBarVis;
 			_fnAdjustColumnSizing( settings );
@@ -5221,31 +5221,31 @@
 		else {
 			settings.scrollBarVis = scrollBarVis;
 		}
-	
+
 		/*
 		 * 1. Re-create the table inside the scrolling div
 		 */
-	
+
 		// Remove the old minimised thead and tfoot elements in the inner table
 		table.children('thead, tfoot').remove();
-	
+
 		if ( footer ) {
 			footerCopy = footer.clone().prependTo( table );
 			footerTrgEls = footer.find('tr'); // the original tfoot is in its own table and must be sized
 			footerSrcEls = footerCopy.find('tr');
 		}
-	
+
 		// Clone the current header and footer elements and then place it into the inner table
 		headerCopy = header.clone().prependTo( table );
 		headerTrgEls = header.find('tr'); // original header is in its own table
 		headerSrcEls = headerCopy.find('tr');
 		headerCopy.find('th, td').removeAttr('tabindex');
-	
-	
+
+
 		/*
 		 * 2. Take live measurements from the DOM - do not alter the DOM itself!
 		 */
-	
+
 		// Remove old sizing and apply the calculated column widths
 		// Get the unique column headers in the newly created (cloned) header. We want to apply the
 		// calculated sizes to this header
@@ -5254,24 +5254,24 @@
 			divBodyStyle.width = '100%';
 			divHeader[0].style.width = '100%';
 		}
-	
+
 		$.each( _fnGetUniqueThs( settings, headerCopy ), function ( i, el ) {
 			idx = _fnVisibleToColumnIndex( settings, i );
 			el.style.width = settings.aoColumns[idx].sWidth;
 		} );
-	
+
 		if ( footer ) {
 			_fnApplyToChildren( function(n) {
 				n.style.width = "";
 			}, footerSrcEls );
 		}
-	
+
 		// Size the table as a whole
 		sanityWidth = table.outerWidth();
 		if ( scrollX === "" ) {
 			// No x scrolling
 			tableStyle.width = "100%";
-	
+
 			// IE7 will make the width of the table when 100% include the scrollbar
 			// - which is shouldn't. When there is a scrollbar we need to take this
 			// into account.
@@ -5280,30 +5280,30 @@
 			) {
 				tableStyle.width = _fnStringToCss( table.outerWidth() - barWidth);
 			}
-	
+
 			// Recalculate the sanity width
 			sanityWidth = table.outerWidth();
 		}
 		else if ( scrollXInner !== "" ) {
 			// legacy x scroll inner has been given - use it
 			tableStyle.width = _fnStringToCss(scrollXInner);
-	
+
 			// Recalculate the sanity width
 			sanityWidth = table.outerWidth();
 		}
-	
+
 		// Hidden header should have zero height, so remove padding and borders. Then
 		// set the width based on the real headers
-	
+
 		// Apply all styles in one pass
 		_fnApplyToChildren( zeroOut, headerSrcEls );
-	
+
 		// Read all widths in next pass
 		_fnApplyToChildren( function(nSizer) {
 			headerContent.push( nSizer.innerHTML );
 			headerWidths.push( _fnStringToCss( $(nSizer).css('width') ) );
 		}, headerSrcEls );
-	
+
 		// Apply all widths in final pass
 		_fnApplyToChildren( function(nToSize, i) {
 			// Only apply widths to the DataTables detected header cells - this
@@ -5312,31 +5312,31 @@
 				nToSize.style.width = headerWidths[i];
 			}
 		}, headerTrgEls );
-	
+
 		$(headerSrcEls).height(0);
-	
+
 		/* Same again with the footer if we have one */
 		if ( footer )
 		{
 			_fnApplyToChildren( zeroOut, footerSrcEls );
-	
+
 			_fnApplyToChildren( function(nSizer) {
 				footerContent.push( nSizer.innerHTML );
 				footerWidths.push( _fnStringToCss( $(nSizer).css('width') ) );
 			}, footerSrcEls );
-	
+
 			_fnApplyToChildren( function(nToSize, i) {
 				nToSize.style.width = footerWidths[i];
 			}, footerTrgEls );
-	
+
 			$(footerSrcEls).height(0);
 		}
-	
-	
+
+
 		/*
 		 * 3. Apply the measurements
 		 */
-	
+
 		// "Hide" the header and footer that we used for the sizing. We need to keep
 		// the content of the cell so that the width applied to the header and body
 		// both match, but we want to hide it completely. We want to also fix their
@@ -5345,7 +5345,7 @@
 			nSizer.innerHTML = '<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+headerContent[i]+'</div>';
 			nSizer.style.width = headerWidths[i];
 		}, headerSrcEls );
-	
+
 		if ( footer )
 		{
 			_fnApplyToChildren( function(nSizer, i) {
@@ -5353,7 +5353,7 @@
 				nSizer.style.width = footerWidths[i];
 			}, footerSrcEls );
 		}
-	
+
 		// Sanity check that the table is of a sensible width. If not then we are going to get
 		// misalignment - try to prevent this by not allowing the table to shrink below its min width
 		if ( table.outerWidth() < sanityWidth )
@@ -5363,14 +5363,14 @@
 				divBody.css('overflow-y') == "scroll")) ?
 					sanityWidth+barWidth :
 					sanityWidth;
-	
+
 			// IE6/7 are a law unto themselves...
 			if ( ie67 && (divBodyEl.scrollHeight >
 				divBodyEl.offsetHeight || divBody.css('overflow-y') == "scroll")
 			) {
 				tableStyle.width = _fnStringToCss( correction-barWidth );
 			}
-	
+
 			// And give the user a warning that we've stopped the table getting too small
 			if ( scrollX === "" || scrollXInner !== "" ) {
 				_fnLog( settings, 1, 'Possible column misalignment', 6 );
@@ -5380,16 +5380,16 @@
 		{
 			correction = '100%';
 		}
-	
+
 		// Apply to the container elements
 		divBodyStyle.width = _fnStringToCss( correction );
 		divHeaderStyle.width = _fnStringToCss( correction );
-	
+
 		if ( footer ) {
 			settings.nScrollFoot.style.width = _fnStringToCss( correction );
 		}
-	
-	
+
+
 		/*
 		 * 4. Clean up
 		 */
@@ -5402,39 +5402,39 @@
 				divBodyStyle.height = _fnStringToCss( tableEl.offsetHeight+barWidth );
 			}
 		}
-	
+
 		/* Finally set the width's of the header and footer tables */
 		var iOuterWidth = table.outerWidth();
 		divHeaderTable[0].style.width = _fnStringToCss( iOuterWidth );
 		divHeaderInnerStyle.width = _fnStringToCss( iOuterWidth );
-	
+
 		// Figure out if there are scrollbar present - if so then we need a the header and footer to
 		// provide a bit more space to allow "overflow" scrolling (i.e. past the scrollbar)
 		var bScrolling = table.height() > divBodyEl.clientHeight || divBody.css('overflow-y') == "scroll";
 		var padding = 'padding' + (browser.bScrollbarLeft ? 'Left' : 'Right' );
 		divHeaderInnerStyle[ padding ] = bScrolling ? barWidth+"px" : "0px";
-	
+
 		if ( footer ) {
 			divFooterTable[0].style.width = _fnStringToCss( iOuterWidth );
 			divFooterInner[0].style.width = _fnStringToCss( iOuterWidth );
 			divFooterInner[0].style[padding] = bScrolling ? barWidth+"px" : "0px";
 		}
-	
+
 		// Correct DOM ordering for colgroup - comes before the thead
 		table.children('colgroup').insertBefore( table.children('thead') );
-	
+
 		/* Adjust the position of the header in case we loose the y-scrollbar */
 		divBody.scroll();
-	
+
 		// If sorting or filtering has occurred, jump the scrolling back to the top
 		// only if we aren't holding the position
 		if ( (settings.bSorted || settings.bFiltered) && ! settings._drawHold ) {
 			divBodyEl.scrollTop = 0;
 		}
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Apply a given function to the display child nodes of an element array (typically
 	 * TD children of TR rows
@@ -5447,11 +5447,11 @@
 	{
 		var index=0, i=0, iLen=an1.length;
 		var nNode1, nNode2;
-	
+
 		while ( i < iLen ) {
 			nNode1 = an1[i].firstChild;
 			nNode2 = an2 ? an2[i].firstChild : null;
-	
+
 			while ( nNode1 ) {
 				if ( nNode1.nodeType === 1 ) {
 					if ( an2 ) {
@@ -5460,23 +5460,23 @@
 					else {
 						fn( nNode1, index );
 					}
-	
+
 					index++;
 				}
-	
+
 				nNode1 = nNode1.nextSibling;
 				nNode2 = an2 ? nNode2.nextSibling : null;
 			}
-	
+
 			i++;
 		}
 	}
-	
-	
-	
+
+
+
 	var __re_html_remove = /<.*?>/g;
-	
-	
+
+
 	/**
 	 * Calculate the width of columns for the table
 	 *  @param {object} oSettings dataTables settings object
@@ -5500,23 +5500,23 @@
 			i, column, columnIdx, width, outerWidth,
 			browser = oSettings.oBrowser,
 			ie67 = browser.bScrollOversize;
-	
+
 		var styleWidth = table.style.width;
 		if ( styleWidth && styleWidth.indexOf('%') !== -1 ) {
 			tableWidthAttr = styleWidth;
 		}
-	
+
 		/* Convert any user input sizes into pixel sizes */
 		for ( i=0 ; i<visibleColumns.length ; i++ ) {
 			column = columns[ visibleColumns[i] ];
-	
+
 			if ( column.sWidth !== null ) {
 				column.sWidth = _fnConvertToWidth( column.sWidthOrig, tableContainer );
-	
+
 				userInputs = true;
 			}
 		}
-	
+
 		/* If the number of columns in the DOM equals the number that we have to
 		 * process in DataTables, then we can use the offsets that are created by
 		 * the web- browser. No custom sizes can be set in order for this to happen,
@@ -5528,7 +5528,7 @@
 		) {
 			for ( i=0 ; i<columnCount ; i++ ) {
 				var colIdx = _fnVisibleToColumnIndex( oSettings, i );
-	
+
 				if ( colIdx !== null ) {
 					columns[ colIdx ].sWidth = _fnStringToCss( headerCells.eq(i).width() );
 				}
@@ -5543,11 +5543,11 @@
 			var tmpTable = $(table).clone() // don't use cloneNode - IE8 will remove events on the main table
 				.css( 'visibility', 'hidden' )
 				.removeAttr( 'id' );
-	
+
 			// Clean up the table body
 			tmpTable.find('tbody tr').remove();
 			var tr = $('<tr/>').appendTo( tmpTable.find('tbody') );
-	
+
 			// Clone the table header and footer - we can't use the header / footer
 			// from the cloned table, since if scrolling is active, the table's
 			// real header and footer are contained in different table tags
@@ -5555,20 +5555,20 @@
 			tmpTable
 				.append( $(oSettings.nTHead).clone() )
 				.append( $(oSettings.nTFoot).clone() );
-	
+
 			// Remove any assigned widths from the footer (from scrolling)
 			tmpTable.find('tfoot th, tfoot td').css('width', '');
-	
+
 			// Apply custom sizing to the cloned header
 			headerCells = _fnGetUniqueThs( oSettings, tmpTable.find('thead')[0] );
-	
+
 			for ( i=0 ; i<visibleColumns.length ; i++ ) {
 				column = columns[ visibleColumns[i] ];
-	
+
 				headerCells[i].style.width = column.sWidthOrig !== null && column.sWidthOrig !== '' ?
 					_fnStringToCss( column.sWidthOrig ) :
 					'';
-	
+
 				// For scrollX we need to force the column width otherwise the
 				// browser will collapse it. If this width is smaller than the
 				// width the column requires, then it will have no effect
@@ -5582,24 +5582,24 @@
 					} ) );
 				}
 			}
-	
+
 			// Find the widest cell for each column and put it into the table
 			if ( oSettings.aoData.length ) {
 				for ( i=0 ; i<visibleColumns.length ; i++ ) {
 					columnIdx = visibleColumns[i];
 					column = columns[ columnIdx ];
-	
+
 					$( _fnGetWidestNode( oSettings, columnIdx ) )
 						.clone( false )
 						.append( column.sContentPadding )
 						.appendTo( tr );
 				}
 			}
-	
+
 			// Tidy the temporary table - remove name attributes so there aren't
 			// duplicated in the dom (radio elements for example)
 			$('[name]', tmpTable).removeAttr('name');
-	
+
 			// Table has been built, attach to the document so we can work with it.
 			// A holding element is used, positioned at the top of the container
 			// with minimal height, so it has no effect on if the container scrolls
@@ -5618,8 +5618,8 @@
 				)
 				.append( tmpTable )
 				.appendTo( tableContainer );
-	
-			// When scrolling (X or Y) we want to set the width of the table as 
+
+			// When scrolling (X or Y) we want to set the width of the table as
 			// appropriate. However, when not scrolling leave the table width as it
 			// is. This results in slightly different, but I think correct behaviour
 			if ( scrollX && scrollXInner ) {
@@ -5628,7 +5628,7 @@
 			else if ( scrollX ) {
 				tmpTable.css( 'width', 'auto' );
 				tmpTable.removeAttr('width');
-	
+
 				// If there is no width attribute or style, then allow the table to
 				// collapse
 				if ( tmpTable.width() < tableContainer.clientWidth && tableWidthAttr ) {
@@ -5641,7 +5641,7 @@
 			else if ( tableWidthAttr ) {
 				tmpTable.width( tableWidthAttr );
 			}
-	
+
 			// Get the width of each column in the constructed table - we need to
 			// know the inner width (so it can be assigned to the other table's
 			// cells) and the outer width so we can calculate the full width of the
@@ -5652,27 +5652,27 @@
 			for ( i=0 ; i<visibleColumns.length ; i++ ) {
 				var cell = $(headerCells[i]);
 				var border = cell.outerWidth() - cell.width();
-	
+
 				// Use getBounding... where possible (not IE8-) because it can give
 				// sub-pixel accuracy, which we then want to round up!
 				var bounding = browser.bBounding ?
 					Math.ceil( headerCells[i].getBoundingClientRect().width ) :
 					cell.outerWidth();
-	
+
 				// Total is tracked to remove any sub-pixel errors as the outerWidth
 				// of the table might not equal the total given here (IE!).
 				total += bounding;
-	
+
 				// Width for each column to use
 				columns[ visibleColumns[i] ].sWidth = _fnStringToCss( bounding - border );
 			}
-	
+
 			table.style.width = _fnStringToCss( total );
-	
+
 			// Finished with the table - ditch it
 			holder.remove();
 		}
-	
+
 		// If there is a width attr, we want to attach an event listener which
 		// allows the table sizing to automatically adjust when the window is
 		// resized. Use the width attr rather than CSS, since we can't know if the
@@ -5680,14 +5680,14 @@
 		if ( tableWidthAttr ) {
 			table.style.width = _fnStringToCss( tableWidthAttr );
 		}
-	
+
 		if ( (tableWidthAttr || scrollX) && ! oSettings._reszEvt ) {
 			var bindResize = function () {
 				$(window).bind('resize.DT-'+oSettings.sInstance, _fnThrottle( function () {
 					_fnAdjustColumnSizing( oSettings );
 				} ) );
 			};
-	
+
 			// IE6/7 will crash if we bind a resize event handler on page load.
 			// To be removed in 1.11 which drops IE6/7 support
 			if ( ie67 ) {
@@ -5696,12 +5696,12 @@
 			else {
 				bindResize();
 			}
-	
+
 			oSettings._reszEvt = true;
 		}
 	}
-	
-	
+
+
 	/**
 	 * Throttle the calls to a function. Arguments and context are maintained for
 	 * the throttled function
@@ -5711,8 +5711,8 @@
 	 *  @memberof DataTable#oApi
 	 */
 	var _fnThrottle = DataTable.util.throttle;
-	
-	
+
+
 	/**
 	 * Convert a CSS unit width to pixels (e.g. 2em)
 	 *  @param {string} width width to be converted
@@ -5725,18 +5725,18 @@
 		if ( ! width ) {
 			return 0;
 		}
-	
+
 		var n = $('<div/>')
 			.css( 'width', _fnStringToCss( width ) )
 			.appendTo( parent || document.body );
-	
+
 		var val = n[0].offsetWidth;
 		n.remove();
-	
+
 		return val;
 	}
-	
-	
+
+
 	/**
 	 * Get the widest node
 	 *  @param {object} settings dataTables settings object
@@ -5750,14 +5750,14 @@
 		if ( idx < 0 ) {
 			return null;
 		}
-	
+
 		var data = settings.aoData[ idx ];
 		return ! data.nTr ? // Might not have been created when deferred rendering
 			$('<td/>').html( _fnGetCellData( settings, idx, colIdx, 'display' ) )[0] :
 			data.anCells[ colIdx ];
 	}
-	
-	
+
+
 	/**
 	 * Get the maximum strlen for each data column
 	 *  @param {object} settings dataTables settings object
@@ -5768,22 +5768,22 @@
 	function _fnGetMaxLenString( settings, colIdx )
 	{
 		var s, max=-1, maxIdx = -1;
-	
+
 		for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
 			s = _fnGetCellData( settings, i, colIdx, 'display' )+'';
 			s = s.replace( __re_html_remove, '' );
 			s = s.replace( /&nbsp;/g, ' ' );
-	
+
 			if ( s.length > max ) {
 				max = s.length;
 				maxIdx = i;
 			}
 		}
-	
+
 		return maxIdx;
 	}
-	
-	
+
+
 	/**
 	 * Append a CSS unit (only if required) to a string
 	 *  @param {string} value to css-ify
@@ -5795,21 +5795,21 @@
 		if ( s === null ) {
 			return '0px';
 		}
-	
+
 		if ( typeof s == 'number' ) {
 			return s < 0 ?
 				'0px' :
 				s+'px';
 		}
-	
+
 		// Check it has a unit character already
 		return s.match(/\d$/) ?
 			s+'px' :
 			s;
 	}
-	
-	
-	
+
+
+
 	function _fnSortFlatten ( settings )
 	{
 		var
@@ -5831,37 +5831,37 @@
 					$.merge( nestedSort, a );
 				}
 			};
-	
+
 		// Build the sort array, with pre-fix and post-fix options if they have been
 		// specified
 		if ( $.isArray( fixed ) ) {
 			add( fixed );
 		}
-	
+
 		if ( fixedObj && fixed.pre ) {
 			add( fixed.pre );
 		}
-	
+
 		add( settings.aaSorting );
-	
+
 		if (fixedObj && fixed.post ) {
 			add( fixed.post );
 		}
-	
+
 		for ( i=0 ; i<nestedSort.length ; i++ )
 		{
 			srcCol = nestedSort[i][0];
 			aDataSort = aoColumns[ srcCol ].aDataSort;
-	
+
 			for ( k=0, kLen=aDataSort.length ; k<kLen ; k++ )
 			{
 				iCol = aDataSort[k];
 				sType = aoColumns[ iCol ].sType || 'string';
-	
+
 				if ( nestedSort[i]._idx === undefined ) {
 					nestedSort[i]._idx = $.inArray( nestedSort[i][1], aoColumns[iCol].asSorting );
 				}
-	
+
 				aSort.push( {
 					src:       srcCol,
 					col:       iCol,
@@ -5872,10 +5872,10 @@
 				} );
 			}
 		}
-	
+
 		return aSort;
 	}
-	
+
 	/**
 	 * Change the order of the table
 	 *  @param {object} oSettings dataTables settings object
@@ -5896,26 +5896,26 @@
 			sortCol,
 			displayMaster = oSettings.aiDisplayMaster,
 			aSort;
-	
+
 		// Resolve any column types that are unknown due to addition or invalidation
 		// @todo Can this be moved into a 'data-ready' handler which is called when
 		//   data is going to be used in the table?
 		_fnColumnTypes( oSettings );
-	
+
 		aSort = _fnSortFlatten( oSettings );
-	
+
 		for ( i=0, ien=aSort.length ; i<ien ; i++ ) {
 			sortCol = aSort[i];
-	
+
 			// Track if we can use the fast sort algorithm
 			if ( sortCol.formatter ) {
 				formatters++;
 			}
-	
+
 			// Load the data needed for the sort, for each cell
 			_fnSortData( oSettings, sortCol.col );
 		}
-	
+
 		/* No sorting required if server-side or no sorting array */
 		if ( _fnDataSource( oSettings ) != 'ssp' && aSort.length !== 0 )
 		{
@@ -5924,7 +5924,7 @@
 			for ( i=0, iLen=displayMaster.length ; i<iLen ; i++ ) {
 				aiOrig[ displayMaster[i] ] = i;
 			}
-	
+
 			/* Do the sort - here we want multi-column sorting based on a given data source (column)
 			 * and sorting function (from oSort) in a certain direction. It's reasonably complex to
 			 * follow on it's own, but this is what we want (example two column sorting):
@@ -5954,19 +5954,19 @@
 						len=aSort.length,
 						dataA = aoData[a]._aSortData,
 						dataB = aoData[b]._aSortData;
-	
+
 					for ( k=0 ; k<len ; k++ ) {
 						sort = aSort[k];
-	
+
 						x = dataA[ sort.col ];
 						y = dataB[ sort.col ];
-	
+
 						test = x<y ? -1 : x>y ? 1 : 0;
 						if ( test !== 0 ) {
 							return sort.dir === 'asc' ? test : -test;
 						}
 					}
-	
+
 					x = aiOrig[a];
 					y = aiOrig[b];
 					return x<y ? -1 : x>y ? 1 : 0;
@@ -5982,32 +5982,32 @@
 						len=aSort.length,
 						dataA = aoData[a]._aSortData,
 						dataB = aoData[b]._aSortData;
-	
+
 					for ( k=0 ; k<len ; k++ ) {
 						sort = aSort[k];
-	
+
 						x = dataA[ sort.col ];
 						y = dataB[ sort.col ];
-	
+
 						fn = oExtSort[ sort.type+"-"+sort.dir ] || oExtSort[ "string-"+sort.dir ];
 						test = fn( x, y );
 						if ( test !== 0 ) {
 							return test;
 						}
 					}
-	
+
 					x = aiOrig[a];
 					y = aiOrig[b];
 					return x<y ? -1 : x>y ? 1 : 0;
 				} );
 			}
 		}
-	
+
 		/* Tell the draw function that we have sorted the data */
 		oSettings.bSorted = true;
 	}
-	
-	
+
+
 	function _fnSortAria ( settings )
 	{
 		var label;
@@ -6015,7 +6015,7 @@
 		var columns = settings.aoColumns;
 		var aSort = _fnSortFlatten( settings );
 		var oAria = settings.oLanguage.oAria;
-	
+
 		// ARIA attributes - need to loop all columns, to update all (removing old
 		// attributes as needed)
 		for ( var i=0, iLen=columns.length ; i<iLen ; i++ )
@@ -6024,11 +6024,11 @@
 			var asSorting = col.asSorting;
 			var sTitle = col.sTitle.replace( /<.*?>/g, "" );
 			var th = col.nTh;
-	
+
 			// IE7 is throwing an error when setting these properties with jQuery's
 			// attr() and removeAttr() methods...
 			th.removeAttribute('aria-sort');
-	
+
 			/* In ARIA only the first sorting column can be marked as sorting - no multi-sort option */
 			if ( col.bSortable ) {
 				if ( aSort.length > 0 && aSort[0].col == i ) {
@@ -6038,7 +6038,7 @@
 				else {
 					nextSort = asSorting[0];
 				}
-	
+
 				label = sTitle + ( nextSort === "asc" ?
 					oAria.sSortAscending :
 					oAria.sSortDescending
@@ -6047,12 +6047,12 @@
 			else {
 				label = sTitle;
 			}
-	
+
 			th.setAttribute('aria-label', label);
 		}
 	}
-	
-	
+
+
 	/**
 	 * Function to run on user sort request
 	 *  @param {object} settings dataTables settings object
@@ -6074,32 +6074,32 @@
 			if ( idx === undefined ) {
 				idx = $.inArray( a[1], asSorting );
 			}
-	
+
 			return idx+1 < asSorting.length ?
 				idx+1 :
 				overflow ?
 					null :
 					0;
 		};
-	
+
 		// Convert to 2D array if needed
 		if ( typeof sorting[0] === 'number' ) {
 			sorting = settings.aaSorting = [ sorting ];
 		}
-	
+
 		// If appending the sort then we are multi-column sorting
 		if ( append && settings.oFeatures.bSortMulti ) {
 			// Are we already doing some kind of sort on this column?
 			var sortIdx = $.inArray( colIdx, _pluck(sorting, '0') );
-	
+
 			if ( sortIdx !== -1 ) {
 				// Yes, modify the sort
 				nextSortIdx = next( sorting[sortIdx], true );
-	
+
 				if ( nextSortIdx === null && sorting.length === 1 ) {
 					nextSortIdx = 0; // can't remove sorting completely
 				}
-	
+
 				if ( nextSortIdx === null ) {
 					sorting.splice( sortIdx, 1 );
 				}
@@ -6117,7 +6117,7 @@
 		else if ( sorting.length && sorting[0][0] == colIdx ) {
 			// Single column - already sorting on this column, modify the sort
 			nextSortIdx = next( sorting[0] );
-	
+
 			sorting.length = 1;
 			sorting[0][1] = asSorting[ nextSortIdx ];
 			sorting[0]._idx = nextSortIdx;
@@ -6128,17 +6128,17 @@
 			sorting.push( [ colIdx, asSorting[0] ] );
 			sorting[0]._idx = 0;
 		}
-	
+
 		// Run the sort by calling a full redraw
 		_fnReDraw( settings );
-	
+
 		// callback used for async user interaction
 		if ( typeof callback == 'function' ) {
 			callback( settings );
 		}
 	}
-	
-	
+
+
 	/**
 	 * Attach a sort handler (click) to a node
 	 *  @param {object} settings dataTables settings object
@@ -6150,21 +6150,21 @@
 	function _fnSortAttachListener ( settings, attachTo, colIdx, callback )
 	{
 		var col = settings.aoColumns[ colIdx ];
-	
+
 		_fnBindAction( attachTo, {}, function (e) {
 			/* If the column is not sortable - don't to anything */
 			if ( col.bSortable === false ) {
 				return;
 			}
-	
+
 			// If processing is enabled use a timeout to allow the processing
 			// display to be shown - otherwise to it synchronously
 			if ( settings.oFeatures.bProcessing ) {
 				_fnProcessingDisplay( settings, true );
-	
+
 				setTimeout( function() {
 					_fnSortListener( settings, colIdx, e.shiftKey, callback );
-	
+
 					// In server-side processing, the draw callback will remove the
 					// processing display
 					if ( _fnDataSource( settings ) !== 'ssp' ) {
@@ -6177,8 +6177,8 @@
 			}
 		} );
 	}
-	
-	
+
+
 	/**
 	 * Set the sorting classes on table's body, Note: it is safe to call this function
 	 * when bSort and bSortClasses are false
@@ -6192,30 +6192,30 @@
 		var sort = _fnSortFlatten( settings );
 		var features = settings.oFeatures;
 		var i, ien, colIdx;
-	
+
 		if ( features.bSort && features.bSortClasses ) {
 			// Remove old sorting classes
 			for ( i=0, ien=oldSort.length ; i<ien ; i++ ) {
 				colIdx = oldSort[i].src;
-	
+
 				// Remove column sorting
 				$( _pluck( settings.aoData, 'anCells', colIdx ) )
 					.removeClass( sortClass + (i<2 ? i+1 : 3) );
 			}
-	
+
 			// Add new column sorting
 			for ( i=0, ien=sort.length ; i<ien ; i++ ) {
 				colIdx = sort[i].src;
-	
+
 				$( _pluck( settings.aoData, 'anCells', colIdx ) )
 					.addClass( sortClass + (i<2 ? i+1 : 3) );
 			}
 		}
-	
+
 		settings.aLastSort = sort;
 	}
-	
-	
+
+
 	// Get the data to sort a column, be it from cache, fresh (populating the
 	// cache), or from a sort formatter
 	function _fnSortData( settings, idx )
@@ -6224,38 +6224,38 @@
 		var column = settings.aoColumns[ idx ];
 		var customSort = DataTable.ext.order[ column.sSortDataType ];
 		var customData;
-	
+
 		if ( customSort ) {
 			customData = customSort.call( settings.oInstance, settings, idx,
 				_fnColumnIndexToVisible( settings, idx )
 			);
 		}
-	
+
 		// Use / populate cache
 		var row, cellData;
 		var formatter = DataTable.ext.type.order[ column.sType+"-pre" ];
-	
+
 		for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
 			row = settings.aoData[i];
-	
+
 			if ( ! row._aSortData ) {
 				row._aSortData = [];
 			}
-	
+
 			if ( ! row._aSortData[idx] || customSort ) {
 				cellData = customSort ?
 					customData[i] : // If there was a custom sort function, use data from there
 					_fnGetCellData( settings, i, idx, 'sort' );
-	
+
 				row._aSortData[ idx ] = formatter ?
 					formatter( cellData ) :
 					cellData;
 			}
 		}
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Save the state of a table
 	 *  @param {object} oSettings dataTables settings object
@@ -6267,7 +6267,7 @@
 		{
 			return;
 		}
-	
+
 		/* Store the interesting variables */
 		var state = {
 			time:    +new Date(),
@@ -6282,14 +6282,14 @@
 				};
 			} )
 		};
-	
+
 		_fnCallbackFire( settings, "aoStateSaveParams", 'stateSaveParams', [settings, state] );
-	
+
 		settings.oSavedState = state;
 		settings.fnStateSaveCallback.call( settings.oInstance, settings, state );
 	}
-	
-	
+
+
 	/**
 	 * Attempt to load a saved table state
 	 *  @param {object} oSettings dataTables settings object
@@ -6300,16 +6300,16 @@
 	{
 		var i, ien;
 		var columns = settings.aoColumns;
-	
+
 		if ( ! settings.oFeatures.bStateSave ) {
 			return;
 		}
-	
+
 		var state = settings.fnStateLoadCallback.call( settings.oInstance, settings );
 		if ( ! state || ! state.time ) {
 			return;
 		}
-	
+
 		/* Allow custom and plug-in manipulation functions to alter the saved data set and
 		 * cancelling of loading by returning false
 		 */
@@ -6317,21 +6317,21 @@
 		if ( $.inArray( false, abStateLoad ) !== -1 ) {
 			return;
 		}
-	
+
 		/* Reject old data */
 		var duration = settings.iStateDuration;
 		if ( duration > 0 && state.time < +new Date() - (duration*1000) ) {
 			return;
 		}
-	
+
 		// Number of columns have changed - all bets are off, no restore of settings
 		if ( columns.length !== state.columns.length ) {
 			return;
 		}
-	
+
 		// Store the saved state so it might be accessed at any time
 		settings.oLoadedState = $.extend( true, {}, state );
-	
+
 		// Restore key features - todo - for 1.11 this needs to be done by
 		// subscribed events
 		if ( state.start !== undefined ) {
@@ -6341,7 +6341,7 @@
 		if ( state.length !== undefined ) {
 			settings._iDisplayLength   = state.length;
 		}
-	
+
 		// Order
 		if ( state.order !== undefined ) {
 			settings.aaSorting = [];
@@ -6352,31 +6352,31 @@
 				);
 			} );
 		}
-	
+
 		// Search
 		if ( state.search !== undefined ) {
 			$.extend( settings.oPreviousSearch, _fnSearchToHung( state.search ) );
 		}
-	
+
 		// Columns
 		for ( i=0, ien=state.columns.length ; i<ien ; i++ ) {
 			var col = state.columns[i];
-	
+
 			// Visibility
 			if ( col.visible !== undefined ) {
 				columns[i].bVisible = col.visible;
 			}
-	
+
 			// Search
 			if ( col.search !== undefined ) {
 				$.extend( settings.aoPreSearchCols[i], _fnSearchToHung( col.search ) );
 			}
 		}
-	
+
 		_fnCallbackFire( settings, 'aoStateLoaded', 'stateLoaded', [settings, state] );
 	}
-	
-	
+
+
 	/**
 	 * Return the settings object for a particular table
 	 *  @param {node} table table we are using as a dataTable
@@ -6387,13 +6387,13 @@
 	{
 		var settings = DataTable.settings;
 		var idx = $.inArray( table, _pluck( settings, 'nTable' ) );
-	
+
 		return idx !== -1 ?
 			settings[ idx ] :
 			null;
 	}
-	
-	
+
+
 	/**
 	 * Log an error message
 	 *  @param {object} settings dataTables settings object
@@ -6406,21 +6406,21 @@
 	{
 		msg = 'DataTables warning: '+
 			(settings ? 'table id='+settings.sTableId+' - ' : '')+msg;
-	
+
 		if ( tn ) {
 			msg += '. For more information about this error, please see '+
 			'http://datatables.net/tn/'+tn;
 		}
-	
+
 		if ( ! level  ) {
 			// Backwards compatibility pre 1.10
 			var ext = DataTable.ext;
 			var type = ext.sErrMode || ext.errMode;
-	
+
 			if ( settings ) {
 				_fnCallbackFire( settings, null, 'error', [ settings, tn, msg ] );
 			}
-	
+
 			if ( type == 'alert' ) {
 				alert( msg );
 			}
@@ -6435,8 +6435,8 @@
 			console.log( msg );
 		}
 	}
-	
-	
+
+
 	/**
 	 * See if a property is defined on one object, if so assign it to the other object
 	 *  @param {object} ret target object
@@ -6456,20 +6456,20 @@
 					_fnMap( ret, src, val );
 				}
 			} );
-	
+
 			return;
 		}
-	
+
 		if ( mappedName === undefined ) {
 			mappedName = name;
 		}
-	
+
 		if ( src[name] !== undefined ) {
 			ret[mappedName] = src[name];
 		}
 	}
-	
-	
+
+
 	/**
 	 * Extend objects - very similar to jQuery.extend, but deep copy objects, and
 	 * shallow copy arrays. The reason we need to do this, is that we don't want to
@@ -6490,11 +6490,11 @@
 	function _fnExtend( out, extender, breakRefs )
 	{
 		var val;
-	
+
 		for ( var prop in extender ) {
 			if ( extender.hasOwnProperty(prop) ) {
 				val = extender[prop];
-	
+
 				if ( $.isPlainObject( val ) ) {
 					if ( ! $.isPlainObject( out[prop] ) ) {
 						out[prop] = {};
@@ -6509,11 +6509,11 @@
 				}
 			}
 		}
-	
+
 		return out;
 	}
-	
-	
+
+
 	/**
 	 * Bind an event handers to allow a click or return key to activate the callback.
 	 * This is good for accessibility since a return on the keyboard will have the
@@ -6541,8 +6541,8 @@
 					return false;
 				} );
 	}
-	
-	
+
+
 	/**
 	 * Register a callback function. Easily allows a callback function to be added to
 	 * an array store of callback functions that can then all be called together.
@@ -6562,8 +6562,8 @@
 			} );
 		}
 	}
-	
-	
+
+
 	/**
 	 * Fire callback functions and trigger events. Note that the loop over the
 	 * callback array store is done backwards! Further note that you do not want to
@@ -6581,55 +6581,55 @@
 	function _fnCallbackFire( settings, callbackArr, eventName, args )
 	{
 		var ret = [];
-	
+
 		if ( callbackArr ) {
 			ret = $.map( settings[callbackArr].slice().reverse(), function (val, i) {
 				return val.fn.apply( settings.oInstance, args );
 			} );
 		}
-	
+
 		if ( eventName !== null ) {
 			var e = $.Event( eventName+'.dt' );
-	
+
 			$(settings.nTable).trigger( e, args );
-	
+
 			ret.push( e.result );
 		}
-	
+
 		return ret;
 	}
-	
-	
+
+
 	function _fnLengthOverflow ( settings )
 	{
 		var
 			start = settings._iDisplayStart,
 			end = settings.fnDisplayEnd(),
 			len = settings._iDisplayLength;
-	
+
 		/* If we have space to show extra rows (backing up from the end point - then do so */
 		if ( start >= end )
 		{
 			start = end - len;
 		}
-	
+
 		// Keep the start record on the current page
 		start -= (start % len);
-	
+
 		if ( len === -1 || start < 0 )
 		{
 			start = 0;
 		}
-	
+
 		settings._iDisplayStart = start;
 	}
-	
-	
+
+
 	function _fnRenderer( settings, type )
 	{
 		var renderer = settings.renderer;
 		var host = DataTable.ext.renderer[type];
-	
+
 		if ( $.isPlainObject( renderer ) && renderer[type] ) {
 			// Specific renderer for this type. If available use it, otherwise use
 			// the default.
@@ -6640,12 +6640,12 @@
 			// otherwise use the default
 			return host[renderer] || host._;
 		}
-	
+
 		// Use the default
 		return host._;
 	}
-	
-	
+
+
 	/**
 	 * Detect the data source being used for the table. Used to simplify the code
 	 * a little (ajax) and to make it compress a little smaller.
@@ -6664,10 +6664,10 @@
 		}
 		return 'dom';
 	}
-	
 
-	
-	
+
+
+
 	/**
 	 * Computed structure of the DataTables API, defined by the options passed to
 	 * `DataTable.Api.register()` when building the API.
@@ -6705,8 +6705,8 @@
 	 * @ignore
 	 */
 	var __apiStruct = [];
-	
-	
+
+
 	/**
 	 * `Array.prototype` reference.
 	 *
@@ -6714,8 +6714,8 @@
 	 * @ignore
 	 */
 	var __arrayProto = Array.prototype;
-	
-	
+
+
 	/**
 	 * Abstraction for `context` parameter of the `Api` constructor to allow it to
 	 * take several different forms for ease of use.
@@ -6743,7 +6743,7 @@
 		var tables = $.map( settings, function (el, i) {
 			return el.nTable;
 		} );
-	
+
 		if ( ! mixed ) {
 			return [];
 		}
@@ -6767,7 +6767,7 @@
 			// jQuery object (also DataTables instance)
 			jq = mixed;
 		}
-	
+
 		if ( jq ) {
 			return jq.map( function(i) {
 				idx = $.inArray( this, tables );
@@ -6775,8 +6775,8 @@
 			} ).toArray();
 		}
 	};
-	
-	
+
+
 	/**
 	 * DataTables API class - used to control and interface with  one or more
 	 * DataTables enhanced tables.
@@ -6836,7 +6836,7 @@
 		if ( ! (this instanceof _Api) ) {
 			return new _Api( context, data );
 		}
-	
+
 		var settings = [];
 		var ctxSettings = function ( o ) {
 			var a = _toSettings( o );
@@ -6844,7 +6844,7 @@
 				settings = settings.concat( a );
 			}
 		};
-	
+
 		if ( $.isArray( context ) ) {
 			for ( var i=0, ien=context.length ; i<ien ; i++ ) {
 				ctxSettings( context[i] );
@@ -6853,27 +6853,27 @@
 		else {
 			ctxSettings( context );
 		}
-	
+
 		// Remove duplicates
 		this.context = _unique( settings );
-	
+
 		// Initial data
 		if ( data ) {
 			$.merge( this, data );
 		}
-	
+
 		// selector
 		this.selector = {
 			rows: null,
 			cols: null,
 			opts: null
 		};
-	
+
 		_Api.extend( this, this, __apiStruct );
 	};
-	
+
 	DataTable.Api = _Api;
-	
+
 	// Don't destroy the existing prototype, just extend it. Required for jQuery 2's
 	// isPlainObject.
 	$.extend( _Api.prototype, {
@@ -6881,44 +6881,44 @@
 		{
 			return this.count() !== 0;
 		},
-	
-	
+
+
 		concat:  __arrayProto.concat,
-	
-	
+
+
 		context: [], // array of table settings objects
-	
-	
+
+
 		count: function ()
 		{
 			return this.flatten().length;
 		},
-	
-	
+
+
 		each: function ( fn )
 		{
 			for ( var i=0, ien=this.length ; i<ien; i++ ) {
 				fn.call( this, this[i], i, this );
 			}
-	
+
 			return this;
 		},
-	
-	
+
+
 		eq: function ( idx )
 		{
 			var ctx = this.context;
-	
+
 			return ctx.length > idx ?
 				new _Api( ctx[idx], this[idx] ) :
 				null;
 		},
-	
-	
+
+
 		filter: function ( fn )
 		{
 			var a = [];
-	
+
 			if ( __arrayProto.filter ) {
 				a = __arrayProto.filter.call( this, fn, this );
 			}
@@ -6930,21 +6930,21 @@
 					}
 				}
 			}
-	
+
 			return new _Api( this.context, a );
 		},
-	
-	
+
+
 		flatten: function ()
 		{
 			var a = [];
 			return new _Api( this.context, a.concat.apply( a, this.toArray() ) );
 		},
-	
-	
+
+
 		join:    __arrayProto.join,
-	
-	
+
+
 		indexOf: __arrayProto.indexOf || function (obj, start)
 		{
 			for ( var i=(start || 0), ien=this.length ; i<ien ; i++ ) {
@@ -6954,7 +6954,7 @@
 			}
 			return -1;
 		},
-	
+
 		iterator: function ( flatten, type, fn, alwaysNew ) {
 			var
 				a = [], ret,
@@ -6962,7 +6962,7 @@
 				context = this.context,
 				rows, items, item,
 				selector = this.selector;
-	
+
 			// Argument shifting
 			if ( typeof flatten === 'string' ) {
 				alwaysNew = fn;
@@ -6970,13 +6970,13 @@
 				type = flatten;
 				flatten = false;
 			}
-	
+
 			for ( i=0, ien=context.length ; i<ien ; i++ ) {
 				var apiInst = new _Api( context[i] );
-	
+
 				if ( type === 'table' ) {
 					ret = fn.call( apiInst, context[i], i );
-	
+
 					if ( ret !== undefined ) {
 						a.push( ret );
 					}
@@ -6984,7 +6984,7 @@
 				else if ( type === 'columns' || type === 'rows' ) {
 					// this has same length as context - one entry for each table
 					ret = fn.call( apiInst, context[i], this[i], i );
-	
+
 					if ( ret !== undefined ) {
 						a.push( ret );
 					}
@@ -6993,28 +6993,28 @@
 					// columns and rows share the same structure.
 					// 'this' is an array of column indexes for each context
 					items = this[i];
-	
+
 					if ( type === 'column-rows' ) {
 						rows = _selector_row_indexes( context[i], selector.opts );
 					}
-	
+
 					for ( j=0, jen=items.length ; j<jen ; j++ ) {
 						item = items[j];
-	
+
 						if ( type === 'cell' ) {
 							ret = fn.call( apiInst, context[i], item.row, item.column, i, j );
 						}
 						else {
 							ret = fn.call( apiInst, context[i], item, i, j, rows );
 						}
-	
+
 						if ( ret !== undefined ) {
 							a.push( ret );
 						}
 					}
 				}
 			}
-	
+
 			if ( a.length || alwaysNew ) {
 				var api = new _Api( context, flatten ? a.concat.apply( [], a ) : a );
 				var apiSelector = api.selector;
@@ -7025,22 +7025,22 @@
 			}
 			return this;
 		},
-	
-	
+
+
 		lastIndexOf: __arrayProto.lastIndexOf || function (obj, start)
 		{
 			// Bit cheeky...
 			return this.indexOf.apply( this.toArray.reverse(), arguments );
 		},
-	
-	
+
+
 		length:  0,
-	
-	
+
+
 		map: function ( fn )
 		{
 			var a = [];
-	
+
 			if ( __arrayProto.map ) {
 				a = __arrayProto.map.call( this, fn, this );
 			}
@@ -7050,88 +7050,88 @@
 					a.push( fn.call( this, this[i], i ) );
 				}
 			}
-	
+
 			return new _Api( this.context, a );
 		},
-	
-	
+
+
 		pluck: function ( prop )
 		{
 			return this.map( function ( el ) {
 				return el[ prop ];
 			} );
 		},
-	
+
 		pop:     __arrayProto.pop,
-	
-	
+
+
 		push:    __arrayProto.push,
-	
-	
+
+
 		// Does not return an API instance
 		reduce: __arrayProto.reduce || function ( fn, init )
 		{
 			return _fnReduce( this, fn, init, 0, this.length, 1 );
 		},
-	
-	
+
+
 		reduceRight: __arrayProto.reduceRight || function ( fn, init )
 		{
 			return _fnReduce( this, fn, init, this.length-1, -1, -1 );
 		},
-	
-	
+
+
 		reverse: __arrayProto.reverse,
-	
-	
+
+
 		// Object with rows, columns and opts
 		selector: null,
-	
-	
+
+
 		shift:   __arrayProto.shift,
-	
-	
+
+
 		sort:    __arrayProto.sort, // ? name - order?
-	
-	
+
+
 		splice:  __arrayProto.splice,
-	
-	
+
+
 		toArray: function ()
 		{
 			return __arrayProto.slice.call( this );
 		},
-	
-	
+
+
 		to$: function ()
 		{
 			return $( this );
 		},
-	
-	
+
+
 		toJQuery: function ()
 		{
 			return $( this );
 		},
-	
-	
+
+
 		unique: function ()
 		{
 			return new _Api( this.context, _unique(this) );
 		},
-	
-	
+
+
 		unshift: __arrayProto.unshift
 	} );
-	
-	
+
+
 	_Api.extend = function ( scope, obj, ext )
 	{
 		// Only extend API instances and static properties of the API
 		if ( ! ext.length || ! obj || ( ! (obj instanceof _Api) && ! obj.__dt_wrapper ) ) {
 			return;
 		}
-	
+
 		var
 			i, ien,
 			j, jen,
@@ -7139,42 +7139,42 @@
 			methodScoping = function ( scope, fn, struc ) {
 				return function () {
 					var ret = fn.apply( scope, arguments );
-	
+
 					// Method extension
 					_Api.extend( ret, ret, struc.methodExt );
 					return ret;
 				};
 			};
-	
+
 		for ( i=0, ien=ext.length ; i<ien ; i++ ) {
 			struct = ext[i];
-	
+
 			// Value
 			obj[ struct.name ] = typeof struct.val === 'function' ?
 				methodScoping( scope, struct.val, struct ) :
 				$.isPlainObject( struct.val ) ?
 					{} :
 					struct.val;
-	
+
 			obj[ struct.name ].__dt_wrapper = true;
-	
+
 			// Property extension
 			_Api.extend( scope, obj[ struct.name ], struct.propExt );
 		}
 	};
-	
-	
+
+
 	// @todo - Is there need for an augment function?
 	// _Api.augment = function ( inst, name )
 	// {
 	// 	// Find src object in the structure from the name
 	// 	var parts = name.split('.');
-	
+
 	// 	_Api.extend( inst, obj );
 	// };
-	
-	
-	//     [
+
+
+	//     [
 	//       {
 	//         name:      'data'                -- string   - Property name
 	//         val:       function () {},       -- function - Api method (or undefined if just an object
@@ -7196,7 +7196,7 @@
 	//         ]
 	//       }
 	//     ]
-	
+
 	_Api.register = _api_register = function ( name, val )
 	{
 		if ( $.isArray( name ) ) {
@@ -7205,13 +7205,13 @@
 			}
 			return;
 		}
-	
+
 		var
 			i, ien,
 			heir = name.split('.'),
 			struct = __apiStruct,
 			key, method;
-	
+
 		var find = function ( src, name ) {
 			for ( var i=0, ien=src.length ; i<ien ; i++ ) {
 				if ( src[i].name === name ) {
@@ -7220,13 +7220,13 @@
 			}
 			return null;
 		};
-	
+
 		for ( i=0, ien=heir.length ; i<ien ; i++ ) {
 			method = heir[i].indexOf('()') !== -1;
 			key = method ?
 				heir[i].replace('()', '') :
 				heir[i];
-	
+
 			var src = find( struct, key );
 			if ( ! src ) {
 				src = {
@@ -7237,7 +7237,7 @@
 				};
 				struct.push( src );
 			}
-	
+
 			if ( i === ien-1 ) {
 				src.val = val;
 			}
@@ -7248,14 +7248,14 @@
 			}
 		}
 	};
-	
-	
+
+
 	_Api.registerPlural = _api_registerPlural = function ( pluralName, singularName, val ) {
 		_Api.register( pluralName, val );
-	
+
 		_Api.register( singularName, function () {
 			var ret = val.apply( this, arguments );
-	
+
 			if ( ret === this ) {
 				// Returned item is the API instance that was passed in, return it
 				return this;
@@ -7269,13 +7269,13 @@
 						ret[0] :
 					undefined;
 			}
-	
+
 			// Non-API return - just fire it back
 			return ret;
 		} );
 	};
-	
-	
+
+
 	/**
 	 * Selector for HTML tables. Apply the given selector to the give array of
 	 * DataTables settings objects.
@@ -7291,12 +7291,12 @@
 		if ( typeof selector === 'number' ) {
 			return [ a[ selector ] ];
 		}
-	
+
 		// Perform a jQuery selector on the table nodes
 		var nodes = $.map( a, function (el, i) {
 			return el.nTable;
 		} );
-	
+
 		return $(nodes)
 			.filter( selector )
 			.map( function (i) {
@@ -7306,9 +7306,9 @@
 			} )
 			.toArray();
 	};
-	
-	
-	
+
+
+
 	/**
 	 * Context selector for the API's context (i.e. the tables the API instance
 	 * refers to.
@@ -7326,55 +7326,55 @@
 			new _Api( __table_selector( selector, this.context ) ) :
 			this;
 	} );
-	
-	
+
+
 	_api_register( 'table()', function ( selector ) {
 		var tables = this.tables( selector );
 		var ctx = tables.context;
-	
+
 		// Truncate to the first matched table
 		return ctx.length ?
 			new _Api( ctx[0] ) :
 			tables;
 	} );
-	
-	
+
+
 	_api_registerPlural( 'tables().nodes()', 'table().node()' , function () {
 		return this.iterator( 'table', function ( ctx ) {
 			return ctx.nTable;
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'tables().body()', 'table().body()' , function () {
 		return this.iterator( 'table', function ( ctx ) {
 			return ctx.nTBody;
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'tables().header()', 'table().header()' , function () {
 		return this.iterator( 'table', function ( ctx ) {
 			return ctx.nTHead;
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'tables().footer()', 'table().footer()' , function () {
 		return this.iterator( 'table', function ( ctx ) {
 			return ctx.nTFoot;
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'tables().containers()', 'table().container()' , function () {
 		return this.iterator( 'table', function ( ctx ) {
 			return ctx.nTableWrapper;
 		}, 1 );
 	} );
-	
-	
-	
+
+
+
 	/**
 	 * Redraw the tables in the current context.
 	 */
@@ -7389,14 +7389,14 @@
 						false :
 						true;
 				}
-	
+
 				_fnReDraw( settings, paging===false );
 			}
 		} );
 	} );
-	
-	
-	
+
+
+
 	/**
 	 * Get the current page index.
 	 *
@@ -7420,14 +7420,14 @@
 		if ( action === undefined ) {
 			return this.page.info().page; // not an expensive call
 		}
-	
+
 		// else, have an action to take on all tables
 		return this.iterator( 'table', function ( settings ) {
 			_fnPageChange( settings, action );
 		} );
 	} );
-	
-	
+
+
 	/**
 	 * Paging information for the first table in the current context.
 	 *
@@ -7450,14 +7450,14 @@
 		if ( this.context.length === 0 ) {
 			return undefined;
 		}
-	
+
 		var
 			settings   = this.context[0],
 			start      = settings._iDisplayStart,
 			len        = settings.oFeatures.bPaginate ? settings._iDisplayLength : -1,
 			visRecords = settings.fnRecordsDisplay(),
 			all        = len === -1;
-	
+
 		return {
 			"page":           all ? 0 : Math.floor( start / len ),
 			"pages":          all ? 1 : Math.ceil( visRecords / len ),
@@ -7469,8 +7469,8 @@
 			"serverSide":     _fnDataSource( settings ) === 'ssp'
 		};
 	} );
-	
-	
+
+
 	/**
 	 * Get the current page length.
 	 *
@@ -7491,53 +7491,53 @@
 				this.context[0]._iDisplayLength :
 				undefined;
 		}
-	
+
 		// else, set the page length
 		return this.iterator( 'table', function ( settings ) {
 			_fnLengthChange( settings, len );
 		} );
 	} );
-	
-	
-	
+
+
+
 	var __reload = function ( settings, holdPosition, callback ) {
 		// Use the draw event to trigger a callback
 		if ( callback ) {
 			var api = new _Api( settings );
-	
+
 			api.one( 'draw', function () {
 				callback( api.ajax.json() );
 			} );
 		}
-	
+
 		if ( _fnDataSource( settings ) == 'ssp' ) {
 			_fnReDraw( settings, holdPosition );
 		}
 		else {
 			_fnProcessingDisplay( settings, true );
-	
+
 			// Cancel an existing request
 			var xhr = settings.jqXHR;
 			if ( xhr && xhr.readyState !== 4 ) {
 				xhr.abort();
 			}
-	
+
 			// Trigger xhr
 			_fnBuildAjax( settings, [], function( json ) {
 				_fnClearTable( settings );
-	
+
 				var data = _fnAjaxDataSrc( settings, json );
 				for ( var i=0, ien=data.length ; i<ien ; i++ ) {
 					_fnAddData( settings, data[i] );
 				}
-	
+
 				_fnReDraw( settings, holdPosition );
 				_fnProcessingDisplay( settings, false );
 			} );
 		}
 	};
-	
-	
+
+
 	/**
 	 * Get the JSON response from the last Ajax request that DataTables made to the
 	 * server. Note that this returns the JSON from the first table in the current
@@ -7547,29 +7547,29 @@
 	 */
 	_api_register( 'ajax.json()', function () {
 		var ctx = this.context;
-	
+
 		if ( ctx.length > 0 ) {
 			return ctx[0].json;
 		}
-	
+
 		// else return undefined;
 	} );
-	
-	
+
+
 	/**
 	 * Get the data submitted in the last Ajax request
 	 */
 	_api_register( 'ajax.params()', function () {
 		var ctx = this.context;
-	
+
 		if ( ctx.length > 0 ) {
 			return ctx[0].oAjaxData;
 		}
-	
+
 		// else return undefined;
 	} );
-	
-	
+
+
 	/**
 	 * Reload tables from the Ajax data source. Note that this function will
 	 * automatically re-draw the table when the remote data has been loaded.
@@ -7584,8 +7584,8 @@
 			__reload( settings, resetPaging===false, callback );
 		} );
 	} );
-	
-	
+
+
 	/**
 	 * Get the current Ajax URL. Note that this returns the URL from the first
 	 * table in the current context.
@@ -7600,21 +7600,21 @@
 	 */
 	_api_register( 'ajax.url()', function ( url ) {
 		var ctx = this.context;
-	
+
 		if ( url === undefined ) {
 			// get
 			if ( ctx.length === 0 ) {
 				return undefined;
 			}
 			ctx = ctx[0];
-	
+
 			return ctx.ajax ?
 				$.isPlainObject( ctx.ajax ) ?
 					ctx.ajax.url :
 					ctx.ajax :
 				ctx.sAjaxSource;
 		}
-	
+
 		// set
 		return this.iterator( 'table', function ( settings ) {
 			if ( $.isPlainObject( settings.ajax ) ) {
@@ -7628,8 +7628,8 @@
 			// value of `sAjaxSource` redundant.
 		} );
 	} );
-	
-	
+
+
 	/**
 	 * Load data from the newly set Ajax URL. Note that this method is only
 	 * available when `ajax.url()` is used to set a URL. Additionally, this method
@@ -7646,37 +7646,37 @@
 			__reload( ctx, resetPaging===false, callback );
 		} );
 	} );
-	
-	
-	
-	
+
+
+
+
 	var _selector_run = function ( type, selector, selectFn, settings, opts )
 	{
 		var
 			out = [], res,
 			a, i, ien, j, jen,
 			selectorType = typeof selector;
-	
+
 		// Can't just check for isArray here, as an API or jQuery instance might be
 		// given with their array like look
 		if ( ! selector || selectorType === 'string' || selectorType === 'function' || selector.length === undefined ) {
 			selector = [ selector ];
 		}
-	
+
 		for ( i=0, ien=selector.length ; i<ien ; i++ ) {
 			a = selector[i] && selector[i].split ?
 				selector[i].split(',') :
 				[ selector[i] ];
-	
+
 			for ( j=0, jen=a.length ; j<jen ; j++ ) {
 				res = selectFn( typeof a[j] === 'string' ? $.trim(a[j]) : a[j] );
-	
+
 				if ( res && res.length ) {
 					out = out.concat( res );
 				}
 			}
 		}
-	
+
 		// selector extensions
 		var ext = _ext.selector[ type ];
 		if ( ext.length ) {
@@ -7684,31 +7684,31 @@
 				out = ext[i]( settings, opts, out );
 			}
 		}
-	
+
 		return _unique( out );
 	};
-	
-	
+
+
 	var _selector_opts = function ( opts )
 	{
 		if ( ! opts ) {
 			opts = {};
 		}
-	
+
 		// Backwards compatibility for 1.9- which used the terminology filter rather
 		// than search
 		if ( opts.filter && opts.search === undefined ) {
 			opts.search = opts.filter;
 		}
-	
+
 		return $.extend( {
 			search: 'none',
 			order: 'current',
 			page: 'all'
 		}, opts );
 	};
-	
-	
+
+
 	var _selector_first = function ( inst )
 	{
 		// Reduce the API instance to the first item found
@@ -7720,29 +7720,29 @@
 				inst[0].length = 1;
 				inst.length = 1;
 				inst.context = [ inst.context[i] ];
-	
+
 				return inst;
 			}
 		}
-	
+
 		// Not found - return an empty instance
 		inst.length = 0;
 		return inst;
 	};
-	
-	
+
+
 	var _selector_row_indexes = function ( settings, opts )
 	{
 		var
 			i, ien, tmp, a=[],
 			displayFiltered = settings.aiDisplay,
 			displayMaster = settings.aiDisplayMaster;
-	
+
 		var
 			search = opts.search,  // none, applied, removed
 			order  = opts.order,   // applied, current, index (original - compatibility with 1.9)
 			page   = opts.page;    // all, current
-	
+
 		if ( _fnDataSource( settings ) == 'ssp' ) {
 			// In server-side processing mode, most options are irrelevant since
 			// rows not shown don't exist and the index order is the applied order
@@ -7776,7 +7776,7 @@
 				}
 				else { // applied | removed
 					tmp = $.inArray( i, displayFiltered );
-	
+
 					if ((tmp === -1 && search == 'removed') ||
 						(tmp >= 0   && search == 'applied') )
 					{
@@ -7785,11 +7785,11 @@
 				}
 			}
 		}
-	
+
 		return a;
 	};
-	
-	
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Rows
 	 *
@@ -7800,23 +7800,23 @@
 	 * {array}     - jQuery array of nodes, or simply an array of TR nodes
 	 *
 	 */
-	
-	
+
+
 	var __row_selector = function ( settings, selector, opts )
 	{
 		var run = function ( sel ) {
 			var selInt = _intVal( sel );
 			var i, ien;
-	
+
 			// Short cut - selector is a number and no options provided (default is
 			// all records, so no need to check if the index is in there, since it
 			// must be - dev error if the index doesn't exist).
 			if ( selInt !== null && ! opts ) {
 				return [ selInt ];
 			}
-	
+
 			var rows = _selector_row_indexes( settings, opts );
-	
+
 			if ( selInt !== null && $.inArray( selInt, rows ) !== -1 ) {
 				// Selector - integer
 				return [ selInt ];
@@ -7825,7 +7825,7 @@
 				// Selector - none
 				return rows;
 			}
-	
+
 			// Selector - function
 			if ( typeof sel === 'function' ) {
 				return $.map( rows, function (idx) {
@@ -7833,12 +7833,12 @@
 					return sel( idx, row._aData, row.nTr ) ? idx : null;
 				} );
 			}
-	
+
 			// Get nodes in the order from the `rows` array with null values removed
 			var nodes = _removeEmpty(
 				_pluck_order( settings.aoData, rows, 'nTr' )
 			);
-	
+
 			// Selector - node
 			if ( sel.nodeName ) {
 				if ( sel._DT_RowIndex !== undefined ) {
@@ -7854,7 +7854,7 @@
 						[];
 				}
 			}
-	
+
 			// ID selector. Want to always be able to select rows by id, regardless
 			// of if the tr element has been created or not, so can't rely upon
 			// jQuery here - hence a custom implementation. This does not match
@@ -7870,11 +7870,11 @@
 				if ( rowObj !== undefined ) {
 					return [ rowObj.idx ];
 				}
-	
+
 				// need to fall through to jQuery in case there is DOM id that
 				// matches
 			}
-	
+
 			// Selector - jQuery selector string, array of nodes or jQuery object/
 			// As jQuery's .filter() allows jQuery objects to be passed in filter,
 			// it also allows arrays, so this will cope with all three options
@@ -7885,11 +7885,11 @@
 				} )
 				.toArray();
 		};
-	
+
 		return _selector_run( 'row', selector, run, settings, opts );
 	};
-	
-	
+
+
 	_api_register( 'rows()', function ( selector, opts ) {
 		// argument shifting
 		if ( selector === undefined ) {
@@ -7899,55 +7899,55 @@
 			opts = selector;
 			selector = '';
 		}
-	
+
 		opts = _selector_opts( opts );
-	
+
 		var inst = this.iterator( 'table', function ( settings ) {
 			return __row_selector( settings, selector, opts );
 		}, 1 );
-	
+
 		// Want argument shifting here and in __row_selector?
 		inst.selector.rows = selector;
 		inst.selector.opts = opts;
-	
+
 		return inst;
 	} );
-	
+
 	_api_register( 'rows().nodes()', function () {
 		return this.iterator( 'row', function ( settings, row ) {
 			return settings.aoData[ row ].nTr || undefined;
 		}, 1 );
 	} );
-	
+
 	_api_register( 'rows().data()', function () {
 		return this.iterator( true, 'rows', function ( settings, rows ) {
 			return _pluck_order( settings.aoData, rows, '_aData' );
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'rows().cache()', 'row().cache()', function ( type ) {
 		return this.iterator( 'row', function ( settings, row ) {
 			var r = settings.aoData[ row ];
 			return type === 'search' ? r._aFilterData : r._aSortData;
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'rows().invalidate()', 'row().invalidate()', function ( src ) {
 		return this.iterator( 'row', function ( settings, row ) {
 			_fnInvalidate( settings, row, src );
 		} );
 	} );
-	
+
 	_api_registerPlural( 'rows().indexes()', 'row().index()', function () {
 		return this.iterator( 'row', function ( settings, row ) {
 			return row;
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'rows().ids()', 'row().id()', function ( hash ) {
 		var a = [];
 		var context = this.context;
-	
+
 		// `iterator` will drop undefined values, but in this case we want them
 		for ( var i=0, ien=context.length ; i<ien ; i++ ) {
 			for ( var j=0, jen=this[i].length ; j<jen ; j++ ) {
@@ -7955,31 +7955,31 @@
 				a.push( (hash === true ? '#' : '' )+ id );
 			}
 		}
-	
+
 		return new _Api( context, a );
 	} );
-	
+
 	_api_registerPlural( 'rows().remove()', 'row().remove()', function () {
 		var that = this;
-	
+
 		this.iterator( 'row', function ( settings, row, thatIdx ) {
 			var data = settings.aoData;
 			var rowData = data[ row ];
 			var i, ien, j, jen;
 			var loopRow, loopCells;
-	
+
 			data.splice( row, 1 );
-	
+
 			// Update the cached indexes
 			for ( i=0, ien=data.length ; i<ien ; i++ ) {
 				loopRow = data[i];
 				loopCells = loopRow.anCells;
-	
+
 				// Rows
 				if ( loopRow.nTr !== null ) {
 					loopRow.nTr._DT_RowIndex = i;
 				}
-	
+
 				// Cells
 				if ( loopCells !== null ) {
 					for ( j=0, jen=loopCells.length ; j<jen ; j++ ) {
@@ -7987,40 +7987,40 @@
 					}
 				}
 			}
-	
+
 			// Delete from the display arrays
 			_fnDeleteIndex( settings.aiDisplayMaster, row );
 			_fnDeleteIndex( settings.aiDisplay, row );
 			_fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes
-	
+
 			// Check for an 'overflow' they case for displaying the table
 			_fnLengthOverflow( settings );
-	
+
 			// Remove the row's ID reference if there is one
 			var id = settings.rowIdFn( rowData._aData );
 			if ( id !== undefined ) {
 				delete settings.aIds[ id ];
 			}
 		} );
-	
+
 		this.iterator( 'table', function ( settings ) {
 			for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
 				settings.aoData[i].idx = i;
 			}
 		} );
-	
+
 		return this;
 	} );
-	
-	
+
+
 	_api_register( 'rows.add()', function ( rows ) {
 		var newRows = this.iterator( 'table', function ( settings ) {
 				var row, i, ien;
 				var out = [];
-	
+
 				for ( i=0, ien=rows.length ; i<ien ; i++ ) {
 					row = rows[i];
-	
+
 					if ( row.nodeName && row.nodeName.toUpperCase() === 'TR' ) {
 						out.push( _fnAddTr( settings, row )[0] );
 					}
@@ -8028,79 +8028,79 @@
 						out.push( _fnAddData( settings, row ) );
 					}
 				}
-	
+
 				return out;
 			}, 1 );
-	
+
 		// Return an Api.rows() extended instance, so rows().nodes() etc can be used
 		var modRows = this.rows( -1 );
 		modRows.pop();
 		$.merge( modRows, newRows );
-	
+
 		return modRows;
 	} );
-	
-	
-	
-	
-	
+
+
+
+
+
 	/**
 	 *
 	 */
 	_api_register( 'row()', function ( selector, opts ) {
 		return _selector_first( this.rows( selector, opts ) );
 	} );
-	
-	
+
+
 	_api_register( 'row().data()', function ( data ) {
 		var ctx = this.context;
-	
+
 		if ( data === undefined ) {
 			// Get
 			return ctx.length && this.length ?
 				ctx[0].aoData[ this[0] ]._aData :
 				undefined;
 		}
-	
+
 		// Set
 		ctx[0].aoData[ this[0] ]._aData = data;
-	
+
 		// Automatically invalidate
 		_fnInvalidate( ctx[0], this[0], 'data' );
-	
+
 		return this;
 	} );
-	
-	
+
+
 	_api_register( 'row().node()', function () {
 		var ctx = this.context;
-	
+
 		return ctx.length && this.length ?
 			ctx[0].aoData[ this[0] ].nTr || null :
 			null;
 	} );
-	
-	
+
+
 	_api_register( 'row.add()', function ( row ) {
 		// Allow a jQuery object to be passed in - only a single row is added from
 		// it though - the first element in the set
 		if ( row instanceof $ && row.length ) {
 			row = row[0];
 		}
-	
+
 		var rows = this.iterator( 'table', function ( settings ) {
 			if ( row.nodeName && row.nodeName.toUpperCase() === 'TR' ) {
 				return _fnAddTr( settings, row )[0];
 			}
 			return _fnAddData( settings, row );
 		} );
-	
+
 		// Return an Api.rows() extended instance, with the newly added row selected
 		return this.row( rows[0] );
 	} );
-	
-	
-	
+
+
+
 	var __details_add = function ( ctx, row, data, klass )
 	{
 		// Convert to array of TR elements
@@ -8113,7 +8113,7 @@
 				}
 				return;
 			}
-	
+
 			// If we get a TR element, then just add it directly - up to the dev
 			// to add the correct number of columns etc
 			if ( r.nodeName && r.nodeName.toLowerCase() === 'tr' ) {
@@ -8126,65 +8126,65 @@
 					.addClass( k )
 					.html( r )
 					[0].colSpan = _fnVisbleColumns( ctx );
-	
+
 				rows.push( created[0] );
 			}
 		};
-	
+
 		addRow( data, klass );
-	
+
 		if ( row._details ) {
 			row._details.remove();
 		}
-	
+
 		row._details = $(rows);
-	
+
 		// If the children were already shown, that state should be retained
 		if ( row._detailsShow ) {
 			row._details.insertAfter( row.nTr );
 		}
 	};
-	
-	
+
+
 	var __details_remove = function ( api, idx )
 	{
 		var ctx = api.context;
-	
+
 		if ( ctx.length ) {
 			var row = ctx[0].aoData[ idx !== undefined ? idx : api[0] ];
-	
+
 			if ( row && row._details ) {
 				row._details.remove();
-	
+
 				row._detailsShow = undefined;
 				row._details = undefined;
 			}
 		}
 	};
-	
-	
+
+
 	var __details_display = function ( api, show ) {
 		var ctx = api.context;
-	
+
 		if ( ctx.length && api.length ) {
 			var row = ctx[0].aoData[ api[0] ];
-	
+
 			if ( row._details ) {
 				row._detailsShow = show;
-	
+
 				if ( show ) {
 					row._details.insertAfter( row.nTr );
 				}
 				else {
 					row._details.detach();
 				}
-	
+
 				__details_events( ctx[0] );
 			}
 		}
 	};
-	
-	
+
+
 	var __details_events = function ( settings )
 	{
 		var api = new _Api( settings );
@@ -8193,51 +8193,51 @@
 		var colvisEvent = 'column-visibility'+namespace;
 		var destroyEvent = 'destroy'+namespace;
 		var data = settings.aoData;
-	
+
 		api.off( drawEvent +' '+ colvisEvent +' '+ destroyEvent );
-	
+
 		if ( _pluck( data, '_details' ).length > 0 ) {
 			// On each draw, insert the required elements into the document
 			api.on( drawEvent, function ( e, ctx ) {
 				if ( settings !== ctx ) {
 					return;
 				}
-	
+
 				api.rows( {page:'current'} ).eq(0).each( function (idx) {
 					// Internal data grab
 					var row = data[ idx ];
-	
+
 					if ( row._detailsShow ) {
 						row._details.insertAfter( row.nTr );
 					}
 				} );
 			} );
-	
+
 			// Column visibility change - update the colspan
 			api.on( colvisEvent, function ( e, ctx, idx, vis ) {
 				if ( settings !== ctx ) {
 					return;
 				}
-	
+
 				// Update the colspan for the details rows (note, only if it already has
 				// a colspan)
 				var row, visible = _fnVisbleColumns( ctx );
-	
+
 				for ( var i=0, ien=data.length ; i<ien ; i++ ) {
 					row = data[i];
-	
+
 					if ( row._details ) {
 						row._details.children('td[colspan]').attr('colspan', visible );
 					}
 				}
 			} );
-	
+
 			// Table destroyed - nuke any child rows
 			api.on( destroyEvent, function ( e, ctx ) {
 				if ( settings !== ctx ) {
 					return;
 				}
-	
+
 				for ( var i=0, ien=data.length ; i<ien ; i++ ) {
 					if ( data[i]._details ) {
 						__details_remove( api, i );
@@ -8246,19 +8246,19 @@
 			} );
 		}
 	};
-	
+
 	// Strings for the method names to help minification
 	var _emp = '';
 	var _child_obj = _emp+'row().child';
 	var _child_mth = _child_obj+'()';
-	
+
 	// data can be:
 	//  tr
 	//  string
 	//  jQuery or array of any of the above
 	_api_register( _child_mth, function ( data, klass ) {
 		var ctx = this.context;
-	
+
 		if ( data === undefined ) {
 			// get
 			return ctx.length && this.length ?
@@ -8277,11 +8277,11 @@
 			// set
 			__details_add( ctx[0], ctx[0].aoData[ this[0] ], data, klass );
 		}
-	
+
 		return this;
 	} );
-	
-	
+
+
 	_api_register( [
 		_child_obj+'.show()',
 		_child_mth+'.show()' // only when `child()` was called with parameters (without
@@ -8289,8 +8289,8 @@
 		__details_display( this, true );
 		return this;
 	} );
-	
-	
+
+
 	_api_register( [
 		_child_obj+'.hide()',
 		_child_mth+'.hide()' // only when `child()` was called with parameters (without
@@ -8298,8 +8298,8 @@
 		__details_display( this, false );
 		return this;
 	} );
-	
-	
+
+
 	_api_register( [
 		_child_obj+'.remove()',
 		_child_mth+'.remove()' // only when `child()` was called with parameters (without
@@ -8307,20 +8307,20 @@
 		__details_remove( this );
 		return this;
 	} );
-	
-	
+
+
 	_api_register( _child_obj+'.isShown()', function () {
 		var ctx = this.context;
-	
+
 		if ( ctx.length && this.length ) {
 			// _detailsShown as false or undefined will fall through to return false
 			return ctx[0].aoData[ this[0] ]._detailsShow || false;
 		}
 		return false;
 	} );
-	
-	
-	
+
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Columns
 	 *
@@ -8331,13 +8331,13 @@
 	 * "{string}"          - jQuery selector on column header nodes
 	 *
 	 */
-	
+
 	// can be an array of these items, comma separated list, or an array of comma
 	// separated lists
-	
+
 	var __re_column_selector = /^(.+):(name|visIdx|visible)$/;
-	
-	
+
+
 	// r1 and r2 are redundant - but it means that the parameters match for the
 	// iterator callback in columns().data()
 	var __columnData = function ( settings, column, r1, r2, rows ) {
@@ -8347,23 +8347,23 @@
 		}
 		return a;
 	};
-	
-	
+
+
 	var __column_selector = function ( settings, selector, opts )
 	{
 		var
 			columns = settings.aoColumns,
 			names = _pluck( columns, 'sName' ),
 			nodes = _pluck( columns, 'nTh' );
-	
+
 		var run = function ( s ) {
 			var selInt = _intVal( s );
-	
+
 			// Selector - all
 			if ( s === '' ) {
 				return _range( columns.length );
 			}
-	
+
 			// Selector - index
 			if ( selInt !== null ) {
 				return [ selInt >= 0 ?
@@ -8371,11 +8371,11 @@
 					columns.length + selInt // Count from right (+ because its a negative value)
 				];
 			}
-	
+
 			// Selector = function
 			if ( typeof s === 'function' ) {
 				var rows = _selector_row_indexes( settings, opts );
-	
+
 				return $.map( columns, function (col, idx) {
 					return s(
 							idx,
@@ -8384,12 +8384,12 @@
 						) ? idx : null;
 				} );
 			}
-	
+
 			// jQuery or string selector
 			var match = typeof s === 'string' ?
 				s.match( __re_column_selector ) :
 				'';
-	
+
 			if ( match ) {
 				switch( match[2] ) {
 					case 'visIdx':
@@ -8405,23 +8405,23 @@
 						}
 						// Counting from the left
 						return [ _fnVisibleToColumnIndex( settings, idx ) ];
-	
+
 					case 'name':
 						// match by name. `names` is column index complete and in order
 						return $.map( names, function (name, i) {
 							return name === match[1] ? i : null;
 						} );
-	
+
 					default:
 						return [];
 				}
 			}
-	
+
 			// Cell in the table body
 			if ( s.nodeName && s._DT_CellIndex ) {
 				return [ s._DT_CellIndex.column ];
 			}
-	
+
 			// jQuery selector on the TH elements for the columns
 			var jqResult = $( nodes )
 				.filter( s )
@@ -8429,11 +8429,11 @@
 					return $.inArray( this, nodes ); // `nodes` is column index complete and in order
 				} )
 				.toArray();
-	
+
 			if ( jqResult.length || ! s.nodeName ) {
 				return jqResult;
 			}
-	
+
 			// Otherwise a node which might have a `dt-column` data attribute, or be
 			// a child or such an element
 			var host = $(s).closest('*[data-dt-column]');
@@ -8441,38 +8441,38 @@
 				[ host.data('dt-column') ] :
 				[];
 		};
-	
+
 		return _selector_run( 'column', selector, run, settings, opts );
 	};
-	
-	
+
+
 	var __setColumnVis = function ( settings, column, vis ) {
 		var
 			cols = settings.aoColumns,
 			col  = cols[ column ],
 			data = settings.aoData,
 			row, cells, i, ien, tr;
-	
+
 		// Get
 		if ( vis === undefined ) {
 			return col.bVisible;
 		}
-	
+
 		// Set
 		// No change
 		if ( col.bVisible === vis ) {
 			return;
 		}
-	
+
 		if ( vis ) {
 			// Insert column
 			// Need to decide if we should use appendChild or insertBefore
 			var insertBefore = $.inArray( true, _pluck(cols, 'bVisible'), column+1 );
-	
+
 			for ( i=0, ien=data.length ; i<ien ; i++ ) {
 				tr = data[i].nTr;
 				cells = data[i].anCells;
-	
+
 				if ( tr ) {
 					// insertBefore can act like appendChild if 2nd arg is null
 					tr.insertBefore( cells[ column ], cells[ insertBefore ] || null );
@@ -8483,16 +8483,16 @@
 			// Remove column
 			$( _pluck( settings.aoData, 'anCells', column ) ).detach();
 		}
-	
+
 		// Common actions
 		col.bVisible = vis;
 		_fnDrawHead( settings, settings.aoHeader );
 		_fnDrawHead( settings, settings.aoFooter );
-	
+
 		_fnSaveState( settings );
 	};
-	
-	
+
+
 	_api_register( 'columns()', function ( selector, opts ) {
 		// argument shifting
 		if ( selector === undefined ) {
@@ -8502,42 +8502,42 @@
 			opts = selector;
 			selector = '';
 		}
-	
+
 		opts = _selector_opts( opts );
-	
+
 		var inst = this.iterator( 'table', function ( settings ) {
 			return __column_selector( settings, selector, opts );
 		}, 1 );
-	
+
 		// Want argument shifting here and in _row_selector?
 		inst.selector.cols = selector;
 		inst.selector.opts = opts;
-	
+
 		return inst;
 	} );
-	
+
 	_api_registerPlural( 'columns().header()', 'column().header()', function ( selector, opts ) {
 		return this.iterator( 'column', function ( settings, column ) {
 			return settings.aoColumns[column].nTh;
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'columns().footer()', 'column().footer()', function ( selector, opts ) {
 		return this.iterator( 'column', function ( settings, column ) {
 			return settings.aoColumns[column].nTf;
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'columns().data()', 'column().data()', function () {
 		return this.iterator( 'column-rows', __columnData, 1 );
 	} );
-	
+
 	_api_registerPlural( 'columns().dataSrc()', 'column().dataSrc()', function () {
 		return this.iterator( 'column', function ( settings, column ) {
 			return settings.aoColumns[column].mData;
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'columns().cache()', 'column().cache()', function ( type ) {
 		return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
 			return _pluck_order( settings.aoData, rows,
@@ -8545,13 +8545,13 @@
 			);
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'columns().nodes()', 'column().nodes()', function () {
 		return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
 			return _pluck_order( settings.aoData, rows, 'anCells', column ) ;
 		}, 1 );
 	} );
-	
+
 	_api_registerPlural( 'columns().visible()', 'column().visible()', function ( vis, calc ) {
 		var ret = this.iterator( 'column', function ( settings, column ) {
 			if ( vis === undefined ) {
@@ -8559,22 +8559,22 @@
 			} // else
 			__setColumnVis( settings, column, vis );
 		} );
-	
+
 		// Group the column visibility changes
 		if ( vis !== undefined ) {
 			// Second loop once the first is done for events
 			this.iterator( 'column', function ( settings, column ) {
 				_fnCallbackFire( settings, null, 'column-visibility', [settings, column, vis, calc] );
 			} );
-	
+
 			if ( calc === undefined || calc ) {
 				this.columns.adjust();
 			}
 		}
-	
+
 		return ret;
 	} );
-	
+
 	_api_registerPlural( 'columns().indexes()', 'column().index()', function ( type ) {
 		return this.iterator( 'column', function ( settings, column ) {
 			return type === 'visible' ?
@@ -8582,17 +8582,17 @@
 				column;
 		}, 1 );
 	} );
-	
+
 	_api_register( 'columns.adjust()', function () {
 		return this.iterator( 'table', function ( settings ) {
 			_fnAdjustColumnSizing( settings );
 		}, 1 );
 	} );
-	
+
 	_api_register( 'column.index()', function ( type, idx ) {
 		if ( this.context.length !== 0 ) {
 			var ctx = this.context[0];
-	
+
 			if ( type === 'fromVisible' || type === 'toData' ) {
 				return _fnVisibleToColumnIndex( ctx, idx );
 			}
@@ -8601,13 +8601,13 @@
 			}
 		}
 	} );
-	
+
 	_api_register( 'column()', function ( selector, opts ) {
 		return _selector_first( this.columns( selector, opts ) );
 	} );
-	
-	
-	
+
+
+
 	var __cell_selector = function ( settings, selector, opts )
 	{
 		var data = settings.aoData;
@@ -8617,27 +8617,27 @@
 		var row;
 		var columns = settings.aoColumns.length;
 		var a, i, ien, j, o, host;
-	
+
 		var run = function ( s ) {
 			var fnSelector = typeof s === 'function';
-	
+
 			if ( s === null || s === undefined || fnSelector ) {
 				// All cells and function selectors
 				a = [];
-	
+
 				for ( i=0, ien=rows.length ; i<ien ; i++ ) {
 					row = rows[i];
-	
+
 					for ( j=0 ; j<columns ; j++ ) {
 						o = {
 							row: row,
 							column: j
 						};
-	
+
 						if ( fnSelector ) {
 							// Selector - function
 							host = data[ row ];
-	
+
 							if ( s( o, _fnGetCellData(settings, row, j), host.anCells ? host.anCells[j] : null ) ) {
 								a.push( o );
 							}
@@ -8648,15 +8648,15 @@
 						}
 					}
 				}
-	
+
 				return a;
 			}
-			
+
 			// Selector - index
 			if ( $.isPlainObject( s ) ) {
 				return [s];
 			}
-	
+
 			// Selector - jQuery filtered cells
 			var jqResult = allCells
 				.filter( s )
@@ -8667,11 +8667,11 @@
 	 				};
 				} )
 				.toArray();
-	
+
 			if ( jqResult.length || ! s.nodeName ) {
 				return jqResult;
 			}
-	
+
 			// Otherwise the selector is a node, and there is one last option - the
 			// element might be a child of an element which has dt-row and dt-column
 			// data attributes
@@ -8683,13 +8683,13 @@
 				} ] :
 				[];
 		};
-	
+
 		return _selector_run( 'cell', selector, run, settings, opts );
 	};
-	
-	
-	
-	
+
+
+
+
 	_api_register( 'cells()', function ( rowSelector, columnSelector, opts ) {
 		// Argument shifting
 		if ( $.isPlainObject( rowSelector ) ) {
@@ -8709,22 +8709,22 @@
 			opts = columnSelector;
 			columnSelector = null;
 		}
-	
+
 		// Cell selector
 		if ( columnSelector === null || columnSelector === undefined ) {
 			return this.iterator( 'table', function ( settings ) {
 				return __cell_selector( settings, rowSelector, _selector_opts( opts ) );
 			} );
 		}
-	
+
 		// Row + column selector
 		var columns = this.columns( columnSelector, opts );
 		var rows = this.rows( rowSelector, opts );
 		var a, i, ien, j, jen;
-	
+
 		var cells = this.iterator( 'table', function ( settings, idx ) {
 			a = [];
-	
+
 			for ( i=0, ien=rows[idx].length ; i<ien ; i++ ) {
 				for ( j=0, jen=columns[idx].length ; j<jen ; j++ ) {
 					a.push( {
@@ -8733,54 +8733,54 @@
 					} );
 				}
 			}
-	
+
 			return a;
 		}, 1 );
-	
+
 		$.extend( cells.selector, {
 			cols: columnSelector,
 			rows: rowSelector,
 			opts: opts
 		} );
-	
+
 		return cells;
 	} );
-	
-	
+
+
 	_api_registerPlural( 'cells().nodes()', 'cell().node()', function () {
 		return this.iterator( 'cell', function ( settings, row, column ) {
 			var data = settings.aoData[ row ];
-	
+
 			return data && data.anCells ?
 				data.anCells[ column ] :
 				undefined;
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_register( 'cells().data()', function () {
 		return this.iterator( 'cell', function ( settings, row, column ) {
 			return _fnGetCellData( settings, row, column );
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'cells().cache()', 'cell().cache()', function ( type ) {
 		type = type === 'search' ? '_aFilterData' : '_aSortData';
-	
+
 		return this.iterator( 'cell', function ( settings, row, column ) {
 			return settings.aoData[ row ][ type ][ column ];
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'cells().render()', 'cell().render()', function ( type ) {
 		return this.iterator( 'cell', function ( settings, row, column ) {
 			return _fnGetCellData( settings, row, column, type );
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'cells().indexes()', 'cell().index()', function () {
 		return this.iterator( 'cell', function ( settings, row, column ) {
 			return {
@@ -8790,41 +8790,41 @@
 			};
 		}, 1 );
 	} );
-	
-	
+
+
 	_api_registerPlural( 'cells().invalidate()', 'cell().invalidate()', function ( src ) {
 		return this.iterator( 'cell', function ( settings, row, column ) {
 			_fnInvalidate( settings, row, src, column );
 		} );
 	} );
-	
-	
-	
+
+
+
 	_api_register( 'cell()', function ( rowSelector, columnSelector, opts ) {
 		return _selector_first( this.cells( rowSelector, columnSelector, opts ) );
 	} );
-	
-	
+
+
 	_api_register( 'cell().data()', function ( data ) {
 		var ctx = this.context;
 		var cell = this[0];
-	
+
 		if ( data === undefined ) {
 			// Get
 			return ctx.length && cell.length ?
 				_fnGetCellData( ctx[0], cell[0].row, cell[0].column ) :
 				undefined;
 		}
-	
+
 		// Set
 		_fnSetCellData( ctx[0], cell[0].row, cell[0].column, data );
 		_fnInvalidate( ctx[0], cell[0].row, 'data', cell[0].column );
-	
+
 		return this;
 	} );
-	
-	
-	
+
+
+
 	/**
 	 * Get current ordering (sorting) that has been applied to the table.
 	 *
@@ -8855,14 +8855,14 @@
 	 */
 	_api_register( 'order()', function ( order, dir ) {
 		var ctx = this.context;
-	
+
 		if ( order === undefined ) {
 			// get
 			return ctx.length !== 0 ?
 				ctx[0].aaSorting :
 				undefined;
 		}
-	
+
 		// set
 		if ( typeof order === 'number' ) {
 			// Simple column / direction passed in
@@ -8873,13 +8873,13 @@
 			order = Array.prototype.slice.call( arguments );
 		}
 		// otherwise a 2D array was passed in
-	
+
 		return this.iterator( 'table', function ( settings ) {
 			settings.aaSorting = order.slice();
 		} );
 	} );
-	
-	
+
+
 	/**
 	 * Attach a sort listener to an element for a given column
 	 *
@@ -8895,62 +8895,62 @@
 			_fnSortAttachListener( settings, node, column, callback );
 		} );
 	} );
-	
-	
+
+
 	_api_register( 'order.fixed()', function ( set ) {
 		if ( ! set ) {
 			var ctx = this.context;
 			var fixed = ctx.length ?
 				ctx[0].aaSortingFixed :
 				undefined;
-	
+
 			return $.isArray( fixed ) ?
 				{ pre: fixed } :
 				fixed;
 		}
-	
+
 		return this.iterator( 'table', function ( settings ) {
 			settings.aaSortingFixed = $.extend( true, {}, set );
 		} );
 	} );
-	
-	
+
+
 	// Order by the selected column(s)
 	_api_register( [
 		'columns().order()',
 		'column().order()'
 	], function ( dir ) {
 		var that = this;
-	
+
 		return this.iterator( 'table', function ( settings, i ) {
 			var sort = [];
-	
+
 			$.each( that[i], function (j, col) {
 				sort.push( [ col, dir ] );
 			} );
-	
+
 			settings.aaSorting = sort;
 		} );
 	} );
-	
-	
-	
+
+
+
 	_api_register( 'search()', function ( input, regex, smart, caseInsen ) {
 		var ctx = this.context;
-	
+
 		if ( input === undefined ) {
 			// get
 			return ctx.length !== 0 ?
 				ctx[0].oPreviousSearch.sSearch :
 				undefined;
 		}
-	
+
 		// set
 		return this.iterator( 'table', function ( settings ) {
 			if ( ! settings.oFeatures.bFilter ) {
 				return;
 			}
-	
+
 			_fnFilterComplete( settings, $.extend( {}, settings.oPreviousSearch, {
 				"sSearch": input+"",
 				"bRegex":  regex === null ? false : regex,
@@ -8959,71 +8959,71 @@
 			} ), 1 );
 		} );
 	} );
-	
-	
+
+
 	_api_registerPlural(
 		'columns().search()',
 		'column().search()',
 		function ( input, regex, smart, caseInsen ) {
 			return this.iterator( 'column', function ( settings, column ) {
 				var preSearch = settings.aoPreSearchCols;
-	
+
 				if ( input === undefined ) {
 					// get
 					return preSearch[ column ].sSearch;
 				}
-	
+
 				// set
 				if ( ! settings.oFeatures.bFilter ) {
 					return;
 				}
-	
+
 				$.extend( preSearch[ column ], {
 					"sSearch": input+"",
 					"bRegex":  regex === null ? false : regex,
 					"bSmart":  smart === null ? true  : smart,
 					"bCaseInsensitive": caseInsen === null ? true : caseInsen
 				} );
-	
+
 				_fnFilterComplete( settings, settings.oPreviousSearch, 1 );
 			} );
 		}
 	);
-	
+
 	/*
 	 * State API methods
 	 */
-	
+
 	_api_register( 'state()', function () {
 		return this.context.length ?
 			this.context[0].oSavedState :
 			null;
 	} );
-	
-	
+
+
 	_api_register( 'state.clear()', function () {
 		return this.iterator( 'table', function ( settings ) {
 			// Save an empty object
 			settings.fnStateSaveCallback.call( settings.oInstance, settings, {} );
 		} );
 	} );
-	
-	
+
+
 	_api_register( 'state.loaded()', function () {
 		return this.context.length ?
 			this.context[0].oLoadedState :
 			null;
 	} );
-	
-	
+
+
 	_api_register( 'state.save()', function () {
 		return this.iterator( 'table', function ( settings ) {
 			_fnSaveState( settings );
 		} );
 	} );
-	
-	
-	
+
+
+
 	/**
 	 * Provide a common method for plug-ins to check the version of DataTables being
 	 * used, in order to ensure compatibility.
@@ -9044,24 +9044,24 @@
 		var aThis = DataTable.version.split('.');
 		var aThat = version.split('.');
 		var iThis, iThat;
-	
+
 		for ( var i=0, iLen=aThat.length ; i<iLen ; i++ ) {
 			iThis = parseInt( aThis[i], 10 ) || 0;
 			iThat = parseInt( aThat[i], 10 ) || 0;
-	
+
 			// Parts are the same, keep comparing
 			if (iThis === iThat) {
 				continue;
 			}
-	
+
 			// Parts are different, return immediately
 			return iThis > iThat;
 		}
-	
+
 		return true;
 	};
-	
-	
+
+
 	/**
 	 * Check if a `<table>` node is a DataTable table already or not.
 	 *
@@ -9081,20 +9081,20 @@
 	{
 		var t = $(table).get(0);
 		var is = false;
-	
+
 		$.each( DataTable.settings, function (i, o) {
 			var head = o.nScrollHead ? $('table', o.nScrollHead)[0] : null;
 			var foot = o.nScrollFoot ? $('table', o.nScrollFoot)[0] : null;
-	
+
 			if ( o.nTable === t || head === t || foot === t ) {
 				is = true;
 			}
 		} );
-	
+
 		return is;
 	};
-	
-	
+
+
 	/**
 	 * Get all DataTable tables that have been initialised - optionally you can
 	 * select to get only currently visible tables.
@@ -9114,24 +9114,24 @@
 	DataTable.tables = DataTable.fnTables = function ( visible )
 	{
 		var api = false;
-	
+
 		if ( $.isPlainObject( visible ) ) {
 			api = visible.api;
 			visible = visible.visible;
 		}
-	
+
 		var a = $.map( DataTable.settings, function (o) {
 			if ( !visible || (visible && $(o.nTable).is(':visible')) ) {
 				return o.nTable;
 			}
 		} );
-	
+
 		return api ?
 			new _Api( a ) :
 			a;
 	};
-	
-	
+
+
 	/**
 	 * Convert from camel case parameters to Hungarian notation. This is made public
 	 * for the extensions to provide the same ability as DataTables core to accept
@@ -9146,9 +9146,9 @@
 	 *    won't be.
 	 */
 	DataTable.camelToHungarian = _fnCamelToHungarian;
-	
-	
-	
+
+
+
 	/**
 	 *
 	 */
@@ -9156,59 +9156,59 @@
 		var
 			rows   = this.rows( opts ).nodes(), // Get all rows
 			jqRows = $(rows);
-	
+
 		return $( [].concat(
 			jqRows.filter( selector ).toArray(),
 			jqRows.find( selector ).toArray()
 		) );
 	} );
-	
-	
+
+
 	// jQuery functions to operate on the tables
 	$.each( [ 'on', 'one', 'off' ], function (i, key) {
 		_api_register( key+'()', function ( /* event, handler */ ) {
 			var args = Array.prototype.slice.call(arguments);
-	
+
 			// Add the `dt` namespace automatically if it isn't already present
 			if ( ! args[0].match(/\.dt\b/) ) {
 				args[0] += '.dt';
 			}
-	
+
 			var inst = $( this.tables().nodes() );
 			inst[key].apply( inst, args );
 			return this;
 		} );
 	} );
-	
-	
+
+
 	_api_register( 'clear()', function () {
 		return this.iterator( 'table', function ( settings ) {
 			_fnClearTable( settings );
 		} );
 	} );
-	
-	
+
+
 	_api_register( 'settings()', function () {
 		return new _Api( this.context, this.context );
 	} );
-	
-	
+
+
 	_api_register( 'init()', function () {
 		var ctx = this.context;
 		return ctx.length ? ctx[0].oInit : null;
 	} );
-	
-	
+
+
 	_api_register( 'data()', function () {
 		return this.iterator( 'table', function ( settings ) {
 			return _pluck( settings.aoData, '_aData' );
 		} ).flatten();
 	} );
-	
-	
+
+
 	_api_register( 'destroy()', function ( remove ) {
 		remove = remove || false;
-	
+
 		return this.iterator( 'table', function ( settings ) {
 			var orig      = settings.nTableWrapper.parentNode;
 			var classes   = settings.oClasses;
@@ -9221,46 +9221,46 @@
 			var jqWrapper = $(settings.nTableWrapper);
 			var rows      = $.map( settings.aoData, function (r) { return r.nTr; } );
 			var i, ien;
-	
+
 			// Flag to note that the table is currently being destroyed - no action
 			// should be taken
 			settings.bDestroying = true;
-	
+
 			// Fire off the destroy callbacks for plug-ins etc
 			_fnCallbackFire( settings, "aoDestroyCallback", "destroy", [settings] );
-	
+
 			// If not being removed from the document, make all columns visible
 			if ( ! remove ) {
 				new _Api( settings ).columns().visible( true );
 			}
-	
+
 			// Blitz all `DT` namespaced events (these are internal events, the
 			// lowercase, `dt` events are user subscribed and they are responsible
 			// for removing them
 			jqWrapper.unbind('.DT').find(':not(tbody *)').unbind('.DT');
 			$(window).unbind('.DT-'+settings.sInstance);
-	
+
 			// When scrolling we had to break the table up - restore it
 			if ( table != thead.parentNode ) {
 				jqTable.children('thead').detach();
 				jqTable.append( thead );
 			}
-	
+
 			if ( tfoot && table != tfoot.parentNode ) {
 				jqTable.children('tfoot').detach();
 				jqTable.append( tfoot );
 			}
-	
+
 			settings.aaSorting = [];
 			settings.aaSortingFixed = [];
 			_fnSortingClasses( settings );
-	
+
 			$( rows ).removeClass( settings.asStripeClasses.join(' ') );
-	
+
 			$('th, td', thead).removeClass( classes.sSortable+' '+
 				classes.sSortableAsc+' '+classes.sSortableDesc+' '+classes.sSortableNone
 			);
-	
+
 			if ( settings.bJUI ) {
 				$('th span.'+classes.sSortIcon+ ', td span.'+classes.sSortIcon, thead).detach();
 				$('th, td', thead).each( function () {
@@ -9269,39 +9269,39 @@
 					wrapper.detach();
 				} );
 			}
-	
+
 			// Add the TR elements back into the table in their original order
 			jqTbody.children().detach();
 			jqTbody.append( rows );
-	
+
 			// Remove the DataTables generated nodes, events and classes
 			var removedMethod = remove ? 'remove' : 'detach';
 			jqTable[ removedMethod ]();
 			jqWrapper[ removedMethod ]();
-	
+
 			// If we need to reattach the table to the document
 			if ( ! remove && orig ) {
 				// insertBefore acts like appendChild if !arg[1]
 				orig.insertBefore( table, settings.nTableReinsertBefore );
-	
+
 				// Restore the width of the original table - was read from the style property,
 				// so we can restore directly to that
 				jqTable
 					.css( 'width', settings.sDestroyWidth )
 					.removeClass( classes.sTable );
-	
+
 				// If the were originally stripe classes - then we add them back here.
 				// Note this is not fool proof (for example if not all rows had stripe
 				// classes - but it's a good effort without getting carried away
 				ien = settings.asDestroyStripes.length;
-	
+
 				if ( ien ) {
 					jqTbody.children().each( function (i) {
 						$(this).addClass( settings.asDestroyStripes[i % ien] );
 					} );
 				}
 			}
-	
+
 			/* Remove the settings object from the settings array */
 			var idx = $.inArray( settings, DataTable.settings );
 			if ( idx !== -1 ) {
@@ -9309,14 +9309,14 @@
 			}
 		} );
 	} );
-	
-	
+
+
 	// Add the `every()` method for rows, columns and cells in a compact form
 	$.each( [ 'column', 'row', 'cell' ], function ( i, type ) {
 		_api_register( type+'s().every()', function ( fn ) {
 			var opts = this.selector.opts;
 			var api = this;
-	
+
 			return this.iterator( type, function ( settings, arg1, arg2, arg3, arg4 ) {
 				// Rows and columns:
 				//  arg1 - index
@@ -9339,24 +9339,24 @@
 			} );
 		} );
 	} );
-	
-	
+
+
 	// i18n method for extensions to be able to use the language object from the
 	// DataTable
 	_api_register( 'i18n()', function ( token, def, plural ) {
 		var ctx = this.context[0];
 		var resolved = _fnGetObjectDataFn( token )( ctx.oLanguage );
-	
+
 		if ( resolved === undefined ) {
 			resolved = def;
 		}
-	
+
 		if ( plural !== undefined && $.isPlainObject( resolved ) ) {
 			resolved = resolved[ plural ] !== undefined ?
 				resolved[ plural ] :
 				resolved._;
 		}
-	
+
 		return resolved.replace( '%d', plural ); // nb: plural might be undefined,
 	} );
 
@@ -9391,9 +9391,9 @@
 	 *  @namespace
 	 */
 	DataTable.models = {};
-	
-	
-	
+
+
+
 	/**
 	 * Template object for the way in which DataTables holds information about
 	 * search information for the global filter and individual column filters.
@@ -9406,14 +9406,14 @@
 		 *  @default true
 		 */
 		"bCaseInsensitive": true,
-	
+
 		/**
 		 * Applied search term
 		 *  @type string
 		 *  @default <i>Empty string</i>
 		 */
 		"sSearch": "",
-	
+
 		/**
 		 * Flag to indicate if the search term should be interpreted as a
 		 * regular expression (true) or not (false) and therefore and special
@@ -9422,7 +9422,7 @@
 		 *  @default false
 		 */
 		"bRegex": false,
-	
+
 		/**
 		 * Flag to indicate if DataTables is to use its smart filtering or not.
 		 *  @type boolean
@@ -9430,10 +9430,10 @@
 		 */
 		"bSmart": true
 	};
-	
-	
-	
-	
+
+
+
+
 	/**
 	 * Template object for the way in which DataTables holds information about
 	 * each individual row. This is the object format used for the settings
@@ -9447,7 +9447,7 @@
 		 *  @default null
 		 */
 		"nTr": null,
-	
+
 		/**
 		 * Array of TD elements for each row. This is null until the row has been
 		 * created.
@@ -9455,7 +9455,7 @@
 		 *  @default []
 		 */
 		"anCells": null,
-	
+
 		/**
 		 * Data object from the original data source for the row. This is either
 		 * an array if using the traditional form of DataTables, or an object if
@@ -9466,7 +9466,7 @@
 		 *  @default []
 		 */
 		"_aData": [],
-	
+
 		/**
 		 * Sorting data cache - this array is ostensibly the same length as the
 		 * number of columns (although each index is generated only as it is
@@ -9480,7 +9480,7 @@
 		 *  @private
 		 */
 		"_aSortData": null,
-	
+
 		/**
 		 * Per cell filtering data cache. As per the sort data cache, used to
 		 * increase the performance of the filtering in DataTables
@@ -9489,7 +9489,7 @@
 		 *  @private
 		 */
 		"_aFilterData": null,
-	
+
 		/**
 		 * Filtering data cache. This is the same as the cell filtering cache, but
 		 * in this case a string rather than an array. This is easily computed with
@@ -9500,7 +9500,7 @@
 		 *  @private
 		 */
 		"_sFilterRow": null,
-	
+
 		/**
 		 * Cache of the class name that DataTables has applied to the row, so we
 		 * can quickly look at this variable rather than needing to do a DOM check
@@ -9510,7 +9510,7 @@
 		 *  @private
 		 */
 		"_sRowStripe": "",
-	
+
 		/**
 		 * Denote if the original data source was from the DOM, or the data source
 		 * object. This is used for invalidating data, so DataTables can
@@ -9521,7 +9521,7 @@
 		 *  @private
 		 */
 		"src": null,
-	
+
 		/**
 		 * Index in the aoData array. This saves an indexOf lookup when we have the
 		 * object, but want to know the index
@@ -9531,8 +9531,8 @@
 		 */
 		"idx": -1
 	};
-	
-	
+
+
 	/**
 	 * Template object for the column information object in DataTables. This object
 	 * is held in the settings aoColumns array and contains all the information that
@@ -9552,7 +9552,7 @@
 		 *  @default null
 		 */
 		"idx": null,
-	
+
 		/**
 		 * A list of the columns that sorting should occur on when this column
 		 * is sorted. That this property is an array allows multi-column sorting
@@ -9563,7 +9563,7 @@
 		 *  @type array
 		 */
 		"aDataSort": null,
-	
+
 		/**
 		 * Define the sorting directions that are applied to the column, in sequence
 		 * as the column is repeatedly sorted upon - i.e. the first value is used
@@ -9573,26 +9573,26 @@
 		 *  @type array
 		 */
 		"asSorting": null,
-	
+
 		/**
 		 * Flag to indicate if the column is searchable, and thus should be included
 		 * in the filtering or not.
 		 *  @type boolean
 		 */
 		"bSearchable": null,
-	
+
 		/**
 		 * Flag to indicate if the column is sortable or not.
 		 *  @type boolean
 		 */
 		"bSortable": null,
-	
+
 		/**
 		 * Flag to indicate if the column is currently visible in the table or not
 		 *  @type boolean
 		 */
 		"bVisible": null,
-	
+
 		/**
 		 * Store for manual type assignment using the `column.type` option. This
 		 * is held in store so we can manipulate the column's `sType` property.
@@ -9601,7 +9601,7 @@
 		 *  @private
 		 */
 		"_sManualType": null,
-	
+
 		/**
 		 * Flag to indicate if HTML5 data attributes should be used as the data
 		 * source for filtering or sorting. True is either are.
@@ -9610,7 +9610,7 @@
 		 *  @private
 		 */
 		"_bAttrSrc": false,
-	
+
 		/**
 		 * Developer definable function that is called whenever a cell is created (Ajax source,
 		 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
@@ -9624,7 +9624,7 @@
 		 *  @default null
 		 */
 		"fnCreatedCell": null,
-	
+
 		/**
 		 * Function to get data from a cell in a column. You should <b>never</b>
 		 * access data directly through _aData internally in DataTables - always use
@@ -9640,7 +9640,7 @@
 		 *  @default null
 		 */
 		"fnGetData": null,
-	
+
 		/**
 		 * Function to set data for a cell in the column. You should <b>never</b>
 		 * set the data directly to _aData internally in DataTables - always use
@@ -9653,7 +9653,7 @@
 		 *  @default null
 		 */
 		"fnSetData": null,
-	
+
 		/**
 		 * Property to read the value for the cells in the column from the data
 		 * source array / object. If null, then the default content is used, if a
@@ -9662,7 +9662,7 @@
 		 *  @default null
 		 */
 		"mData": null,
-	
+
 		/**
 		 * Partner property to mData which is used (only when defined) to get
 		 * the data - i.e. it is basically the same as mData, but without the
@@ -9672,7 +9672,7 @@
 		 *  @default null
 		 */
 		"mRender": null,
-	
+
 		/**
 		 * Unique header TH/TD element for this column - this is what the sorting
 		 * listener is attached to (if sorting is enabled.)
@@ -9680,7 +9680,7 @@
 		 *  @default null
 		 */
 		"nTh": null,
-	
+
 		/**
 		 * Unique footer TH/TD element for this column (if there is one). Not used
 		 * in DataTables as such, but can be used for plug-ins to reference the
@@ -9689,14 +9689,14 @@
 		 *  @default null
 		 */
 		"nTf": null,
-	
+
 		/**
 		 * The class to apply to all TD elements in the table's TBODY for the column
 		 *  @type string
 		 *  @default null
 		 */
 		"sClass": null,
-	
+
 		/**
 		 * When DataTables calculates the column widths to assign to each column,
 		 * it finds the longest string in each column and then constructs a
@@ -9709,7 +9709,7 @@
 		 *  @type string
 		 */
 		"sContentPadding": null,
-	
+
 		/**
 		 * Allows a default value to be given for a column's data, and will be used
 		 * whenever a null data source is encountered (this can be because mData
@@ -9718,14 +9718,14 @@
 		 *  @default null
 		 */
 		"sDefaultContent": null,
-	
+
 		/**
 		 * Name for the column, allowing reference to the column by name as well as
 		 * by index (needs a lookup to work by name).
 		 *  @type string
 		 */
 		"sName": null,
-	
+
 		/**
 		 * Custom sorting data type - defines which of the available plug-ins in
 		 * afnSortData the custom sorting will use - if any is defined.
@@ -9733,14 +9733,14 @@
 		 *  @default std
 		 */
 		"sSortDataType": 'std',
-	
+
 		/**
 		 * Class to be applied to the header element when sorting on this column
 		 *  @type string
 		 *  @default null
 		 */
 		"sSortingClass": null,
-	
+
 		/**
 		 * Class to be applied to the header element when sorting on this column -
 		 * when jQuery UI theming is used.
@@ -9748,27 +9748,27 @@
 		 *  @default null
 		 */
 		"sSortingClassJUI": null,
-	
+
 		/**
 		 * Title of the column - what is seen in the TH element (nTh).
 		 *  @type string
 		 */
 		"sTitle": null,
-	
+
 		/**
 		 * Column sorting and filtering type
 		 *  @type string
 		 *  @default null
 		 */
 		"sType": null,
-	
+
 		/**
 		 * Width of the column
 		 *  @type string
 		 *  @default null
 		 */
 		"sWidth": null,
-	
+
 		/**
 		 * Width of the column when it was first "encountered"
 		 *  @type string
@@ -9776,8 +9776,8 @@
 		 */
 		"sWidthOrig": null
 	};
-	
-	
+
+
 	/*
 	 * Developer note: The properties of the object below are given in Hungarian
 	 * notation, that was used as the interface for DataTables prior to v1.10, however
@@ -9793,7 +9793,7 @@
 	 * completely, but that is a massive amount of work and will break current
 	 * installs (therefore is on-hold until v2).
 	 */
-	
+
 	/**
 	 * Initialisation options that can be given to DataTables at initialisation
 	 * time.
@@ -9860,8 +9860,8 @@
 		 *    } );
 		 */
 		"aaData": null,
-	
-	
+
+
 		/**
 		 * If ordering is enabled, then DataTables will perform a first pass sort on
 		 * initialisation. You can define which column(s) the sort is performed
@@ -9890,8 +9890,8 @@
 		 *    } );
 		 */
 		"aaSorting": [[0,'asc']],
-	
-	
+
+
 		/**
 		 * This parameter is basically identical to the `sorting` parameter, but
 		 * cannot be overridden by user interaction with the table. What this means
@@ -9913,8 +9913,8 @@
 		 *    } )
 		 */
 		"aaSortingFixed": [],
-	
-	
+
+
 		/**
 		 * DataTables can be instructed to load data to display in the table from a
 		 * Ajax source. This option defines how that Ajax call is made and where to.
@@ -10070,8 +10070,8 @@
 		 *   } );
 		 */
 		"ajax": null,
-	
-	
+
+
 		/**
 		 * This parameter allows you to readily specify the entries in the length drop
 		 * down menu that DataTables shows when pagination is enabled. It can be
@@ -10096,8 +10096,8 @@
 		 *    } );
 		 */
 		"aLengthMenu": [ 10, 25, 50, 100 ],
-	
-	
+
+
 		/**
 		 * The `columns` option in the initialisation parameter allows you to define
 		 * details about the way individual columns behave. For a full list of
@@ -10111,7 +10111,7 @@
 		 *  @name DataTable.defaults.column
 		 */
 		"aoColumns": null,
-	
+
 		/**
 		 * Very similar to `columns`, `columnDefs` allows you to target a specific
 		 * column, multiple columns, or all columns, using the `targets` property of
@@ -10132,8 +10132,8 @@
 		 *  @name DataTable.defaults.columnDefs
 		 */
 		"aoColumnDefs": null,
-	
-	
+
+
 		/**
 		 * Basically the same as `search`, this parameter defines the individual column
 		 * filtering state at initialisation time. The array must be of the same size
@@ -10159,8 +10159,8 @@
 		 *    } )
 		 */
 		"aoSearchCols": [],
-	
-	
+
+
 		/**
 		 * An array of CSS classes that should be applied to displayed rows. This
 		 * array may be of any length, and DataTables will apply each class
@@ -10180,8 +10180,8 @@
 		 *    } )
 		 */
 		"asStripeClasses": null,
-	
-	
+
+
 		/**
 		 * Enable or disable automatic column width calculation. This can be disabled
 		 * as an optimisation (it takes some time to calculate the widths) if the
@@ -10200,8 +10200,8 @@
 		 *    } );
 		 */
 		"bAutoWidth": true,
-	
-	
+
+
 		/**
 		 * Deferred rendering can provide DataTables with a huge speed boost when you
 		 * are using an Ajax or JS data source for the table. This option, when set to
@@ -10223,8 +10223,8 @@
 		 *    } );
 		 */
 		"bDeferRender": false,
-	
-	
+
+
 		/**
 		 * Replace a DataTable which matches the given selector and replace it with
 		 * one which has the properties of the new initialisation object passed. If no
@@ -10251,8 +10251,8 @@
 		 *    } );
 		 */
 		"bDestroy": false,
-	
-	
+
+
 		/**
 		 * Enable or disable filtering of data. Filtering in DataTables is "smart" in
 		 * that it allows the end user to input multiple words (space separated) and
@@ -10275,8 +10275,8 @@
 		 *    } );
 		 */
 		"bFilter": true,
-	
-	
+
+
 		/**
 		 * Enable or disable the table information display. This shows information
 		 * about the data that is currently visible on the page, including information
@@ -10295,8 +10295,8 @@
 		 *    } );
 		 */
 		"bInfo": true,
-	
-	
+
+
 		/**
 		 * Enable jQuery UI ThemeRoller support (required as ThemeRoller requires some
 		 * slightly different and additional mark-up from what DataTables has
@@ -10315,8 +10315,8 @@
 		 *    } );
 		 */
 		"bJQueryUI": false,
-	
-	
+
+
 		/**
 		 * Allows the end user to select the size of a formatted page from a select
 		 * menu (sizes are 10, 25, 50 and 100). Requires pagination (`paginate`).
@@ -10334,8 +10334,8 @@
 		 *    } );
 		 */
 		"bLengthChange": true,
-	
-	
+
+
 		/**
 		 * Enable or disable pagination.
 		 *  @type boolean
@@ -10352,8 +10352,8 @@
 		 *    } );
 		 */
 		"bPaginate": true,
-	
-	
+
+
 		/**
 		 * Enable or disable the display of a 'processing' indicator when the table is
 		 * being processed (e.g. a sort). This is particularly useful for tables with
@@ -10373,8 +10373,8 @@
 		 *    } );
 		 */
 		"bProcessing": false,
-	
-	
+
+
 		/**
 		 * Retrieve the DataTables object for the given selector. Note that if the
 		 * table has already been initialised, this parameter will cause DataTables
@@ -10411,8 +10411,8 @@
 		 *    }
 		 */
 		"bRetrieve": false,
-	
-	
+
+
 		/**
 		 * When vertical (y) scrolling is enabled, DataTables will force the height of
 		 * the table's viewport to the given height at all times (useful for layout).
@@ -10435,8 +10435,8 @@
 		 *    } );
 		 */
 		"bScrollCollapse": false,
-	
-	
+
+
 		/**
 		 * Configure DataTables to use server-side processing. Note that the
 		 * `ajax` parameter must also be given in order to give DataTables a
@@ -10457,8 +10457,8 @@
 		 *    } );
 		 */
 		"bServerSide": false,
-	
-	
+
+
 		/**
 		 * Enable or disable sorting of columns. Sorting of individual columns can be
 		 * disabled by the `sortable` option for each column.
@@ -10476,8 +10476,8 @@
 		 *    } );
 		 */
 		"bSort": true,
-	
-	
+
+
 		/**
 		 * Enable or display DataTables' ability to sort multiple columns at the
 		 * same time (activated by shift-click by the user).
@@ -10496,8 +10496,8 @@
 		 *    } );
 		 */
 		"bSortMulti": true,
-	
-	
+
+
 		/**
 		 * Allows control over whether DataTables should use the top (true) unique
 		 * cell that is found for a single column, or the bottom (false - default).
@@ -10516,8 +10516,8 @@
 		 *    } );
 		 */
 		"bSortCellsTop": false,
-	
-	
+
+
 		/**
 		 * Enable or disable the addition of the classes `sorting\_1`, `sorting\_2` and
 		 * `sorting\_3` to the columns which are currently being sorted on. This is
@@ -10538,8 +10538,8 @@
 		 *    } );
 		 */
 		"bSortClasses": true,
-	
-	
+
+
 		/**
 		 * Enable or disable state saving. When enabled HTML5 `localStorage` will be
 		 * used to save table display information such as pagination information,
@@ -10563,8 +10563,8 @@
 		 *    } );
 		 */
 		"bStateSave": false,
-	
-	
+
+
 		/**
 		 * This function is called when a TR element is created (and all TD child
 		 * elements have been inserted), or registered if using a DOM source, allowing
@@ -10591,8 +10591,8 @@
 		 *    } );
 		 */
 		"fnCreatedRow": null,
-	
-	
+
+
 		/**
 		 * This function is called on every 'draw' event, and allows you to
 		 * dynamically modify any aspect you want about the created DOM.
@@ -10612,8 +10612,8 @@
 		 *    } );
 		 */
 		"fnDrawCallback": null,
-	
-	
+
+
 		/**
 		 * Identical to fnHeaderCallback() but for the table footer this function
 		 * allows you to modify the table footer on every 'draw' event.
@@ -10640,8 +10640,8 @@
 		 *    } )
 		 */
 		"fnFooterCallback": null,
-	
-	
+
+
 		/**
 		 * When rendering large numbers in the information element for the table
 		 * (i.e. "Showing 1 to 10 of 57 entries") DataTables will render large numbers
@@ -10675,8 +10675,8 @@
 				this.oLanguage.sThousands
 			);
 		},
-	
-	
+
+
 		/**
 		 * This function is called on every 'draw' event, and allows you to
 		 * dynamically modify the header row. This can be used to calculate and
@@ -10704,8 +10704,8 @@
 		 *    } )
 		 */
 		"fnHeaderCallback": null,
-	
-	
+
+
 		/**
 		 * The information element can be used to convey information about the current
 		 * state of the table. Although the internationalisation options presented by
@@ -10734,8 +10734,8 @@
 		 *    } );
 		 */
 		"fnInfoCallback": null,
-	
-	
+
+
 		/**
 		 * Called when the table has been initialised. Normally DataTables will
 		 * initialise sequentially and there will be no need for this function,
@@ -10759,8 +10759,8 @@
 		 *    } )
 		 */
 		"fnInitComplete": null,
-	
-	
+
+
 		/**
 		 * Called at the very start of each table draw and can be used to cancel the
 		 * draw by returning false, any other return (including undefined) results in
@@ -10785,8 +10785,8 @@
 		 *    } );
 		 */
 		"fnPreDrawCallback": null,
-	
-	
+
+
 		/**
 		 * This function allows you to 'post process' each row after it have been
 		 * generated for each table draw, but before it is rendered on screen. This
@@ -10814,8 +10814,8 @@
 		 *    } );
 		 */
 		"fnRowCallback": null,
-	
-	
+
+
 		/**
 		 * __Deprecated__ The functionality provided by this parameter has now been
 		 * superseded by that provided through `ajax`, which should be used instead.
@@ -10840,8 +10840,8 @@
 		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
 		 */
 		"fnServerData": null,
-	
-	
+
+
 		/**
 		 * __Deprecated__ The functionality provided by this parameter has now been
 		 * superseded by that provided through `ajax`, which should be used instead.
@@ -10867,8 +10867,8 @@
 		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
 		 */
 		"fnServerParams": null,
-	
-	
+
+
 		/**
 		 * Load the table state. With this function you can define from where, and how, the
 		 * state of a table is loaded. By default DataTables will load from `localStorage`
@@ -10913,8 +10913,8 @@
 				);
 			} catch (e) {}
 		},
-	
-	
+
+
 		/**
 		 * Callback which allows modification of the saved state prior to loading that state.
 		 * This callback is called when the table is loading state from the stored data, but
@@ -10951,8 +10951,8 @@
 		 *    } );
 		 */
 		"fnStateLoadParams": null,
-	
-	
+
+
 		/**
 		 * Callback that is called when the state has been loaded from the state saving method
 		 * and the DataTables settings object has been modified as a result of the loaded state.
@@ -10975,8 +10975,8 @@
 		 *    } );
 		 */
 		"fnStateLoaded": null,
-	
-	
+
+
 		/**
 		 * Save the table state. This function allows you to define where and how the state
 		 * information for the table is stored By default DataTables will use `localStorage`
@@ -11014,8 +11014,8 @@
 				);
 			} catch (e) {}
 		},
-	
-	
+
+
 		/**
 		 * Callback which allows modification of the state to be saved. Called when the table
 		 * has changed state a new state save is required. This method allows modification of
@@ -11041,8 +11041,8 @@
 		 *    } );
 		 */
 		"fnStateSaveParams": null,
-	
-	
+
+
 		/**
 		 * Duration for which the saved state information is considered valid. After this period
 		 * has elapsed the state will be returned to the default.
@@ -11061,8 +11061,8 @@
 		 *    } )
 		 */
 		"iStateDuration": 7200,
-	
-	
+
+
 		/**
 		 * When enabled DataTables will not make a request to the server for the first
 		 * page draw - rather it will use the data already on the page (no sorting etc
@@ -11105,8 +11105,8 @@
 		 *    } );
 		 */
 		"iDeferLoading": null,
-	
-	
+
+
 		/**
 		 * Number of rows to display on a single page when using pagination. If
 		 * feature enabled (`lengthChange`) then the end user will be able to override
@@ -11125,8 +11125,8 @@
 		 *    } )
 		 */
 		"iDisplayLength": 10,
-	
-	
+
+
 		/**
 		 * Define the starting point for data display when using DataTables with
 		 * pagination. Note that this parameter is the number of records, rather than
@@ -11146,8 +11146,8 @@
 		 *    } )
 		 */
 		"iDisplayStart": 0,
-	
-	
+
+
 		/**
 		 * By default DataTables allows keyboard navigation of the table (sorting, paging,
 		 * and filtering) by adding a `tabindex` attribute to the required elements. This
@@ -11169,8 +11169,8 @@
 		 *    } );
 		 */
 		"iTabIndex": 0,
-	
-	
+
+
 		/**
 		 * Classes that DataTables assigns to the various components and features
 		 * that it adds to the HTML table. This allows classes to be configured
@@ -11180,8 +11180,8 @@
 		 *  @name DataTable.defaults.classes
 		 */
 		"oClasses": {},
-	
-	
+
+
 		/**
 		 * All strings that DataTables uses in the user interface that it creates
 		 * are defined in this object, allowing you to modified them individually or
@@ -11220,7 +11220,7 @@
 				 *    } );
 				 */
 				"sSortAscending": ": activate to sort column ascending",
-	
+
 				/**
 				 * ARIA label that is added to the table headers when the column may be
 				 * sorted descending by activing the column (click or return when focused).
@@ -11244,7 +11244,7 @@
 				 */
 				"sSortDescending": ": activate to sort column descending"
 			},
-	
+
 			/**
 			 * Pagination string used by DataTables for the built-in pagination
 			 * control types.
@@ -11273,8 +11273,8 @@
 				 *    } );
 				 */
 				"sFirst": "First",
-	
-	
+
+
 				/**
 				 * Text to use when using the 'full_numbers' type of pagination for the
 				 * button to take the user to the last page.
@@ -11296,8 +11296,8 @@
 				 *    } );
 				 */
 				"sLast": "Last",
-	
-	
+
+
 				/**
 				 * Text to use for the 'next' pagination button (to take the user to the
 				 * next page).
@@ -11319,8 +11319,8 @@
 				 *    } );
 				 */
 				"sNext": "Next",
-	
-	
+
+
 				/**
 				 * Text to use for the 'previous' pagination button (to take the user to
 				 * the previous page).
@@ -11343,7 +11343,7 @@
 				 */
 				"sPrevious": "Previous"
 			},
-	
+
 			/**
 			 * This string is shown in preference to `zeroRecords` when the table is
 			 * empty of data (regardless of filtering). Note that this is an optional
@@ -11365,8 +11365,8 @@
 			 *    } );
 			 */
 			"sEmptyTable": "No data available in table",
-	
-	
+
+
 			/**
 			 * This string gives information to the end user about the information
 			 * that is current on display on the page. The following tokens can be
@@ -11397,8 +11397,8 @@
 			 *    } );
 			 */
 			"sInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
-	
-	
+
+
 			/**
 			 * Display information string for when the table is empty. Typically the
 			 * format of this string should match `info`.
@@ -11418,8 +11418,8 @@
 			 *    } );
 			 */
 			"sInfoEmpty": "Showing 0 to 0 of 0 entries",
-	
-	
+
+
 			/**
 			 * When a user filters the information in a table, this string is appended
 			 * to the information (`info`) to give an idea of how strong the filtering
@@ -11440,8 +11440,8 @@
 			 *    } );
 			 */
 			"sInfoFiltered": "(filtered from _MAX_ total entries)",
-	
-	
+
+
 			/**
 			 * If can be useful to append extra information to the info string at times,
 			 * and this variable does exactly that. This information will be appended to
@@ -11463,8 +11463,8 @@
 			 *    } );
 			 */
 			"sInfoPostFix": "",
-	
-	
+
+
 			/**
 			 * This decimal place operator is a little different from the other
 			 * language options since DataTables doesn't output floating point
@@ -11478,7 +11478,7 @@
 			 * However, multiple different tables on the page can use different
 			 * decimal place characters.
 			 *  @type string
-			 *  @default 
+			 *  @default
 			 *
 			 *  @dtopt Language
 			 *  @name DataTable.defaults.language.decimal
@@ -11494,8 +11494,8 @@
 			 *    } );
 			 */
 			"sDecimal": "",
-	
-	
+
+
 			/**
 			 * DataTables has a build in number formatter (`formatNumber`) which is
 			 * used to format large numbers that are used in the table information.
@@ -11517,8 +11517,8 @@
 			 *    } );
 			 */
 			"sThousands": ",",
-	
-	
+
+
 			/**
 			 * Detail the action that will be taken when the drop down menu for the
 			 * pagination length option is changed. The '_MENU_' variable is replaced
@@ -11558,8 +11558,8 @@
 			 *    } );
 			 */
 			"sLengthMenu": "Show _MENU_ entries",
-	
-	
+
+
 			/**
 			 * When using Ajax sourced data and during the first draw when DataTables is
 			 * gathering the data, this message is shown in an empty row in the table to
@@ -11582,8 +11582,8 @@
 			 *    } );
 			 */
 			"sLoadingRecords": "Loading...",
-	
-	
+
+
 			/**
 			 * Text which is displayed when the table is processing a user action
 			 * (usually a sort command or similar).
@@ -11603,8 +11603,8 @@
 			 *    } );
 			 */
 			"sProcessing": "Processing...",
-	
-	
+
+
 			/**
 			 * Details the actions that will be taken when the user types into the
 			 * filtering input text box. The variable "_INPUT_", if used in the string,
@@ -11638,19 +11638,19 @@
 			 *    } );
 			 */
 			"sSearch": "Search:",
-	
-	
+
+
 			/**
 			 * Assign a `placeholder` attribute to the search `input` element
 			 *  @type string
-			 *  @default 
+			 *  @default
 			 *
 			 *  @dtopt Language
 			 *  @name DataTable.defaults.language.searchPlaceholder
 			 */
 			"sSearchPlaceholder": "",
-	
-	
+
+
 			/**
 			 * All of the language information can be stored in a file on the
 			 * server-side, which DataTables will look up if this parameter is passed.
@@ -11674,8 +11674,8 @@
 			 *    } );
 			 */
 			"sUrl": "",
-	
-	
+
+
 			/**
 			 * Text shown inside the table records when the is no information to be
 			 * displayed after filtering. `emptyTable` is shown when there is simply no
@@ -11697,8 +11697,8 @@
 			 */
 			"sZeroRecords": "No matching records found"
 		},
-	
-	
+
+
 		/**
 		 * This parameter allows you to have define the global filtering state at
 		 * initialisation time. As an object the `search` parameter must be
@@ -11721,8 +11721,8 @@
 		 *    } )
 		 */
 		"oSearch": $.extend( {}, DataTable.models.oSearch ),
-	
-	
+
+
 		/**
 		 * __Deprecated__ The functionality provided by this parameter has now been
 		 * superseded by that provided through `ajax`, which should be used instead.
@@ -11742,8 +11742,8 @@
 		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
 		 */
 		"sAjaxDataProp": "data",
-	
-	
+
+
 		/**
 		 * __Deprecated__ The functionality provided by this parameter has now been
 		 * superseded by that provided through `ajax`, which should be used instead.
@@ -11761,8 +11761,8 @@
 		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
 		 */
 		"sAjaxSource": null,
-	
-	
+
+
 		/**
 		 * This initialisation variable allows you to specify exactly where in the
 		 * DOM you want DataTables to inject the various controls it adds to the page
@@ -11815,8 +11815,8 @@
 		 *    } );
 		 */
 		"sDom": "lfrtip",
-	
-	
+
+
 		/**
 		 * Search delay option. This will throttle full table searches that use the
 		 * DataTables provided search input element (it does not effect calls to
@@ -11835,8 +11835,8 @@
 		 *    } )
 		 */
 		"searchDelay": null,
-	
-	
+
+
 		/**
 		 * DataTables features four different built-in options for the buttons to
 		 * display for pagination control:
@@ -11846,7 +11846,7 @@
 		 * * `full` - 'First', 'Previous', 'Next' and 'Last' buttons
 		 * * `full_numbers` - 'First', 'Previous', 'Next' and 'Last' buttons, plus
 		 *   page numbers
-		 *  
+		 *
 		 * Further methods can be added using {@link DataTable.ext.oPagination}.
 		 *  @type string
 		 *  @default simple_numbers
@@ -11862,8 +11862,8 @@
 		 *    } )
 		 */
 		"sPaginationType": "simple_numbers",
-	
-	
+
+
 		/**
 		 * Enable horizontal scrolling. When a table is too wide to fit into a
 		 * certain layout, or you have a large number of columns in the table, you
@@ -11887,8 +11887,8 @@
 		 *    } );
 		 */
 		"sScrollX": "",
-	
-	
+
+
 		/**
 		 * This property can be used to force a DataTable to use more width than it
 		 * might otherwise do when x-scrolling is enabled. For example if you have a
@@ -11911,8 +11911,8 @@
 		 *    } );
 		 */
 		"sScrollXInner": "",
-	
-	
+
+
 		/**
 		 * Enable vertical scrolling. Vertical scrolling will constrain the DataTable
 		 * to the given height, and enable scrolling for any data which overflows the
@@ -11935,8 +11935,8 @@
 		 *    } );
 		 */
 		"sScrollY": "",
-	
-	
+
+
 		/**
 		 * __Deprecated__ The functionality provided by this parameter has now been
 		 * superseded by that provided through `ajax`, which should be used instead.
@@ -11953,8 +11953,8 @@
 		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
 		 */
 		"sServerMethod": "GET",
-	
-	
+
+
 		/**
 		 * DataTables makes use of renderers when displaying HTML elements for
 		 * a table. These renderers can be added or modified by plug-ins to
@@ -11971,8 +11971,8 @@
 		 *
 		 */
 		"renderer": null,
-	
-	
+
+
 		/**
 		 * Set the data property name that DataTables should use to get a row's id
 		 * to set as the `id` property in the node.
@@ -11983,16 +11983,16 @@
 		 */
 		"rowId": "DT_RowId"
 	};
-	
+
 	_fnHungarianMap( DataTable.defaults );
-	
-	
-	
+
+
+
 	/*
 	 * Developer note - See note in model.defaults.js about the use of Hungarian
 	 * notation and camel case.
 	 */
-	
+
 	/**
 	 * Column options that can be given to DataTables at initialisation time.
 	 *  @namespace
@@ -12038,8 +12038,8 @@
 		 */
 		"aDataSort": null,
 		"iDataSort": -1,
-	
-	
+
+
 		/**
 		 * You can control the default ordering direction, and even alter the
 		 * behaviour of the sort handler (i.e. only allow ascending ordering etc)
@@ -12077,8 +12077,8 @@
 		 *    } );
 		 */
 		"asSorting": [ 'asc', 'desc' ],
-	
-	
+
+
 		/**
 		 * Enable or disable filtering on the data in this column.
 		 *  @type boolean
@@ -12110,8 +12110,8 @@
 		 *    } );
 		 */
 		"bSearchable": true,
-	
-	
+
+
 		/**
 		 * Enable or disable ordering on this column.
 		 *  @type boolean
@@ -12143,8 +12143,8 @@
 		 *    } );
 		 */
 		"bSortable": true,
-	
-	
+
+
 		/**
 		 * Enable or disable the display of this column.
 		 *  @type boolean
@@ -12176,8 +12176,8 @@
 		 *    } );
 		 */
 		"bVisible": true,
-	
-	
+
+
 		/**
 		 * Developer definable function that is called whenever a cell is created (Ajax source,
 		 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
@@ -12208,8 +12208,8 @@
 		 *    } );
 		 */
 		"fnCreatedCell": null,
-	
-	
+
+
 		/**
 		 * This parameter has been replaced by `data` in DataTables to ensure naming
 		 * consistency. `dataProp` can still be used, as there is backwards
@@ -12217,8 +12217,8 @@
 		 * recommended that you use `data` in preference to `dataProp`.
 		 *  @name DataTable.defaults.column.dataProp
 		 */
-	
-	
+
+
 		/**
 		 * This property can be used to read data from any data source property,
 		 * including deeply nested objects / properties. `data` can be given in a
@@ -12389,8 +12389,8 @@
 		 *
 		 */
 		"mData": null,
-	
-	
+
+
 		/**
 		 * This property is the rendering partner to `data` and it is suggested that
 		 * when you want to manipulate data for display (including filtering,
@@ -12511,8 +12511,8 @@
 		 *    } );
 		 */
 		"mRender": null,
-	
-	
+
+
 		/**
 		 * Change the cell type created for the column - either TD cells or TH cells. This
 		 * can be useful as TH cells have semantic meaning in the table body, allowing them
@@ -12535,8 +12535,8 @@
 		 *    } );
 		 */
 		"sCellType": "td",
-	
-	
+
+
 		/**
 		 * Class to give to each cell in this column.
 		 *  @type string
@@ -12570,7 +12570,7 @@
 		 *    } );
 		 */
 		"sClass": "",
-	
+
 		/**
 		 * When DataTables calculates the column widths to assign to each column,
 		 * it finds the longest string in each column and then constructs a
@@ -12603,8 +12603,8 @@
 		 *    } );
 		 */
 		"sContentPadding": "",
-	
-	
+
+
 		/**
 		 * Allows a default value to be given for a column's data, and will be used
 		 * whenever a null data source is encountered (this can be because `data`
@@ -12646,8 +12646,8 @@
 		 *    } );
 		 */
 		"sDefaultContent": null,
-	
-	
+
+
 		/**
 		 * This parameter is only used in DataTables' server-side processing. It can
 		 * be exceptionally useful to know what columns are being displayed on the
@@ -12690,8 +12690,8 @@
 		 *    } );
 		 */
 		"sName": "",
-	
-	
+
+
 		/**
 		 * Defines a data source type for the ordering which can be used to read
 		 * real-time information from the table (updating the internally cached
@@ -12732,8 +12732,8 @@
 		 *    } );
 		 */
 		"sSortDataType": "std",
-	
-	
+
+
 		/**
 		 * The title of this column.
 		 *  @type string
@@ -12768,8 +12768,8 @@
 		 *    } );
 		 */
 		"sTitle": null,
-	
-	
+
+
 		/**
 		 * The type allows you to specify how the data for this column will be
 		 * ordered. Four types (string, numeric, date and html (which will strip
@@ -12809,8 +12809,8 @@
 		 *    } );
 		 */
 		"sType": null,
-	
-	
+
+
 		/**
 		 * Defining the width of the column, this parameter may take any CSS value
 		 * (3em, 20px etc). DataTables applies 'smart' widths to columns which have not
@@ -12848,11 +12848,11 @@
 		 */
 		"sWidth": null
 	};
-	
+
 	_fnHungarianMap( DataTable.defaults.column );
-	
-	
-	
+
+
+
 	/**
 	 * DataTables settings object - this holds all the information needed for a
 	 * given table, including configuration, data and current application of the
@@ -12881,7 +12881,7 @@
 		 *  @namespace
 		 */
 		"oFeatures": {
-	
+
 			/**
 			 * Flag to say if DataTables should automatically try to calculate the
 			 * optimum table and columns widths (true) or not (false).
@@ -12890,7 +12890,7 @@
 			 *  @type boolean
 			 */
 			"bAutoWidth": null,
-	
+
 			/**
 			 * Delay the creation of TR and TD elements until they are actually
 			 * needed by a driven page draw. This can give a significant speed
@@ -12901,7 +12901,7 @@
 			 *  @type boolean
 			 */
 			"bDeferRender": null,
-	
+
 			/**
 			 * Enable filtering on the table or not. Note that if this is disabled
 			 * then there is no filtering at all on the table, including fnFilter.
@@ -12911,7 +12911,7 @@
 			 *  @type boolean
 			 */
 			"bFilter": null,
-	
+
 			/**
 			 * Table information element (the 'Showing x of y records' div) enable
 			 * flag.
@@ -12920,7 +12920,7 @@
 			 *  @type boolean
 			 */
 			"bInfo": null,
-	
+
 			/**
 			 * Present a user control allowing the end user to change the page size
 			 * when pagination is enabled.
@@ -12929,7 +12929,7 @@
 			 *  @type boolean
 			 */
 			"bLengthChange": null,
-	
+
 			/**
 			 * Pagination enabled or not. Note that if this is disabled then length
 			 * changing must also be disabled.
@@ -12938,7 +12938,7 @@
 			 *  @type boolean
 			 */
 			"bPaginate": null,
-	
+
 			/**
 			 * Processing indicator enable flag whenever DataTables is enacting a
 			 * user request - typically an Ajax request for server-side processing.
@@ -12947,7 +12947,7 @@
 			 *  @type boolean
 			 */
 			"bProcessing": null,
-	
+
 			/**
 			 * Server-side processing enabled flag - when enabled DataTables will
 			 * get all data from the server for every draw - there is no filtering,
@@ -12957,7 +12957,7 @@
 			 *  @type boolean
 			 */
 			"bServerSide": null,
-	
+
 			/**
 			 * Sorting enablement flag.
 			 * Note that this parameter will be set by the initialisation routine. To
@@ -12965,7 +12965,7 @@
 			 *  @type boolean
 			 */
 			"bSort": null,
-	
+
 			/**
 			 * Multi-column sorting
 			 * Note that this parameter will be set by the initialisation routine. To
@@ -12973,7 +12973,7 @@
 			 *  @type boolean
 			 */
 			"bSortMulti": null,
-	
+
 			/**
 			 * Apply a class to the columns which are being sorted to provide a
 			 * visual highlight or not. This can slow things down when enabled since
@@ -12983,7 +12983,7 @@
 			 *  @type boolean
 			 */
 			"bSortClasses": null,
-	
+
 			/**
 			 * State saving enablement flag.
 			 * Note that this parameter will be set by the initialisation routine. To
@@ -12992,8 +12992,8 @@
 			 */
 			"bStateSave": null
 		},
-	
-	
+
+
 		/**
 		 * Scrolling settings for a table.
 		 *  @namespace
@@ -13007,7 +13007,7 @@
 			 *  @type boolean
 			 */
 			"bCollapse": null,
-	
+
 			/**
 			 * Width of the scrollbar for the web-browser's platform. Calculated
 			 * during table initialisation.
@@ -13015,7 +13015,7 @@
 			 *  @default 0
 			 */
 			"iBarWidth": 0,
-	
+
 			/**
 			 * Viewport width for horizontal scrolling. Horizontal scrolling is
 			 * disabled if an empty string.
@@ -13024,7 +13024,7 @@
 			 *  @type string
 			 */
 			"sX": null,
-	
+
 			/**
 			 * Width to expand the table to when using x-scrolling. Typically you
 			 * should not need to use this.
@@ -13034,7 +13034,7 @@
 			 *  @deprecated
 			 */
 			"sXInner": null,
-	
+
 			/**
 			 * Viewport height for vertical scrolling. Vertical scrolling is disabled
 			 * if an empty string.
@@ -13044,7 +13044,7 @@
 			 */
 			"sY": null
 		},
-	
+
 		/**
 		 * Language information for the table.
 		 *  @namespace
@@ -13059,7 +13059,7 @@
 			 */
 			"fnInfoCallback": null
 		},
-	
+
 		/**
 		 * Browser support parameters
 		 *  @namespace
@@ -13072,7 +13072,7 @@
 			 *  @default false
 			 */
 			"bScrollOversize": false,
-	
+
 			/**
 			 * Determine if the vertical scrollbar is on the right or left of the
 			 * scrolling container - needed for rtl language layout, although not
@@ -13081,14 +13081,14 @@
 			 *  @default false
 			 */
 			"bScrollbarLeft": false,
-	
+
 			/**
 			 * Flag for if `getBoundingClientRect` is fully supported or not
 			 *  @type boolean
 			 *  @default false
 			 */
 			"bBounding": false,
-	
+
 			/**
 			 * Browser scrollbar width
 			 *  @type integer
@@ -13096,11 +13096,11 @@
 			 */
 			"barWidth": 0
 		},
-	
-	
+
+
 		"ajax": null,
-	
-	
+
+
 		/**
 		 * Array referencing the nodes which are used for the features. The
 		 * parameters of this object match what is allowed by sDom - i.e.
@@ -13116,7 +13116,7 @@
 		 *  @default []
 		 */
 		"aanFeatures": [],
-	
+
 		/**
 		 * Store data information - see {@link DataTable.models.oRow} for detailed
 		 * information.
@@ -13124,49 +13124,49 @@
 		 *  @default []
 		 */
 		"aoData": [],
-	
+
 		/**
 		 * Array of indexes which are in the current display (after filtering etc)
 		 *  @type array
 		 *  @default []
 		 */
 		"aiDisplay": [],
-	
+
 		/**
 		 * Array of indexes for display - no filtering
 		 *  @type array
 		 *  @default []
 		 */
 		"aiDisplayMaster": [],
-	
+
 		/**
 		 * Map of row ids to data indexes
 		 *  @type object
 		 *  @default {}
 		 */
 		"aIds": {},
-	
+
 		/**
 		 * Store information about each column that is in use
 		 *  @type array
 		 *  @default []
 		 */
 		"aoColumns": [],
-	
+
 		/**
 		 * Store information about the table's header
 		 *  @type array
 		 *  @default []
 		 */
 		"aoHeader": [],
-	
+
 		/**
 		 * Store information about the table's footer
 		 *  @type array
 		 *  @default []
 		 */
 		"aoFooter": [],
-	
+
 		/**
 		 * Store the applied global search information in case we want to force a
 		 * research or compare the old search to a new one.
@@ -13176,7 +13176,7 @@
 		 *  @extends DataTable.models.oSearch
 		 */
 		"oPreviousSearch": {},
-	
+
 		/**
 		 * Store the applied search for each column - see
 		 * {@link DataTable.models.oSearch} for the format that is used for the
@@ -13185,7 +13185,7 @@
 		 *  @default []
 		 */
 		"aoPreSearchCols": [],
-	
+
 		/**
 		 * Sorting that is applied to the table. Note that the inner arrays are
 		 * used in the following manner:
@@ -13199,7 +13199,7 @@
 		 *  @todo These inner arrays should really be objects
 		 */
 		"aaSorting": null,
-	
+
 		/**
 		 * Sorting that is always applied to the table (i.e. prefixed in front of
 		 * aaSorting).
@@ -13209,7 +13209,7 @@
 		 *  @default []
 		 */
 		"aaSortingFixed": [],
-	
+
 		/**
 		 * Classes to use for the striping of a table.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13218,56 +13218,56 @@
 		 *  @default []
 		 */
 		"asStripeClasses": null,
-	
+
 		/**
 		 * If restoring a table - we should restore its striping classes as well
 		 *  @type array
 		 *  @default []
 		 */
 		"asDestroyStripes": [],
-	
+
 		/**
 		 * If restoring a table - we should restore its width
 		 *  @type int
 		 *  @default 0
 		 */
 		"sDestroyWidth": 0,
-	
+
 		/**
 		 * Callback functions array for every time a row is inserted (i.e. on a draw).
 		 *  @type array
 		 *  @default []
 		 */
 		"aoRowCallback": [],
-	
+
 		/**
 		 * Callback functions for the header on each draw.
 		 *  @type array
 		 *  @default []
 		 */
 		"aoHeaderCallback": [],
-	
+
 		/**
 		 * Callback function for the footer on each draw.
 		 *  @type array
 		 *  @default []
 		 */
 		"aoFooterCallback": [],
-	
+
 		/**
 		 * Array of callback functions for draw callback functions
 		 *  @type array
 		 *  @default []
 		 */
 		"aoDrawCallback": [],
-	
+
 		/**
 		 * Array of callback functions for row created function
 		 *  @type array
 		 *  @default []
 		 */
 		"aoRowCreatedCallback": [],
-	
+
 		/**
 		 * Callback functions for just before the table is redrawn. A return of
 		 * false will be used to cancel the draw.
@@ -13275,15 +13275,15 @@
 		 *  @default []
 		 */
 		"aoPreDrawCallback": [],
-	
+
 		/**
 		 * Callback functions for when the table has been initialised.
 		 *  @type array
 		 *  @default []
 		 */
 		"aoInitComplete": [],
-	
-	
+
+
 		/**
 		 * Callbacks for modifying the settings to be stored for state saving, prior to
 		 * saving state.
@@ -13291,7 +13291,7 @@
 		 *  @default []
 		 */
 		"aoStateSaveParams": [],
-	
+
 		/**
 		 * Callbacks for modifying the settings that have been stored for state saving
 		 * prior to using the stored values to restore the state.
@@ -13299,7 +13299,7 @@
 		 *  @default []
 		 */
 		"aoStateLoadParams": [],
-	
+
 		/**
 		 * Callbacks for operating on the settings object once the saved state has been
 		 * loaded
@@ -13307,49 +13307,49 @@
 		 *  @default []
 		 */
 		"aoStateLoaded": [],
-	
+
 		/**
 		 * Cache the table ID for quick access
 		 *  @type string
 		 *  @default <i>Empty string</i>
 		 */
 		"sTableId": "",
-	
+
 		/**
 		 * The TABLE node for the main table
 		 *  @type node
 		 *  @default null
 		 */
 		"nTable": null,
-	
+
 		/**
 		 * Permanent ref to the thead element
 		 *  @type node
 		 *  @default null
 		 */
 		"nTHead": null,
-	
+
 		/**
 		 * Permanent ref to the tfoot element - if it exists
 		 *  @type node
 		 *  @default null
 		 */
 		"nTFoot": null,
-	
+
 		/**
 		 * Permanent ref to the tbody element
 		 *  @type node
 		 *  @default null
 		 */
 		"nTBody": null,
-	
+
 		/**
 		 * Cache the wrapper node (contains all DataTables controlled elements)
 		 *  @type node
 		 *  @default null
 		 */
 		"nTableWrapper": null,
-	
+
 		/**
 		 * Indicate if when using server-side processing the loading of data
 		 * should be deferred until the second draw.
@@ -13359,14 +13359,14 @@
 		 *  @default false
 		 */
 		"bDeferLoading": false,
-	
+
 		/**
 		 * Indicate if all required information has been read in
 		 *  @type boolean
 		 *  @default false
 		 */
 		"bInitialised": false,
-	
+
 		/**
 		 * Information about open rows. Each object in the array has the parameters
 		 * 'nTr' and 'nParent'
@@ -13374,7 +13374,7 @@
 		 *  @default []
 		 */
 		"aoOpenRows": [],
-	
+
 		/**
 		 * Dictate the positioning of DataTables' control elements - see
 		 * {@link DataTable.model.oInit.sDom}.
@@ -13384,14 +13384,14 @@
 		 *  @default null
 		 */
 		"sDom": null,
-	
+
 		/**
 		 * Search delay (in mS)
 		 *  @type integer
 		 *  @default null
 		 */
 		"searchDelay": null,
-	
+
 		/**
 		 * Which type of pagination should be used.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13400,7 +13400,7 @@
 		 *  @default two_button
 		 */
 		"sPaginationType": "two_button",
-	
+
 		/**
 		 * The state duration (for `stateSave`) in seconds.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13409,7 +13409,7 @@
 		 *  @default 0
 		 */
 		"iStateDuration": 0,
-	
+
 		/**
 		 * Array of callback functions for state saving. Each array element is an
 		 * object with the following parameters:
@@ -13424,7 +13424,7 @@
 		 *  @default []
 		 */
 		"aoStateSave": [],
-	
+
 		/**
 		 * Array of callback functions for state loading. Each array element is an
 		 * object with the following parameters:
@@ -13437,21 +13437,21 @@
 		 *  @default []
 		 */
 		"aoStateLoad": [],
-	
+
 		/**
 		 * State that was saved. Useful for back reference
 		 *  @type object
 		 *  @default null
 		 */
 		"oSavedState": null,
-	
+
 		/**
 		 * State that was loaded. Useful for back reference
 		 *  @type object
 		 *  @default null
 		 */
 		"oLoadedState": null,
-	
+
 		/**
 		 * Source url for AJAX data for the table.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13460,7 +13460,7 @@
 		 *  @default null
 		 */
 		"sAjaxSource": null,
-	
+
 		/**
 		 * Property from a given object from which to read the table data from. This
 		 * can be an empty string (when not server-side processing), in which case
@@ -13470,14 +13470,14 @@
 		 *  @type string
 		 */
 		"sAjaxDataProp": null,
-	
+
 		/**
 		 * Note if draw should be blocked while getting data
 		 *  @type boolean
 		 *  @default true
 		 */
 		"bAjaxDataGet": true,
-	
+
 		/**
 		 * The last jQuery XHR object that was used for server-side data gathering.
 		 * This can be used for working with the XHR information in one of the
@@ -13486,21 +13486,21 @@
 		 *  @default null
 		 */
 		"jqXHR": null,
-	
+
 		/**
 		 * JSON returned from the server in the last Ajax request
 		 *  @type object
 		 *  @default undefined
 		 */
 		"json": undefined,
-	
+
 		/**
 		 * Data submitted as part of the last Ajax request
 		 *  @type object
 		 *  @default undefined
 		 */
 		"oAjaxData": undefined,
-	
+
 		/**
 		 * Function to get the server-side data.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13508,7 +13508,7 @@
 		 *  @type function
 		 */
 		"fnServerData": null,
-	
+
 		/**
 		 * Functions which are called prior to sending an Ajax request so extra
 		 * parameters can easily be sent to the server
@@ -13516,7 +13516,7 @@
 		 *  @default []
 		 */
 		"aoServerParams": [],
-	
+
 		/**
 		 * Send the XHR HTTP method - GET or POST (could be PUT or DELETE if
 		 * required).
@@ -13525,7 +13525,7 @@
 		 *  @type string
 		 */
 		"sServerMethod": null,
-	
+
 		/**
 		 * Format numbers for display.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13533,7 +13533,7 @@
 		 *  @type function
 		 */
 		"fnFormatNumber": null,
-	
+
 		/**
 		 * List of options that can be used for the user selectable length menu.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13542,7 +13542,7 @@
 		 *  @default []
 		 */
 		"aLengthMenu": null,
-	
+
 		/**
 		 * Counter for the draws that the table does. Also used as a tracker for
 		 * server-side processing
@@ -13550,35 +13550,35 @@
 		 *  @default 0
 		 */
 		"iDraw": 0,
-	
+
 		/**
 		 * Indicate if a redraw is being done - useful for Ajax
 		 *  @type boolean
 		 *  @default false
 		 */
 		"bDrawing": false,
-	
+
 		/**
 		 * Draw index (iDraw) of the last error when parsing the returned data
 		 *  @type int
 		 *  @default -1
 		 */
 		"iDrawError": -1,
-	
+
 		/**
 		 * Paging display length
 		 *  @type int
 		 *  @default 10
 		 */
 		"_iDisplayLength": 10,
-	
+
 		/**
 		 * Paging start point - aiDisplay index
 		 *  @type int
 		 *  @default 0
 		 */
 		"_iDisplayStart": 0,
-	
+
 		/**
 		 * Server-side processing - number of records in the result set
 		 * (i.e. before filtering), Use fnRecordsTotal rather than
@@ -13589,7 +13589,7 @@
 		 *  @private
 		 */
 		"_iRecordsTotal": 0,
-	
+
 		/**
 		 * Server-side processing - number of records in the current display set
 		 * (i.e. after filtering). Use fnRecordsDisplay rather than
@@ -13600,7 +13600,7 @@
 		 *  @private
 		 */
 		"_iRecordsDisplay": 0,
-	
+
 		/**
 		 * Flag to indicate if jQuery UI marking and classes should be used.
 		 * Note that this parameter will be set by the initialisation routine. To
@@ -13608,14 +13608,14 @@
 		 *  @type boolean
 		 */
 		"bJUI": null,
-	
+
 		/**
 		 * The classes to use for the table
 		 *  @type object
 		 *  @default {}
 		 */
 		"oClasses": {},
-	
+
 		/**
 		 * Flag attached to the settings object so you can check in the draw
 		 * callback if filtering has been done in the draw. Deprecated in favour of
@@ -13625,7 +13625,7 @@
 		 *  @deprecated
 		 */
 		"bFiltered": false,
-	
+
 		/**
 		 * Flag attached to the settings object so you can check in the draw
 		 * callback if sorting has been done in the draw. Deprecated in favour of
@@ -13635,7 +13635,7 @@
 		 *  @deprecated
 		 */
 		"bSorted": false,
-	
+
 		/**
 		 * Indicate that if multiple rows are in the header and there is more than
 		 * one unique cell per column, if the top one (true) or bottom one (false)
@@ -13645,14 +13645,14 @@
 		 *  @type boolean
 		 */
 		"bSortCellsTop": null,
-	
+
 		/**
 		 * Initialisation object that is used for the table
 		 *  @type object
 		 *  @default null
 		 */
 		"oInit": null,
-	
+
 		/**
 		 * Destroy callback functions - for plug-ins to attach themselves to the
 		 * destroy so they can clean up markup and events.
@@ -13660,8 +13660,8 @@
 		 *  @default []
 		 */
 		"aoDestroyCallback": [],
-	
-	
+
+
 		/**
 		 * Get the number of records in the current record set, before filtering
 		 *  @type function
@@ -13672,7 +13672,7 @@
 				this._iRecordsTotal * 1 :
 				this.aiDisplayMaster.length;
 		},
-	
+
 		/**
 		 * Get the number of records in the current record set, after filtering
 		 *  @type function
@@ -13683,7 +13683,7 @@
 				this._iRecordsDisplay * 1 :
 				this.aiDisplay.length;
 		},
-	
+
 		/**
 		 * Get the display end point - aiDisplay index
 		 *  @type function
@@ -13697,7 +13697,7 @@
 				records  = this.aiDisplay.length,
 				features = this.oFeatures,
 				paginate = features.bPaginate;
-	
+
 			if ( features.bServerSide ) {
 				return paginate === false || len === -1 ?
 					start + records :
@@ -13709,14 +13709,14 @@
 					calc;
 			}
 		},
-	
+
 		/**
 		 * The DataTables object for this table
 		 *  @type object
 		 *  @default null
 		 */
 		"oInstance": null,
-	
+
 		/**
 		 * Unique identifier for each instance of the DataTables object. If there
 		 * is an ID on the table node, then it takes that value, otherwise an
@@ -13725,44 +13725,44 @@
 		 *  @default null
 		 */
 		"sInstance": null,
-	
+
 		/**
 		 * tabindex attribute value that is added to DataTables control elements, allowing
 		 * keyboard navigation of the table and its controls.
 		 */
 		"iTabIndex": 0,
-	
+
 		/**
 		 * DIV container for the footer scrolling table if scrolling
 		 */
 		"nScrollHead": null,
-	
+
 		/**
 		 * DIV container for the footer scrolling table if scrolling
 		 */
 		"nScrollFoot": null,
-	
+
 		/**
 		 * Last applied sort
 		 *  @type array
 		 *  @default []
 		 */
 		"aLastSort": [],
-	
+
 		/**
 		 * Stored plug-in instances
 		 *  @type object
 		 *  @default {}
 		 */
 		"oPlugins": {},
-	
+
 		/**
 		 * Function used to get a row's id from the row's data
 		 *  @type function
 		 *  @default null
 		 */
 		"rowIdFn": null,
-	
+
 		/**
 		 * Data location where to store a row's id
 		 *  @type string
@@ -13781,11 +13781,11 @@
 	 *  @namespace
 	 *  @extends DataTable.models.ext
 	 */
-	
-	
+
+
 	/**
 	 * DataTables extensions
-	 * 
+	 *
 	 * This namespace acts as a collection area for plug-ins that can be used to
 	 * extend DataTables capabilities. Indeed many of the build in methods
 	 * use this method to provide their own capabilities (sorting methods for
@@ -13806,8 +13806,8 @@
 		 *  @default {}
 		 */
 		buttons: {},
-	
-	
+
+
 		/**
 		 * Element class names
 		 *
@@ -13815,19 +13815,19 @@
 		 *  @default {}
 		 */
 		classes: {},
-	
-	
+
+
 		/**
 		 * DataTables build type (expanded by the download builder)
 		 *
 		 *  @type string
 		 */
 		builder: "-source-",
-	
-	
+
+
 		/**
 		 * Error reporting.
-		 * 
+		 *
 		 * How should DataTables report an error. Can take the value 'alert',
 		 * 'throw', 'none' or a function.
 		 *
@@ -13835,18 +13835,18 @@
 		 *  @default alert
 		 */
 		errMode: "alert",
-	
-	
+
+
 		/**
 		 * Feature plug-ins.
-		 * 
+		 *
 		 * This is an array of objects which describe the feature plug-ins that are
 		 * available to DataTables. These feature plug-ins are then available for
 		 * use through the `dom` initialisation option.
-		 * 
+		 *
 		 * Each feature plug-in is described by an object which must have the
 		 * following properties:
-		 * 
+		 *
 		 * * `fnInit` - function that is used to initialise the plug-in,
 		 * * `cFeature` - a character so the feature can be enabled by the `dom`
 		 *   instillation option. This is case sensitive.
@@ -13857,7 +13857,7 @@
 		 *    {@link DataTable.models.oSettings}
 		 *
 		 * And the following return is expected:
-		 * 
+		 *
 		 * * {node|null} The element which contains your feature. Note that the
 		 *   return may also be void if your plug-in does not require to inject any
 		 *   DOM elements into DataTables control (`dom`) - for example this might
@@ -13875,11 +13875,11 @@
 		 *    } );
 		 */
 		feature: [],
-	
-	
+
+
 		/**
 		 * Row searching.
-		 * 
+		 *
 		 * This method of searching is complimentary to the default type based
 		 * searching, and a lot more comprehensive as it allows you complete control
 		 * over the searching logic. Each element in this array is a function
@@ -13936,8 +13936,8 @@
 		 *    );
 		 */
 		search: [],
-	
-	
+
+
 		/**
 		 * Selector extensions
 		 *
@@ -13967,11 +13967,11 @@
 			column: [],
 			row: []
 		},
-	
-	
+
+
 		/**
 		 * Internal functions, exposed for used in plug-ins.
-		 * 
+		 *
 		 * Please note that you should not need to use the internal methods for
 		 * anything other than a plug-in (and even then, try to avoid if possible).
 		 * The internal function may change between releases.
@@ -13980,8 +13980,8 @@
 		 *  @default {}
 		 */
 		internal: {},
-	
-	
+
+
 		/**
 		 * Legacy configuration options. Enable and disable legacy options that
 		 * are available in DataTables.
@@ -13998,11 +13998,11 @@
 			 */
 			ajax: null
 		},
-	
-	
+
+
 		/**
 		 * Pagination plug-in methods.
-		 * 
+		 *
 		 * Each entry in this object is a function and defines which buttons should
 		 * be shown by the pagination rendering method that is used for the table:
 		 * {@link DataTable.ext.renderer.pageButton}. The renderer addresses how the
@@ -14046,26 +14046,26 @@
 		 *    };
 		 */
 		pager: {},
-	
-	
+
+
 		renderer: {
 			pageButton: {},
 			header: {}
 		},
-	
-	
+
+
 		/**
 		 * Ordering plug-ins - custom data source
-		 * 
+		 *
 		 * The extension options for ordering of data available here is complimentary
 		 * to the default type based ordering that DataTables typically uses. It
 		 * allows much greater control over the the data that is being used to
 		 * order a column, but is necessarily therefore more complex.
-		 * 
+		 *
 		 * This type of ordering is useful if you want to do ordering based on data
 		 * live from the DOM (for example the contents of an 'input' element) rather
 		 * than just the static string that DataTables knows of.
-		 * 
+		 *
 		 * The way these plug-ins work is that you create an array of the values you
 		 * wish to be ordering for the column in question and then return that
 		 * array. The data in the array much be in the index order of the rows in
@@ -14095,8 +14095,8 @@
 		 *    }
 		 */
 		order: {},
-	
-	
+
+
 		/**
 		 * Type based plug-ins.
 		 *
@@ -14149,8 +14149,8 @@
 			 *    );
 			 */
 			detect: [],
-	
-	
+
+
 			/**
 			 * Type based search formatting.
 			 *
@@ -14160,7 +14160,7 @@
 			 *
 			 * Note that is a search is not defined for a column of a given type,
 			 * no search formatting will be performed.
-			 * 
+			 *
 			 * Pre-processing of searching data plug-ins - When you assign the sType
 			 * for a column (or have it automatically detected for you by DataTables
 			 * or a type detection plug-in), you will typically be using this for
@@ -14188,8 +14188,8 @@
 			 *    }
 			 */
 			search: {},
-	
-	
+
+
 			/**
 			 * Type based ordering.
 			 *
@@ -14230,7 +14230,7 @@
 			 *   than the second parameter, ===0 if the two parameters are equal and
 			 *   >0 if the first parameter should be sorted height than the second
 			 *   parameter.
-			 * 
+			 *
 			 *  @type object
 			 *  @default {}
 			 *
@@ -14256,7 +14256,7 @@
 			 */
 			order: {}
 		},
-	
+
 		/**
 		 * Unique DataTables instance counter
 		 *
@@ -14264,39 +14264,39 @@
 		 * @private
 		 */
 		_unique: 0,
-	
-	
+
+
 		//
 		// Depreciated
 		// The following properties are retained for backwards compatiblity only.
 		// The should not be used in new projects and will be removed in a future
 		// version
 		//
-	
+
 		/**
 		 * Version check function.
 		 *  @type function
 		 *  @depreciated Since 1.10
 		 */
 		fnVersionCheck: DataTable.fnVersionCheck,
-	
-	
+
+
 		/**
 		 * Index for what 'this' index API functions should use
 		 *  @type int
 		 *  @deprecated Since v1.10
 		 */
 		iApiIndex: 0,
-	
-	
+
+
 		/**
 		 * jQuery UI class container
 		 *  @type object
 		 *  @deprecated Since v1.10
 		 */
 		oJUIClasses: {},
-	
-	
+
+
 		/**
 		 * Software version
 		 *  @type string
@@ -14304,8 +14304,8 @@
 		 */
 		sVersion: DataTable.version
 	};
-	
-	
+
+
 	//
 	// Backwards compatibility. Alias to pre 1.10 Hungarian notation counter parts
 	//
@@ -14320,24 +14320,24 @@
 		oStdClasses:  _ext.classes,
 		oPagination:  _ext.pager
 	} );
-	
-	
+
+
 	$.extend( DataTable.ext.classes, {
 		"sTable": "dataTable",
 		"sNoFooter": "no-footer",
-	
+
 		/* Paging buttons */
 		"sPageButton": "paginate_button",
 		"sPageButtonActive": "current",
 		"sPageButtonDisabled": "disabled",
-	
+
 		/* Striping classes */
 		"sStripeOdd": "odd",
 		"sStripeEven": "even",
-	
+
 		/* Empty row */
 		"sRowEmpty": "dataTables_empty",
-	
+
 		/* Features */
 		"sWrapper": "dataTables_wrapper",
 		"sFilter": "dataTables_filter",
@@ -14345,7 +14345,7 @@
 		"sPaging": "dataTables_paginate paging_", /* Note that the type is postfixed */
 		"sLength": "dataTables_length",
 		"sProcessing": "dataTables_processing",
-	
+
 		/* Sorting */
 		"sSortAsc": "sorting_asc",
 		"sSortDesc": "sorting_desc",
@@ -14354,13 +14354,13 @@
 		"sSortableDesc": "sorting_desc_disabled",
 		"sSortableNone": "sorting_disabled",
 		"sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */
-	
+
 		/* Filtering */
 		"sFilterInput": "",
-	
+
 		/* Page length */
 		"sLengthSelect": "",
-	
+
 		/* Scrolling */
 		"sScrollWrapper": "dataTables_scroll",
 		"sScrollHead": "dataTables_scrollHead",
@@ -14368,11 +14368,11 @@
 		"sScrollBody": "dataTables_scrollBody",
 		"sScrollFoot": "dataTables_scrollFoot",
 		"sScrollFootInner": "dataTables_scrollFootInner",
-	
+
 		/* Misc */
 		"sHeaderTH": "",
 		"sFooterTH": "",
-	
+
 		// Deprecated
 		"sSortJUIAsc": "",
 		"sSortJUIDesc": "",
@@ -14384,31 +14384,31 @@
 		"sJUIHeader": "",
 		"sJUIFooter": ""
 	} );
-	
-	
+
+
 	(function() {
-	
+
 	// Reused strings for better compression. Closure compiler appears to have a
 	// weird edge case where it is trying to expand strings rather than use the
 	// variable version. This results in about 200 bytes being added, for very
 	// little preference benefit since it this run on script load only.
 	var _empty = '';
 	_empty = '';
-	
+
 	var _stateDefault = _empty + 'ui-state-default';
 	var _sortIcon     = _empty + 'css_right ui-icon ui-icon-';
 	var _headerFooter = _empty + 'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix';
-	
+
 	$.extend( DataTable.ext.oJUIClasses, DataTable.ext.classes, {
 		/* Full numbers paging buttons */
 		"sPageButton":         "fg-button ui-button "+_stateDefault,
 		"sPageButtonActive":   "ui-state-disabled",
 		"sPageButtonDisabled": "ui-state-disabled",
-	
+
 		/* Features */
 		"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
 			"ui-buttonset-multi paging_", /* Note that the type is postfixed */
-	
+
 		/* Sorting */
 		"sSortAsc":            _stateDefault+" sorting_asc",
 		"sSortDesc":           _stateDefault+" sorting_desc",
@@ -14423,31 +14423,31 @@
 		"sSortJUIDescAllowed": _sortIcon+"carat-1-s",
 		"sSortJUIWrapper":     "DataTables_sort_wrapper",
 		"sSortIcon":           "DataTables_sort_icon",
-	
+
 		/* Scrolling */
 		"sScrollHead": "dataTables_scrollHead "+_stateDefault,
 		"sScrollFoot": "dataTables_scrollFoot "+_stateDefault,
-	
+
 		/* Misc */
 		"sHeaderTH":  _stateDefault,
 		"sFooterTH":  _stateDefault,
 		"sJUIHeader": _headerFooter+" ui-corner-tl ui-corner-tr",
 		"sJUIFooter": _headerFooter+" ui-corner-bl ui-corner-br"
 	} );
-	
+
 	}());
-	
-	
-	
+
+
+
 	var extPagination = DataTable.ext.pager;
-	
+
 	function _numbers ( page, pages ) {
 		var
 			numbers = [],
 			buttons = extPagination.numbers_length,
 			half = Math.floor( buttons / 2 ),
 			i = 1;
-	
+
 		if ( pages <= buttons ) {
 			numbers = _range( 0, pages );
 		}
@@ -14468,41 +14468,41 @@
 			numbers.splice( 0, 0, 'ellipsis' );
 			numbers.splice( 0, 0, 0 );
 		}
-	
+
 		numbers.DT_el = 'span';
 		return numbers;
 	}
-	
-	
+
+
 	$.extend( extPagination, {
 		simple: function ( page, pages ) {
 			return [ 'previous', 'next' ];
 		},
-	
+
 		full: function ( page, pages ) {
 			return [  'first', 'previous', 'next', 'last' ];
 		},
-	
+
 		numbers: function ( page, pages ) {
 			return [ _numbers(page, pages) ];
 		},
-	
+
 		simple_numbers: function ( page, pages ) {
 			return [ 'previous', _numbers(page, pages), 'next' ];
 		},
-	
+
 		full_numbers: function ( page, pages ) {
 			return [ 'first', 'previous', _numbers(page, pages), 'next', 'last' ];
 		},
-	
+
 		// For testing and plug-ins to use
 		_numbers: _numbers,
-	
+
 		// Number of number buttons (including ellipsis) to show. _Must be odd!_
 		numbers_length: 7
 	} );
-	
-	
+
+
 	$.extend( true, DataTable.ext.renderer, {
 		pageButton: {
 			_: function ( settings, host, idx, buttons, page, pages ) {
@@ -14510,16 +14510,16 @@
 				var lang = settings.oLanguage.oPaginate;
 				var aria = settings.oLanguage.oAria.paginate || {};
 				var btnDisplay, btnClass, counter=0;
-	
+
 				var attach = function( container, buttons ) {
 					var i, ien, node, button;
 					var clickHandler = function ( e ) {
 						_fnPageChange( settings, e.data.action, true );
 					};
-	
+
 					for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
 						button = buttons[i];
-	
+
 						if ( $.isArray( button ) ) {
 							var inner = $( '<'+(button.DT_el || 'div')+'/>' )
 								.appendTo( container );
@@ -14528,43 +14528,43 @@
 						else {
 							btnDisplay = null;
 							btnClass = '';
-	
+
 							switch ( button ) {
 								case 'ellipsis':
 									container.append('<span class="ellipsis">&#x2026;</span>');
 									break;
-	
+
 								case 'first':
 									btnDisplay = lang.sFirst;
 									btnClass = button + (page > 0 ?
 										'' : ' '+classes.sPageButtonDisabled);
 									break;
-	
+
 								case 'previous':
 									btnDisplay = lang.sPrevious;
 									btnClass = button + (page > 0 ?
 										'' : ' '+classes.sPageButtonDisabled);
 									break;
-	
+
 								case 'next':
 									btnDisplay = lang.sNext;
 									btnClass = button + (page < pages-1 ?
 										'' : ' '+classes.sPageButtonDisabled);
 									break;
-	
+
 								case 'last':
 									btnDisplay = lang.sLast;
 									btnClass = button + (page < pages-1 ?
 										'' : ' '+classes.sPageButtonDisabled);
 									break;
-	
+
 								default:
 									btnDisplay = button + 1;
 									btnClass = page === button ?
 										classes.sPageButtonActive : '';
 									break;
 							}
-	
+
 							if ( btnDisplay !== null ) {
 								node = $('<a>', {
 										'class': classes.sPageButton+' '+btnClass,
@@ -14578,22 +14578,22 @@
 									} )
 									.html( btnDisplay )
 									.appendTo( container );
-	
+
 								_fnBindAction(
 									node, {action: button}, clickHandler
 								);
-	
+
 								counter++;
 							}
 						}
 					}
 				};
-	
+
 				// IE9 throws an 'unknown error' if document.activeElement is used
 				// inside an iframe or frame. Try / catch the error. Not good for
 				// accessibility, but neither are frames.
 				var activeEl;
-	
+
 				try {
 					// Because this approach is destroying and recreating the paging
 					// elements, focus is lost on the select button which is bad for
@@ -14602,18 +14602,18 @@
 					activeEl = $(host).find(document.activeElement).data('dt-idx');
 				}
 				catch (e) {}
-	
+
 				attach( $(host).empty(), buttons );
-	
+
 				if ( activeEl ) {
 					$(host).find( '[data-dt-idx='+activeEl+']' ).focus();
 				}
 			}
 		}
 	} );
-	
-	
-	
+
+
+
 	// Built in type detection. See model.ext.aTypes for information about
 	// what is required from this methods.
 	$.extend( DataTable.ext.type.detect, [
@@ -14624,7 +14624,7 @@
 			var decimal = settings.oLanguage.sDecimal;
 			return _isNumber( d, decimal ) ? 'num'+decimal : null;
 		},
-	
+
 		// Dates (only those recognised by the browser's Date.parse)
 		function ( d, settings )
 		{
@@ -14637,28 +14637,28 @@
 			var parsed = Date.parse(d);
 			return (parsed !== null && !isNaN(parsed)) || _empty(d) ? 'date' : null;
 		},
-	
+
 		// Formatted numbers
 		function ( d, settings )
 		{
 			var decimal = settings.oLanguage.sDecimal;
 			return _isNumber( d, decimal, true ) ? 'num-fmt'+decimal : null;
 		},
-	
+
 		// HTML numeric
 		function ( d, settings )
 		{
 			var decimal = settings.oLanguage.sDecimal;
 			return _htmlNumeric( d, decimal ) ? 'html-num'+decimal : null;
 		},
-	
+
 		// HTML numeric, formatted
 		function ( d, settings )
 		{
 			var decimal = settings.oLanguage.sDecimal;
 			return _htmlNumeric( d, decimal, true ) ? 'html-num-fmt'+decimal : null;
 		},
-	
+
 		// HTML (this is strict checking - there must be html)
 		function ( d, settings )
 		{
@@ -14666,17 +14666,17 @@
 				'html' : null;
 		}
 	] );
-	
-	
-	
+
+
+
 	// Filter formatting functions. See model.ext.ofnSearch for information about
 	// what is required from these methods.
-	// 
+	//
 	// Note that additional search methods are added for the html numbers and
 	// html formatted numbers by `_addNumericSort()` when we know what the decimal
 	// place is
-	
-	
+
+
 	$.extend( DataTable.ext.type.search, {
 		html: function ( data ) {
 			return _empty(data) ?
@@ -14687,7 +14687,7 @@
 						.replace( _re_html, "" ) :
 					'';
 		},
-	
+
 		string: function ( data ) {
 			return _empty(data) ?
 				data :
@@ -14696,35 +14696,35 @@
 					data;
 		}
 	} );
-	
-	
-	
+
+
+
 	var __numericReplace = function ( d, decimalPlace, re1, re2 ) {
 		if ( d !== 0 && (!d || d === '-') ) {
 			return -Infinity;
 		}
-	
+
 		// If a decimal place other than `.` is used, it needs to be given to the
 		// function so we can detect it and replace with a `.` which is the only
 		// decimal place Javascript recognises - it is not locale aware.
 		if ( decimalPlace ) {
 			d = _numToDecimal( d, decimalPlace );
 		}
-	
+
 		if ( d.replace ) {
 			if ( re1 ) {
 				d = d.replace( re1, '' );
 			}
-	
+
 			if ( re2 ) {
 				d = d.replace( re2, '' );
 			}
 		}
-	
+
 		return d * 1;
 	};
-	
-	
+
+
 	// Add the numeric 'deformatting' functions for sorting and search. This is done
 	// in a function to provide an easy ability for the language options to add
 	// additional methods if a non-period decimal place is used.
@@ -14735,17 +14735,17 @@
 				"num": function ( d ) {
 					return __numericReplace( d, decimalPlace );
 				},
-	
+
 				// Formatted numbers
 				"num-fmt": function ( d ) {
 					return __numericReplace( d, decimalPlace, _re_formatted_numeric );
 				},
-	
+
 				// HTML numeric
 				"html-num": function ( d ) {
 					return __numericReplace( d, decimalPlace, _re_html );
 				},
-	
+
 				// HTML numeric, formatted
 				"html-num-fmt": function ( d ) {
 					return __numericReplace( d, decimalPlace, _re_html, _re_formatted_numeric );
@@ -14754,7 +14754,7 @@
 			function ( key, fn ) {
 				// Add the ordering method
 				_ext.type.order[ key+decimalPlace+'-pre' ] = fn;
-	
+
 				// For HTML types add a search formatter that will strip the HTML
 				if ( key.match(/^html\-/) ) {
 					_ext.type.search[ key+decimalPlace ] = _ext.type.search.html;
@@ -14762,15 +14762,15 @@
 			}
 		);
 	}
-	
-	
+
+
 	// Default sort methods
 	$.extend( _ext.type.order, {
 		// Dates
 		"date-pre": function ( d ) {
 			return Date.parse( d ) || 0;
 		},
-	
+
 		// html
 		"html-pre": function ( a ) {
 			return _empty(a) ?
@@ -14779,7 +14779,7 @@
 					a.replace( /<.*?>/g, "" ).toLowerCase() :
 					a+'';
 		},
-	
+
 		// string
 		"string-pre": function ( a ) {
 			// This is a little complex, but faster than always calling toString,
@@ -14792,23 +14792,23 @@
 						'' :
 						a.toString();
 		},
-	
+
 		// string-asc and -desc are retained only for compatibility with the old
 		// sort methods
 		"string-asc": function ( x, y ) {
 			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
 		},
-	
+
 		"string-desc": function ( x, y ) {
 			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
 		}
 	} );
-	
-	
+
+
 	// Numeric sorting types - order doesn't matter here
 	_addNumericSort( '' );
-	
-	
+
+
 	$.extend( true, DataTable.ext.renderer, {
 		header: {
 			_: function ( settings, cell, column, classes ) {
@@ -14821,9 +14821,9 @@
 					if ( settings !== ctx ) { // need to check this this is the host
 						return;               // table, not a nested one
 					}
-	
+
 					var colIdx = column.idx;
-	
+
 					cell
 						.removeClass(
 							column.sSortingClass +' '+
@@ -14837,7 +14837,7 @@
 						);
 				} );
 			},
-	
+
 			jqueryui: function ( settings, cell, column, classes ) {
 				$('<div/>')
 					.addClass( classes.sSortJUIWrapper )
@@ -14846,15 +14846,15 @@
 						.addClass( classes.sSortIcon+' '+column.sSortingClassJUI )
 					)
 					.appendTo( cell );
-	
+
 				// Attach a sort listener to update on sort
 				$(settings.nTable).on( 'order.dt.DT', function ( e, ctx, sorting, columns ) {
 					if ( settings !== ctx ) {
 						return;
 					}
-	
+
 					var colIdx = column.idx;
-	
+
 					cell
 						.removeClass( classes.sSortAsc +" "+classes.sSortDesc )
 						.addClass( columns[ colIdx ] == 'asc' ?
@@ -14862,7 +14862,7 @@
 								classes.sSortDesc :
 								column.sSortingClass
 						);
-	
+
 					cell
 						.find( 'span.'+classes.sSortIcon )
 						.removeClass(
@@ -14881,20 +14881,20 @@
 			}
 		}
 	} );
-	
+
 	/*
 	 * Public helper functions. These aren't used internally by DataTables, or
 	 * called by any of the options passed into DataTables, but they can be used
 	 * externally by developers working with DataTables. They are helper functions
 	 * to make working with DataTables a little bit easier.
 	 */
-	
+
 	var __htmlEscapeEntities = function ( d ) {
 		return typeof d === 'string' ?
 			d.replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;') :
 			d;
 	};
-	
+
 	/**
 	 * Helpers for `columns.render`.
 	 *
@@ -14928,24 +14928,24 @@
 					if ( typeof d !== 'number' && typeof d !== 'string' ) {
 						return d;
 					}
-	
+
 					var negative = d < 0 ? '-' : '';
 					var flo = parseFloat( d );
-	
+
 					// If NaN then there isn't much formatting that we can do - just
 					// return immediately, escaping any HTML (this was supposed to
 					// be a number after all)
 					if ( isNaN( flo ) ) {
 						return __htmlEscapeEntities( d );
 					}
-	
+
 					d = Math.abs( flo );
-	
+
 					var intPart = parseInt( d, 10 );
 					var floatPart = precision ?
 						decimal+(d - intPart).toFixed( precision ).substring( 2 ):
 						'';
-	
+
 					return negative + (prefix||'') +
 						intPart.toString().replace(
 							/\B(?=(\d{3})+(?!\d))/g, thousands
@@ -14955,21 +14955,21 @@
 				}
 			};
 		},
-	
+
 		text: function () {
 			return {
 				display: __htmlEscapeEntities
 			};
 		}
 	};
-	
-	
+
+
 	/*
 	 * This is really a good bit rubbish this method of exposing the internal methods
 	 * publicly... - To be fixed in 2.0 using methods on the prototype
 	 */
-	
-	
+
+
 	/**
 	 * Create a wrapper function for exporting an internal functions to an external API.
 	 *  @param {string} fn API function name
@@ -14985,8 +14985,8 @@
 			return DataTable.ext.internal[fn].apply( this, args );
 		};
 	}
-	
-	
+
+
 	/**
 	 * Reference to internal functions for use by plug-in developers. Note that
 	 * these methods are references to internal functions and are considered to be
@@ -15087,7 +15087,7 @@
 		                                // in 1.10, so this dead-end function is
 		                                // added to prevent errors
 	} );
-	
+
 
 	// jQuery access
 	$.fn.dataTable = DataTable;
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js
index c2c4657f4c..440176c33e 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js
@@ -26,7 +26,7 @@ $.widget("ech.notify", {
 		var self = this;
 		this.templates = {};
 		this.keys = [];
-		
+
 		// build and save templates
 		this.element.addClass("ui-notify").children().addClass("ui-notify-message ui-notify-message-style").each(function(i){
 			var key = this.id || i;
@@ -40,14 +40,14 @@ $.widget("ech.notify", {
 			msg = template;
 			template = null;
 		}
-		
+
 		var tpl = this.templates[ template || this.keys[0]];
-		
+
 		// remove default styling class if rolling w/ custom classes
 		if(opts && opts.custom){
 			tpl = $(tpl).removeClass("ui-notify-message-style").wrap("<div></div>").parent().html();
 		}
-		
+
 		// return a new notification instance
 		return new $.ech.notify.instance(this)._create(msg, $.extend({}, this.options, opts), tpl);
 	}
@@ -65,27 +65,27 @@ $.extend($.ech.notify, {
 $.extend($.ech.notify.instance.prototype, {
 	_create: function(params, options, template){
 		this.options = options;
-		
+
 		var self = this,
-			
+
 			// build html template
 			html = template.replace(/#(?:\{|%7B)(.*?)(?:\}|%7D)/g, function($1, $2){
 				return ($2 in params) ? params[$2] : '';
 			}),
-			
+
 			// the actual message
 			m = (this.element = $(html)),
-			
+
 			// close link
 			closelink = m.find(".ui-notify-close");
-		
+
 		// clickable?
 		if(typeof this.options.click === "function"){
 			m.addClass("ui-notify-click").bind("click", function(e){
 				self._trigger("click", e, self);
 			});
 		}
-		
+
 		// show close link?
 		if(closelink.length){
 			closelink.bind("click", function(){
@@ -93,26 +93,26 @@ $.extend($.ech.notify.instance.prototype, {
 				return false;
 			});
 		}
-		
+
 		this.open();
-		
+
 		// auto expire?
 		if(typeof options.expires === "number"){
 			window.setTimeout(function(){
 				self.close();
 			}, options.expires);
 		}
-		
+
 		return this;
 	},
 	close: function(){
 		var self = this, speed = this.options.speed;
-		
+
 		this.element.fadeTo(speed, 0).slideUp(speed, function(){
 			self._trigger("close");
 			self.isOpen = false;
 		});
-		
+
 		return this;
 	},
 	open: function(){
@@ -121,12 +121,12 @@ $.extend($.ech.notify.instance.prototype, {
 		}
 
 		var self = this;
-		
+
 		this.element[this.options.stack === 'above' ? 'prependTo' : 'appendTo'](this.parent.element).css({ display:"none", opacity:"" }).fadeIn(this.options.speed, function(){
 			self._trigger("open");
 			self.isOpen = true;
 		});
-		
+
 		return this;
 	},
 	widget: function(){
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.truncator.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.truncator.js
index 5861d1dd0b..41ed3b9955 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery.truncator.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.truncator.js
@@ -9,7 +9,7 @@
   $.fn.truncate = function(options) {
 
     var opts = $.extend({}, $.fn.truncate.defaults, options);
-    
+
     $(this).each(function() {
 
       var content_length = $.trim(squeeze($(this).text())).length;
@@ -21,10 +21,10 @@
       var full_node = $(this).hide();
 
       truncated_node.insertAfter(full_node);
-      
+
       findNodeForMore(truncated_node).append(' (... <a href="#show more content">'+opts.more+'</a>)');
       findNodeForLess(full_node).append(' (<a href="#show less content">'+opts.less+'</a>)');
-      
+
       truncated_node.find('a:last').click(function() {
         truncated_node.hide(); full_node.show(); return false;
       });
@@ -76,7 +76,7 @@
   function squeeze(string) {
     return string.replace(/\s+/g, ' ');
   }
-  
+
   // Finds the last, innermost block-level element
   function findNodeForMore(node) {
     var $node = $(node);
diff --git a/webapp/src/main/webapp/js/latLongJson.js b/webapp/src/main/webapp/js/latLongJson.js
index f0499b9bac..ff5191ab39 100644
--- a/webapp/src/main/webapp/js/latLongJson.js
+++ b/webapp/src/main/webapp/js/latLongJson.js
@@ -3,7 +3,7 @@
 // THIS FILE IS USED TO PROVIDE GEOJSON DATA TO THE JAVASCRIPT THAT BUILDS THE MAP ON THE VIVO HOME PAGE.
 // NOTE THAT THIS DATA IS NOT INTENDED TO BE COMPLETE AND DEFINITIVE; RESEARCHERS AT YOUR INSTITUTION
 // MAY HAVE AREAS OF GEOGRAPHIC FOCUS THAT ARE UNIQUELY DEFINED AND THUS MAY NOT BE INCLUDED IN THIS FILE.
-// SO UPDATE THIS DATA AS IS NECESSARY. ALSO NOTE THAT NO STATE DATA IS PROVIDED HERE> IF YOU DECIDE TO 
+// SO UPDATE THIS DATA AS IS NECESSARY. ALSO NOTE THAT NO STATE DATA IS PROVIDED HERE> IF YOU DECIDE TO
 // IMPLEMENT A STATE MAP, YOU WILL NEED TO ADD THE GEOJSON DATA FOR THAT STATE'S COUNTIES AND OTHER
 // RELEVANT GEOGRAPHIC AREAS.
 
diff --git a/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js b/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js
index 77390497d4..1460804291 100755
--- a/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js
+++ b/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js
@@ -5310,7 +5310,7 @@ L.CircleMarker = L.Circle.extend({
 	projectLatlngs: function () {
 		this._point = this._map.latLngToLayerPoint(this._latlng);
 	},
-	
+
 	_updateStyle : function () {
 		L.Circle.prototype._updateStyle.call(this);
 		this.setRadius(this.options.radius);
diff --git a/webapp/src/main/webapp/js/leaflet/dist/leaflet.css b/webapp/src/main/webapp/js/leaflet/dist/leaflet.css
index ea3da39071..98c281bdce 100755
--- a/webapp/src/main/webapp/js/leaflet/dist/leaflet.css
+++ b/webapp/src/main/webapp/js/leaflet/dist/leaflet.css
@@ -1,457 +1,457 @@
-/* required styles */
-
-.leaflet-map-pane,
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow,
-.leaflet-tile-pane,
-.leaflet-overlay-pane,
-.leaflet-shadow-pane,
-.leaflet-marker-pane,
-.leaflet-popup-pane,
-.leaflet-overlay-pane svg,
-.leaflet-zoom-box,
-.leaflet-image-layer,
-.leaflet-layer {
-	position: absolute;
-	left: 0;
-	top: 0;
-	}
-.leaflet-container {
-	overflow: hidden;
-	-ms-touch-action: none;
-	}
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	-webkit-user-select: none;
-	   -moz-user-select: none;
-	        user-select: none;
-	}
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	display: block;
-	}
-/* map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container img {
-	max-width: none !important;
-	}
-/* stupid Android 2 doesn't understand "max-width: none" properly */
-.leaflet-container img.leaflet-image-layer {
-	max-width: 15000px !important;
-	}
-.leaflet-tile {
-	filter: inherit;
-	visibility: hidden;
-	}
-.leaflet-tile-loaded {
-	visibility: inherit;
-	}
-.leaflet-zoom-box {
-	width: 0;
-	height: 0;
-	}
-
-.leaflet-tile-pane    { z-index: 2; }
-.leaflet-objects-pane { z-index: 3; }
-.leaflet-overlay-pane { z-index: 4; }
-.leaflet-shadow-pane  { z-index: 5; }
-.leaflet-marker-pane  { z-index: 6; }
-.leaflet-popup-pane   { z-index: 7; }
-
-
-/* control positioning */
-
-.leaflet-control {
-	position: relative;
-	z-index: 7;
-	pointer-events: auto;
-	}
-.leaflet-top,
-.leaflet-bottom {
-	position: absolute;
-	z-index: 1000;
-	pointer-events: none;
-	}
-.leaflet-top {
-	top: 0;
-	}
-.leaflet-right {
-	right: 0;
-	}
-.leaflet-bottom {
-	bottom: 0;
-	}
-.leaflet-left {
-	left: 0;
-	}
-.leaflet-control {
-	float: left;
-	clear: both;
-	}
-.leaflet-right .leaflet-control {
-	float: right;
-	}
-.leaflet-top .leaflet-control {
-	margin-top: 10px;
-	}
-.leaflet-bottom .leaflet-control {
-	margin-bottom: 10px;
-	}
-.leaflet-left .leaflet-control {
-	margin-left: 10px;
-	}
-.leaflet-right .leaflet-control {
-	margin-right: 10px;
-	}
-
-
-/* zoom and fade animations */
-
-.leaflet-fade-anim .leaflet-tile,
-.leaflet-fade-anim .leaflet-popup {
-	opacity: 0;
-	-webkit-transition: opacity 0.2s linear;
-	   -moz-transition: opacity 0.2s linear;
-	     -o-transition: opacity 0.2s linear;
-	        transition: opacity 0.2s linear;
-	}
-.leaflet-fade-anim .leaflet-tile-loaded,
-.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
-	opacity: 1;
-	}
-
-.leaflet-zoom-anim .leaflet-zoom-animated {
-	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
-	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
-	}
-.leaflet-zoom-anim .leaflet-tile,
-.leaflet-pan-anim .leaflet-tile,
-.leaflet-touching .leaflet-zoom-animated {
-	-webkit-transition: none;
-	   -moz-transition: none;
-	     -o-transition: none;
-	        transition: none;
-	}
-
-.leaflet-zoom-anim .leaflet-zoom-hide {
-	visibility: hidden;
-	}
-
-
-/* cursors */
-
-.leaflet-clickable {
-	cursor: pointer;
-	}
-.leaflet-container {
-	cursor: -webkit-grab;
-	cursor:    -moz-grab;
-	}
-.leaflet-popup-pane,
-.leaflet-control {
-	cursor: auto;
-	}
-.leaflet-dragging,
-.leaflet-dragging .leaflet-clickable,
-.leaflet-dragging .leaflet-container {
-	cursor: move;
-	cursor: -webkit-grabbing;
-	cursor:    -moz-grabbing;
-	}
-
-
-/* visual tweaks */
-
-.leaflet-container {
-	background: #ddd;
-	outline: 0;
-	}
-.leaflet-container a {
-	color: #0078A8;
-	}
-.leaflet-container a.leaflet-active {
-	outline: 2px solid orange;
-	}
-.leaflet-zoom-box {
-	border: 2px dotted #05f;
-	background: white;
-	opacity: 0.5;
-	}
-
-
-/* general typography */
-.leaflet-container {
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	}
-
-
-/* general toolbar styles */
-
-.leaflet-bar {
-	box-shadow: 0 0 8px rgba(0,0,0,0.4);
-	border: 1px solid #888;
-	-webkit-border-radius: 5px;
-	        border-radius: 5px;
-	}
-.leaflet-bar-part {
-	background-color: rgba(255, 255, 255, 0.8);
-	border-bottom: 1px solid #aaa;
-	}
-.leaflet-bar-part-top {
-	-webkit-border-radius: 4px 4px 0 0;
-	        border-radius: 4px 4px 0 0;
-	}
-.leaflet-bar-part-bottom {
-	-webkit-border-radius: 0 0 4px 4px;
-	        border-radius: 0 0 4px 4px;
-	border-bottom: none;
-	}
-
-.leaflet-touch .leaflet-bar {
-	-webkit-border-radius: 10px;
-	        border-radius: 10px;
-	}
-.leaflet-touch .leaflet-bar-part {
-	border-bottom: 4px solid rgba(0,0,0,0.3);
-	}
-.leaflet-touch .leaflet-bar-part-top {
-	-webkit-border-radius: 7px 7px 0 0;
-	        border-radius: 7px 7px 0 0;
-	}
-.leaflet-touch .leaflet-bar-part-bottom {
-	-webkit-border-radius: 0 0 7px 7px;
-	        border-radius: 0 0 7px 7px;
-	border-bottom: none;
-	}
-
-
-/* zoom control */
-
-.leaflet-container .leaflet-control-zoom {
-	margin-left: 13px;
-	margin-top: 12px;
-	}
-.leaflet-control-zoom a {
-	width: 22px;
-	height: 22px;
-	text-align: center;
-	text-decoration: none;
-	color: black;
-	}
-.leaflet-control-zoom a,
-.leaflet-control-layers-toggle {
-	background-position: 50% 50%;
-	background-repeat: no-repeat;
-	display: block;
-	}
-.leaflet-control-zoom a:hover {
-	background-color: #fff;
-	color: #777;
-	}
-.leaflet-control-zoom-in {
-	font: bold 18px/24px Arial, Helvetica, sans-serif;
-	}
-.leaflet-control-zoom-out {
-	font: bold 23px/20px Tahoma, Verdana, sans-serif;
-	}
-.leaflet-control-zoom a.leaflet-control-zoom-disabled {
-	cursor: default;
-	background-color: rgba(255, 255, 255, 0.8);
-	color: #bbb;
-	}
-
-.leaflet-touch .leaflet-control-zoom a {
-	width: 30px;
-	height: 30px;
-	}
-.leaflet-touch .leaflet-control-zoom-in {
-	font-size: 24px;
-	line-height: 29px;
-	}
-.leaflet-touch .leaflet-control-zoom-out {
-	font-size: 28px;
-	line-height: 24px;
-	}
-
-/* layers control */
-
-.leaflet-control-layers {
-	box-shadow: 0 1px 7px rgba(0,0,0,0.4);
-	background: #f8f8f9;
-	-webkit-border-radius: 8px;
-	        border-radius: 8px;
-	}
-.leaflet-control-layers-toggle {
-	background-image: url(images/layers.png);
-	width: 36px;
-	height: 36px;
-	}
-.leaflet-touch .leaflet-control-layers-toggle {
-	width: 44px;
-	height: 44px;
-	}
-.leaflet-control-layers .leaflet-control-layers-list,
-.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
-	display: none;
-	}
-.leaflet-control-layers-expanded .leaflet-control-layers-list {
-	display: block;
-	position: relative;
-	}
-.leaflet-control-layers-expanded {
-	padding: 6px 10px 6px 6px;
-	color: #333;
-	background: #fff;
-	}
-.leaflet-control-layers-selector {
-	margin-top: 2px;
-	position: relative;
-	top: 1px;
-	}
-.leaflet-control-layers label {
-	display: block;
-	}
-.leaflet-control-layers-separator {
-	height: 0;
-	border-top: 1px solid #ddd;
-	margin: 5px -10px 5px -6px;
-	}
-
-
-/* attribution and scale controls */
-
-.leaflet-container .leaflet-control-attribution {
-	background-color: rgba(255, 255, 255, 0.7);
-	box-shadow: 0 0 5px #bbb;
-	margin: 0;
-	}
-.leaflet-control-attribution,
-.leaflet-control-scale-line {
-	padding: 0 5px;
-	color: #333;
-	}
-.leaflet-container .leaflet-control-attribution,
-.leaflet-container .leaflet-control-scale {
-	font-size: 11px;
-	}
-.leaflet-left .leaflet-control-scale {
-	margin-left: 5px;
-	}
-.leaflet-bottom .leaflet-control-scale {
-	margin-bottom: 5px;
-	}
-.leaflet-control-scale-line {
-	border: 2px solid #777;
-	border-top: none;
-	color: black;
-	line-height: 1.1;
-	padding: 2px 5px 1px;
-	font-size: 11px;
-	text-shadow: 1px 1px 1px #fff;
-	background-color: rgba(255, 255, 255, 0.5);
-	box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.2);
-	white-space: nowrap;
-	overflow: hidden;
-	}
-.leaflet-control-scale-line:not(:first-child) {
-	border-top: 2px solid #777;
-	border-bottom: none;
-	margin-top: -2px;
-	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-	}
-.leaflet-control-scale-line:not(:first-child):not(:last-child) {
-	border-bottom: 2px solid #777;
-	}
-
-.leaflet-touch .leaflet-control-attribution,
-.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
-	box-shadow: none;
-	}
-.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
-	border: 4px solid rgba(0,0,0,0.3);
-	}
-
-
-/* popup */
-
-.leaflet-popup {
-	position: absolute;
-	text-align: center;
-	}
-.leaflet-popup-content-wrapper {
-	padding: 1px;
-	text-align: left;
-	-webkit-border-radius: 20px;
-	        border-radius: 20px;
-	}
-.leaflet-popup-content {
-	margin: 14px 20px;
-	line-height: 1.4;
-	}
-.leaflet-popup-content p {
-	margin: 18px 0;
-	}
-.leaflet-popup-tip-container {
-	margin: 0 auto;
-	width: 40px;
-	height: 20px;
-	position: relative;
-	overflow: hidden;
-	}
-.leaflet-popup-tip {
-	width: 15px;
-	height: 15px;
-	padding: 1px;
-
-	margin: -8px auto 0;
-
-	-webkit-transform: rotate(45deg);
-	   -moz-transform: rotate(45deg);
-	    -ms-transform: rotate(45deg);
-	     -o-transform: rotate(45deg);
-	        transform: rotate(45deg);
-	}
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-	background: white;
-
-	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
-	}
-.leaflet-container a.leaflet-popup-close-button {
-	position: absolute;
-	top: 0;
-	right: 0;
-	padding: 4px 5px 0 0;
-	text-align: center;
-	width: 18px;
-	height: 14px;
-	font: 16px/14px Tahoma, Verdana, sans-serif;
-	color: #c3c3c3;
-	text-decoration: none;
-	font-weight: bold;
-	background: transparent;
-	}
-.leaflet-container a.leaflet-popup-close-button:hover {
-	color: #999;
-	}
-.leaflet-popup-scrolled {
-	overflow: auto;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #ddd;
-	}
-
-
-/* div icon */
-
-.leaflet-div-icon {
-	background: #fff;
-	border: 1px solid #666;
-	}
-.leaflet-editing-icon {
-	-webkit-border-radius: 2px;
-	        border-radius: 2px;
-	}
+/* required styles */
+
+.leaflet-map-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-pane,
+.leaflet-overlay-pane,
+.leaflet-shadow-pane,
+.leaflet-marker-pane,
+.leaflet-popup-pane,
+.leaflet-overlay-pane svg,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+	position: absolute;
+	left: 0;
+	top: 0;
+	}
+.leaflet-container {
+	overflow: hidden;
+	-ms-touch-action: none;
+	}
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	        user-select: none;
+	}
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	display: block;
+	}
+/* map is broken in FF if you have max-width: 100% on tiles */
+.leaflet-container img {
+	max-width: none !important;
+	}
+/* stupid Android 2 doesn't understand "max-width: none" properly */
+.leaflet-container img.leaflet-image-layer {
+	max-width: 15000px !important;
+	}
+.leaflet-tile {
+	filter: inherit;
+	visibility: hidden;
+	}
+.leaflet-tile-loaded {
+	visibility: inherit;
+	}
+.leaflet-zoom-box {
+	width: 0;
+	height: 0;
+	}
+
+.leaflet-tile-pane    { z-index: 2; }
+.leaflet-objects-pane { z-index: 3; }
+.leaflet-overlay-pane { z-index: 4; }
+.leaflet-shadow-pane  { z-index: 5; }
+.leaflet-marker-pane  { z-index: 6; }
+.leaflet-popup-pane   { z-index: 7; }
+
+
+/* control positioning */
+
+.leaflet-control {
+	position: relative;
+	z-index: 7;
+	pointer-events: auto;
+	}
+.leaflet-top,
+.leaflet-bottom {
+	position: absolute;
+	z-index: 1000;
+	pointer-events: none;
+	}
+.leaflet-top {
+	top: 0;
+	}
+.leaflet-right {
+	right: 0;
+	}
+.leaflet-bottom {
+	bottom: 0;
+	}
+.leaflet-left {
+	left: 0;
+	}
+.leaflet-control {
+	float: left;
+	clear: both;
+	}
+.leaflet-right .leaflet-control {
+	float: right;
+	}
+.leaflet-top .leaflet-control {
+	margin-top: 10px;
+	}
+.leaflet-bottom .leaflet-control {
+	margin-bottom: 10px;
+	}
+.leaflet-left .leaflet-control {
+	margin-left: 10px;
+	}
+.leaflet-right .leaflet-control {
+	margin-right: 10px;
+	}
+
+
+/* zoom and fade animations */
+
+.leaflet-fade-anim .leaflet-tile,
+.leaflet-fade-anim .leaflet-popup {
+	opacity: 0;
+	-webkit-transition: opacity 0.2s linear;
+	   -moz-transition: opacity 0.2s linear;
+	     -o-transition: opacity 0.2s linear;
+	        transition: opacity 0.2s linear;
+	}
+.leaflet-fade-anim .leaflet-tile-loaded,
+.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
+	opacity: 1;
+	}
+
+.leaflet-zoom-anim .leaflet-zoom-animated {
+	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
+	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
+	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
+	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
+	}
+.leaflet-zoom-anim .leaflet-tile,
+.leaflet-pan-anim .leaflet-tile,
+.leaflet-touching .leaflet-zoom-animated {
+	-webkit-transition: none;
+	   -moz-transition: none;
+	     -o-transition: none;
+	        transition: none;
+	}
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+	visibility: hidden;
+	}
+
+
+/* cursors */
+
+.leaflet-clickable {
+	cursor: pointer;
+	}
+.leaflet-container {
+	cursor: -webkit-grab;
+	cursor:    -moz-grab;
+	}
+.leaflet-popup-pane,
+.leaflet-control {
+	cursor: auto;
+	}
+.leaflet-dragging,
+.leaflet-dragging .leaflet-clickable,
+.leaflet-dragging .leaflet-container {
+	cursor: move;
+	cursor: -webkit-grabbing;
+	cursor:    -moz-grabbing;
+	}
+
+
+/* visual tweaks */
+
+.leaflet-container {
+	background: #ddd;
+	outline: 0;
+	}
+.leaflet-container a {
+	color: #0078A8;
+	}
+.leaflet-container a.leaflet-active {
+	outline: 2px solid orange;
+	}
+.leaflet-zoom-box {
+	border: 2px dotted #05f;
+	background: white;
+	opacity: 0.5;
+	}
+
+
+/* general typography */
+.leaflet-container {
+	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+	box-shadow: 0 0 8px rgba(0,0,0,0.4);
+	border: 1px solid #888;
+	-webkit-border-radius: 5px;
+	        border-radius: 5px;
+	}
+.leaflet-bar-part {
+	background-color: rgba(255, 255, 255, 0.8);
+	border-bottom: 1px solid #aaa;
+	}
+.leaflet-bar-part-top {
+	-webkit-border-radius: 4px 4px 0 0;
+	        border-radius: 4px 4px 0 0;
+	}
+.leaflet-bar-part-bottom {
+	-webkit-border-radius: 0 0 4px 4px;
+	        border-radius: 0 0 4px 4px;
+	border-bottom: none;
+	}
+
+.leaflet-touch .leaflet-bar {
+	-webkit-border-radius: 10px;
+	        border-radius: 10px;
+	}
+.leaflet-touch .leaflet-bar-part {
+	border-bottom: 4px solid rgba(0,0,0,0.3);
+	}
+.leaflet-touch .leaflet-bar-part-top {
+	-webkit-border-radius: 7px 7px 0 0;
+	        border-radius: 7px 7px 0 0;
+	}
+.leaflet-touch .leaflet-bar-part-bottom {
+	-webkit-border-radius: 0 0 7px 7px;
+	        border-radius: 0 0 7px 7px;
+	border-bottom: none;
+	}
+
+
+/* zoom control */
+
+.leaflet-container .leaflet-control-zoom {
+	margin-left: 13px;
+	margin-top: 12px;
+	}
+.leaflet-control-zoom a {
+	width: 22px;
+	height: 22px;
+	text-align: center;
+	text-decoration: none;
+	color: black;
+	}
+.leaflet-control-zoom a,
+.leaflet-control-layers-toggle {
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	display: block;
+	}
+.leaflet-control-zoom a:hover {
+	background-color: #fff;
+	color: #777;
+	}
+.leaflet-control-zoom-in {
+	font: bold 18px/24px Arial, Helvetica, sans-serif;
+	}
+.leaflet-control-zoom-out {
+	font: bold 23px/20px Tahoma, Verdana, sans-serif;
+	}
+.leaflet-control-zoom a.leaflet-control-zoom-disabled {
+	cursor: default;
+	background-color: rgba(255, 255, 255, 0.8);
+	color: #bbb;
+	}
+
+.leaflet-touch .leaflet-control-zoom a {
+	width: 30px;
+	height: 30px;
+	}
+.leaflet-touch .leaflet-control-zoom-in {
+	font-size: 24px;
+	line-height: 29px;
+	}
+.leaflet-touch .leaflet-control-zoom-out {
+	font-size: 28px;
+	line-height: 24px;
+	}
+
+/* layers control */
+
+.leaflet-control-layers {
+	box-shadow: 0 1px 7px rgba(0,0,0,0.4);
+	background: #f8f8f9;
+	-webkit-border-radius: 8px;
+	        border-radius: 8px;
+	}
+.leaflet-control-layers-toggle {
+	background-image: url(images/layers.png);
+	width: 36px;
+	height: 36px;
+	}
+.leaflet-touch .leaflet-control-layers-toggle {
+	width: 44px;
+	height: 44px;
+	}
+.leaflet-control-layers .leaflet-control-layers-list,
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+	display: none;
+	}
+.leaflet-control-layers-expanded .leaflet-control-layers-list {
+	display: block;
+	position: relative;
+	}
+.leaflet-control-layers-expanded {
+	padding: 6px 10px 6px 6px;
+	color: #333;
+	background: #fff;
+	}
+.leaflet-control-layers-selector {
+	margin-top: 2px;
+	position: relative;
+	top: 1px;
+	}
+.leaflet-control-layers label {
+	display: block;
+	}
+.leaflet-control-layers-separator {
+	height: 0;
+	border-top: 1px solid #ddd;
+	margin: 5px -10px 5px -6px;
+	}
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+	background-color: rgba(255, 255, 255, 0.7);
+	box-shadow: 0 0 5px #bbb;
+	margin: 0;
+	}
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+	padding: 0 5px;
+	color: #333;
+	}
+.leaflet-container .leaflet-control-attribution,
+.leaflet-container .leaflet-control-scale {
+	font-size: 11px;
+	}
+.leaflet-left .leaflet-control-scale {
+	margin-left: 5px;
+	}
+.leaflet-bottom .leaflet-control-scale {
+	margin-bottom: 5px;
+	}
+.leaflet-control-scale-line {
+	border: 2px solid #777;
+	border-top: none;
+	color: black;
+	line-height: 1.1;
+	padding: 2px 5px 1px;
+	font-size: 11px;
+	text-shadow: 1px 1px 1px #fff;
+	background-color: rgba(255, 255, 255, 0.5);
+	box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.2);
+	white-space: nowrap;
+	overflow: hidden;
+	}
+.leaflet-control-scale-line:not(:first-child) {
+	border-top: 2px solid #777;
+	border-bottom: none;
+	margin-top: -2px;
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+	}
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {
+	border-bottom: 2px solid #777;
+	}
+
+.leaflet-touch .leaflet-control-attribution,
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-control-zoom {
+	box-shadow: none;
+	}
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-control-zoom {
+	border: 4px solid rgba(0,0,0,0.3);
+	}
+
+
+/* popup */
+
+.leaflet-popup {
+	position: absolute;
+	text-align: center;
+	}
+.leaflet-popup-content-wrapper {
+	padding: 1px;
+	text-align: left;
+	-webkit-border-radius: 20px;
+	        border-radius: 20px;
+	}
+.leaflet-popup-content {
+	margin: 14px 20px;
+	line-height: 1.4;
+	}
+.leaflet-popup-content p {
+	margin: 18px 0;
+	}
+.leaflet-popup-tip-container {
+	margin: 0 auto;
+	width: 40px;
+	height: 20px;
+	position: relative;
+	overflow: hidden;
+	}
+.leaflet-popup-tip {
+	width: 15px;
+	height: 15px;
+	padding: 1px;
+
+	margin: -8px auto 0;
+
+	-webkit-transform: rotate(45deg);
+	   -moz-transform: rotate(45deg);
+	    -ms-transform: rotate(45deg);
+	     -o-transform: rotate(45deg);
+	        transform: rotate(45deg);
+	}
+.leaflet-popup-content-wrapper, .leaflet-popup-tip {
+	background: white;
+
+	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+	}
+.leaflet-container a.leaflet-popup-close-button {
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding: 4px 5px 0 0;
+	text-align: center;
+	width: 18px;
+	height: 14px;
+	font: 16px/14px Tahoma, Verdana, sans-serif;
+	color: #c3c3c3;
+	text-decoration: none;
+	font-weight: bold;
+	background: transparent;
+	}
+.leaflet-container a.leaflet-popup-close-button:hover {
+	color: #999;
+	}
+.leaflet-popup-scrolled {
+	overflow: auto;
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	}
+
+
+/* div icon */
+
+.leaflet-div-icon {
+	background: #fff;
+	border: 1px solid #666;
+	}
+.leaflet-editing-icon {
+	-webkit-border-radius: 2px;
+	        border-radius: 2px;
+	}
diff --git a/webapp/src/main/webapp/js/leaflet/dist/leaflet.ie.css b/webapp/src/main/webapp/js/leaflet/dist/leaflet.ie.css
index b59c8144e6..71de252a8c 100755
--- a/webapp/src/main/webapp/js/leaflet/dist/leaflet.ie.css
+++ b/webapp/src/main/webapp/js/leaflet/dist/leaflet.ie.css
@@ -1,57 +1,57 @@
-.leaflet-vml-shape {
-	width: 1px;
-	height: 1px;
-	}
-.lvml {
-	behavior: url(#default#VML);
-	display: inline-block;
-	position: absolute;
-	}
-
-.leaflet-control {
-	display: inline;
-	}
-
-.leaflet-popup-tip {
-	width: 21px;
-	_width: 27px;
-	margin: 0 auto;
-	_margin-top: -3px;
-
-	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
-	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
-	}
-.leaflet-popup-tip-container {
-	margin-top: -1px;
-	}
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-	border: 1px solid #999;
-	}
-.leaflet-popup-content-wrapper {
-	zoom: 1;
-	}
-
-.leaflet-control-zoom,
-.leaflet-control-layers {
-	border: 3px solid #999;
-	}
-.leaflet-control-zoom a {
-	background-color: #eee;
-	}
-.leaflet-control-zoom a:hover {
-	background-color: #fff;
-	}
-.leaflet-control-layers-toggle {
-	}
-.leaflet-control-attribution,
-.leaflet-control-layers,
-.leaflet-control-scale-line {
-	background: white;
-	}
-.leaflet-zoom-box {
-	filter: alpha(opacity=50);
-	}
-.leaflet-control-attribution {
-	border-top: 1px solid #bbb;
-	border-left: 1px solid #bbb;
-	}
+.leaflet-vml-shape {
+	width: 1px;
+	height: 1px;
+	}
+.lvml {
+	behavior: url(#default#VML);
+	display: inline-block;
+	position: absolute;
+	}
+
+.leaflet-control {
+	display: inline;
+	}
+
+.leaflet-popup-tip {
+	width: 21px;
+	_width: 27px;
+	margin: 0 auto;
+	_margin-top: -3px;
+
+	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+	}
+.leaflet-popup-tip-container {
+	margin-top: -1px;
+	}
+.leaflet-popup-content-wrapper, .leaflet-popup-tip {
+	border: 1px solid #999;
+	}
+.leaflet-popup-content-wrapper {
+	zoom: 1;
+	}
+
+.leaflet-control-zoom,
+.leaflet-control-layers {
+	border: 3px solid #999;
+	}
+.leaflet-control-zoom a {
+	background-color: #eee;
+	}
+.leaflet-control-zoom a:hover {
+	background-color: #fff;
+	}
+.leaflet-control-layers-toggle {
+	}
+.leaflet-control-attribution,
+.leaflet-control-layers,
+.leaflet-control-scale-line {
+	background: white;
+	}
+.leaflet-zoom-box {
+	filter: alpha(opacity=50);
+	}
+.leaflet-control-attribution {
+	border-top: 1px solid #bbb;
+	border-left: 1px solid #bbb;
+	}
diff --git a/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
index 91fe2e7e7d..124bb133ca 100644
--- a/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
+++ b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
@@ -1,41 +1,41 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-//This class is responsible for the product-specific form processing/content selection that might be possible
-//Overrides the usual behavior of selecting the specific JavaScript class needed to convert the form inputs
-//into a JSON object for submission based on the page content type
-//VIVO Specific version includes individuals for classes data getter in addition to the others
-//The internal class specific processor class is in VIVO, while all other javascript files are in Vitro
-
-var processDataGetterUtils = {
-		dataGetterProcessorMap:{"browseClassGroup": processClassGroupDataGetterContent, 
-								"sparqlQuery": processSparqlDataGetterContent, 
-								"fixedHtml":processFixedHTMLDataGetterContent,
-								"internalClass":processInternalClassDataGetterContent,
-								"searchIndividuals":processSearchDataGetterContent},
-	    selectDataGetterType:function(pageContentSection) {
-			var contentType = pageContentSection.attr("contentType");
-			//The form can provide "browse class group" as content type but need to check
-			//whether this is in fact individuals for classes instead
-			if(contentType == "browseClassGroup") {
-				//Is ALL NOT selected and there are other classes, pick one
-				//this SHOULD be an array
-				var allClassesSelected = pageContentSection.find("input[name='allSelected']:checked");
-				var isInternalSelected = pageContentSection.find("input[name='display-internalClass']:checked");
-				//If all NOT selected then need to pick a different content type OR if internal class selected
-				if( isInternalSelected.length > 0 || allClassesSelected.length == 0) {
-					contentType = "internalClass";
-				}
-			} 
-			
-			return contentType;
-	    },
-	    isRelatedToBrowseClassGroup:function(contentType) {
-	    	return (contentType == "browseClassGroup" || contentType == "internalClass");
-	    },
-	    getContentTypeForCloning:function(contentType) {
-	    	if(contentType == "browseClassGroup" || contentType == "internalClass") {
-	    		return "browseClassGroup";
-	    	} 
-	    	return contentType;
-	    }
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+//This class is responsible for the product-specific form processing/content selection that might be possible
+//Overrides the usual behavior of selecting the specific JavaScript class needed to convert the form inputs
+//into a JSON object for submission based on the page content type
+//VIVO Specific version includes individuals for classes data getter in addition to the others
+//The internal class specific processor class is in VIVO, while all other javascript files are in Vitro
+
+var processDataGetterUtils = {
+		dataGetterProcessorMap:{"browseClassGroup": processClassGroupDataGetterContent,
+								"sparqlQuery": processSparqlDataGetterContent,
+								"fixedHtml":processFixedHTMLDataGetterContent,
+								"internalClass":processInternalClassDataGetterContent,
+								"searchIndividuals":processSearchDataGetterContent},
+	    selectDataGetterType:function(pageContentSection) {
+			var contentType = pageContentSection.attr("contentType");
+			//The form can provide "browse class group" as content type but need to check
+			//whether this is in fact individuals for classes instead
+			if(contentType == "browseClassGroup") {
+				//Is ALL NOT selected and there are other classes, pick one
+				//this SHOULD be an array
+				var allClassesSelected = pageContentSection.find("input[name='allSelected']:checked");
+				var isInternalSelected = pageContentSection.find("input[name='display-internalClass']:checked");
+				//If all NOT selected then need to pick a different content type OR if internal class selected
+				if( isInternalSelected.length > 0 || allClassesSelected.length == 0) {
+					contentType = "internalClass";
+				}
+			}
+
+			return contentType;
+	    },
+	    isRelatedToBrowseClassGroup:function(contentType) {
+	    	return (contentType == "browseClassGroup" || contentType == "internalClass");
+	    },
+	    getContentTypeForCloning:function(contentType) {
+	    	if(contentType == "browseClassGroup" || contentType == "internalClass") {
+	    		return "browseClassGroup";
+	    	}
+	    	return contentType;
+	    }
 };
diff --git a/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js
index 463af7264c..0fc46b8f88 100644
--- a/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js
+++ b/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js
@@ -1,83 +1,83 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-var processInternalClassDataGetterContent = {
-	dataGetterClass:null,
-	//can use this if expect to initialize from elsewhere
-	initProcessor:function(dataGetterClassInput) {
-		this.dataGetterClass = dataGetterClassInput;
-	},
-	//Do we need a separate content type for each of the others?
-	processPageContentSection:function(pageContentSection) {
-		//get class group
-		var classGroup = pageContentSection.find("select[name='selectClassGroup']").val();
-		//Get classes selected
-		var classesSelected = [];
-		pageContentSection.find("input[name='classInClassGroup']:checked").each(function(){
-			//Need to make sure that the class is also saved as a URI
-			classesSelected.push($(this).val());
-		});
-		//If internal class selected, include here
-		var isInternal="false";
-		//if this checkbox is checked, then isInternal should be true
-		pageContentSection.find("input[name='display-internalClass']:checked").each(function() {
-			isInternal="true";
-		});
-		//JSON Object to be returned
-		var returnObject = { classGroup: classGroup,
-				classesSelectedInClassGroup:classesSelected, 
-				isInternal:isInternal,
-				dataGetterClass:this.dataGetterClass};
-		return returnObject;
-	},
-	//For an existing set of content where form is already set, fill in the values 
-	populatePageContentSection:function(existingContentObject, pageContentSection) {
-		//select class group in dropdown and append the classes within that class group
-		processClassGroupDataGetterContent.populatePageContentSection(existingContentObject, pageContentSection);
-		var classesSelected = existingContentObject["classesSelectedInClassGroup"];
-		var numberSelected = classesSelected.length;
-		var i;
-		//Uncheck all since default is checked - but only if classesSelected is nonempty - 
-		//if no individual classes returned, then assume entire class group is selected
-		if(numberSelected > 0) {
-			pageContentSection.find("input[name='classInClassGroup']").prop("checked", null);
-			for(i = 0; i < numberSelected; i++) {
-				var classSelected = classesSelected[i];
-				pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").prop("checked", "checked");
-			}
-		}
-		//internal class
-		var isInternal = existingContentObject["isInternal"];
-		//Also internal class needs to be selected
-		if(isInternal == "true") {
-			pageContentSection.find("input[name='display-internalClass']").prop("checked", "checked");
-		} 
-		//Since this is populating content from the template, no need to "uncheck" anything
-		var results = existingContentObject["results"];
-		if(results != null && results.classGroupName != null) {
-	    	var displayInternalMessage = pageContentSection.find('label[for="display-internalClass"] em');
-	    	displayInternalMessage.filter(":first").html(results.classGroupName);
-	    	var resultsClasses = results["classes"];
-	    	if(resultsClasses != null) {
-	    		var numberClasses = resultsClasses.length;
-	    		if(numberClasses != numberSelected) {
-	    			pageContentSection.find("input[name='allSelected']").prop("checked", null);
-	    		}
-	    	}
-		}
-		
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveContentLabel:function() {
-		return processClassGroupDataGetterContent.retrieveContentLabel();
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveAdditionalLabelText:function(existingContentObject) {
-		return processClassGroupDataGetterContent.retrieveAdditionalLabelText(existingContentObject);
-
-	},
-	//Validation on form submit: Check to see that class group has been selected 
-	validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
-		return processClassGroupDataGetterContent.validateFormSubmission(pageContentSection, pageContentSectionLabel);
-	}
-		
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+var processInternalClassDataGetterContent = {
+	dataGetterClass:null,
+	//can use this if expect to initialize from elsewhere
+	initProcessor:function(dataGetterClassInput) {
+		this.dataGetterClass = dataGetterClassInput;
+	},
+	//Do we need a separate content type for each of the others?
+	processPageContentSection:function(pageContentSection) {
+		//get class group
+		var classGroup = pageContentSection.find("select[name='selectClassGroup']").val();
+		//Get classes selected
+		var classesSelected = [];
+		pageContentSection.find("input[name='classInClassGroup']:checked").each(function(){
+			//Need to make sure that the class is also saved as a URI
+			classesSelected.push($(this).val());
+		});
+		//If internal class selected, include here
+		var isInternal="false";
+		//if this checkbox is checked, then isInternal should be true
+		pageContentSection.find("input[name='display-internalClass']:checked").each(function() {
+			isInternal="true";
+		});
+		//JSON Object to be returned
+		var returnObject = { classGroup: classGroup,
+				classesSelectedInClassGroup:classesSelected,
+				isInternal:isInternal,
+				dataGetterClass:this.dataGetterClass};
+		return returnObject;
+	},
+	//For an existing set of content where form is already set, fill in the values
+	populatePageContentSection:function(existingContentObject, pageContentSection) {
+		//select class group in dropdown and append the classes within that class group
+		processClassGroupDataGetterContent.populatePageContentSection(existingContentObject, pageContentSection);
+		var classesSelected = existingContentObject["classesSelectedInClassGroup"];
+		var numberSelected = classesSelected.length;
+		var i;
+		//Uncheck all since default is checked - but only if classesSelected is nonempty -
+		//if no individual classes returned, then assume entire class group is selected
+		if(numberSelected > 0) {
+			pageContentSection.find("input[name='classInClassGroup']").prop("checked", null);
+			for(i = 0; i < numberSelected; i++) {
+				var classSelected = classesSelected[i];
+				pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").prop("checked", "checked");
+			}
+		}
+		//internal class
+		var isInternal = existingContentObject["isInternal"];
+		//Also internal class needs to be selected
+		if(isInternal == "true") {
+			pageContentSection.find("input[name='display-internalClass']").prop("checked", "checked");
+		}
+		//Since this is populating content from the template, no need to "uncheck" anything
+		var results = existingContentObject["results"];
+		if(results != null && results.classGroupName != null) {
+	    	var displayInternalMessage = pageContentSection.find('label[for="display-internalClass"] em');
+	    	displayInternalMessage.filter(":first").html(results.classGroupName);
+	    	var resultsClasses = results["classes"];
+	    	if(resultsClasses != null) {
+	    		var numberClasses = resultsClasses.length;
+	    		if(numberClasses != numberSelected) {
+	    			pageContentSection.find("input[name='allSelected']").prop("checked", null);
+	    		}
+	    	}
+		}
+
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveContentLabel:function() {
+		return processClassGroupDataGetterContent.retrieveContentLabel();
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveAdditionalLabelText:function(existingContentObject) {
+		return processClassGroupDataGetterContent.retrieveAdditionalLabelText(existingContentObject);
+
+	},
+	//Validation on form submit: Check to see that class group has been selected
+	validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
+		return processClassGroupDataGetterContent.validateFormSubmission(pageContentSection, pageContentSectionLabel);
+	}
+
 }
diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/d3v3.min.js b/webapp/src/main/webapp/js/visualization/capabilitymap/d3v3.min.js
index 8a43dea0eb..840607dad1 100644
--- a/webapp/src/main/webapp/js/visualization/capabilitymap/d3v3.min.js
+++ b/webapp/src/main/webapp/js/visualization/capabilitymap/d3v3.min.js
@@ -2,4 +2,4 @@
 },polygonEnd:function(){t.polygonEnd(),S.lineStart=r}};return S}function u(t,e,r,a,c,l,s,f,h,g,p,v,d,m){var y=s-t,M=f-e,x=y*y+M*M;if(x>4*i&&d--){var b=a+g,_=c+p,w=l+v,S=Math.sqrt(b*b+_*_+w*w),k=Math.asin(w/=S),E=ga(ga(w)-1)<Ca||ga(r-h)<Ca?(r+h)/2:Math.atan2(_,b),A=n(E,k),N=A[0],C=A[1],z=N-t,q=C-e,L=M*z-y*q;(L*L/x>i||ga((y*z+M*q)/x-.5)>.3||o>a*g+c*p+l*v)&&(u(t,e,r,a,c,l,N,C,E,b/=S,_/=S,w,d,m),m.point(N,C),u(N,C,E,b,_,w,s,f,h,g,p,v,d,m))}}var i=.5,o=Math.cos(30*Da),a=16;return t.precision=function(n){return arguments.length?(a=(i=n*n)>0&&16,t):Math.sqrt(i)},t}function tr(n){var t=nr(function(t,e){return n([t*Pa,e*Pa])});return function(n){return or(t(n))}}function er(n){this.stream=n}function rr(n,t){return{point:t,sphere:function(){n.sphere()},lineStart:function(){n.lineStart()},lineEnd:function(){n.lineEnd()},polygonStart:function(){n.polygonStart()},polygonEnd:function(){n.polygonEnd()}}}function ur(n){return ir(function(){return n})()}function ir(n){function t(n){return n=a(n[0]*Da,n[1]*Da),[n[0]*h+c,l-n[1]*h]}function e(n){return n=a.invert((n[0]-c)/h,(l-n[1])/h),n&&[n[0]*Pa,n[1]*Pa]}function r(){a=Ae(o=lr(m,M,x),i);var n=i(v,d);return c=g-n[0]*h,l=p+n[1]*h,u()}function u(){return s&&(s.valid=!1,s=null),t}var i,o,a,c,l,s,f=nr(function(n,t){return n=i(n,t),[n[0]*h+c,l-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,M=0,x=0,b=Lc,_=y,w=null,S=null;return t.stream=function(n){return s&&(s.valid=!1),s=or(b(o,f(_(n)))),s.valid=!0,s},t.clipAngle=function(n){return arguments.length?(b=null==n?(w=n,Lc):He((w=+n)*Da),u()):w},t.clipExtent=function(n){return arguments.length?(S=n,_=n?Ie(n[0][0],n[0][1],n[1][0],n[1][1]):y,u()):S},t.scale=function(n){return arguments.length?(h=+n,r()):h},t.translate=function(n){return arguments.length?(g=+n[0],p=+n[1],r()):[g,p]},t.center=function(n){return arguments.length?(v=n[0]%360*Da,d=n[1]%360*Da,r()):[v*Pa,d*Pa]},t.rotate=function(n){return arguments.length?(m=n[0]%360*Da,M=n[1]%360*Da,x=n.length>2?n[2]%360*Da:0,r()):[m*Pa,M*Pa,x*Pa]},ta.rebind(t,f,"precision"),function(){return i=n.apply(this,arguments),t.invert=i.invert&&e,r()}}function or(n){return rr(n,function(t,e){n.point(t*Da,e*Da)})}function ar(n,t){return[n,t]}function cr(n,t){return[n>qa?n-La:-qa>n?n+La:n,t]}function lr(n,t,e){return n?t||e?Ae(fr(n),hr(t,e)):fr(n):t||e?hr(t,e):cr}function sr(n){return function(t,e){return t+=n,[t>qa?t-La:-qa>t?t+La:t,e]}}function fr(n){var t=sr(n);return t.invert=sr(-n),t}function hr(n,t){function e(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*r+a*u;return[Math.atan2(c*i-s*o,a*r-l*u),tt(s*i+c*o)]}var r=Math.cos(n),u=Math.sin(n),i=Math.cos(t),o=Math.sin(t);return e.invert=function(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*i-c*o;return[Math.atan2(c*i+l*o,a*r+s*u),tt(s*r-a*u)]},e}function gr(n,t){var e=Math.cos(n),r=Math.sin(n);return function(u,i,o,a){var c=o*t;null!=u?(u=pr(e,u),i=pr(e,i),(o>0?i>u:u>i)&&(u+=o*La)):(u=n+o*La,i=n-.5*c);for(var l,s=u;o>0?s>i:i>s;s-=c)a.point((l=xe([e,-r*Math.cos(s),-r*Math.sin(s)]))[0],l[1])}}function pr(n,t){var e=pe(t);e[0]-=n,Me(e);var r=nt(-e[1]);return((-e[2]<0?-r:r)+2*Math.PI-Ca)%(2*Math.PI)}function vr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[n,t]})}}function dr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[t,n]})}}function mr(n){return n.source}function yr(n){return n.target}function Mr(n,t,e,r){var u=Math.cos(t),i=Math.sin(t),o=Math.cos(r),a=Math.sin(r),c=u*Math.cos(n),l=u*Math.sin(n),s=o*Math.cos(e),f=o*Math.sin(e),h=2*Math.asin(Math.sqrt(it(r-t)+u*o*it(e-n))),g=1/Math.sin(h),p=h?function(n){var t=Math.sin(n*=h)*g,e=Math.sin(h-n)*g,r=e*c+t*s,u=e*l+t*f,o=e*i+t*a;return[Math.atan2(u,r)*Pa,Math.atan2(o,Math.sqrt(r*r+u*u))*Pa]}:function(){return[n*Pa,t*Pa]};return p.distance=h,p}function xr(){function n(n,u){var i=Math.sin(u*=Da),o=Math.cos(u),a=ga((n*=Da)-t),c=Math.cos(a);Yc+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=r*i-e*o*c)*a),e*i+r*o*c),t=n,e=i,r=o}var t,e,r;Zc.point=function(u,i){t=u*Da,e=Math.sin(i*=Da),r=Math.cos(i),Zc.point=n},Zc.lineEnd=function(){Zc.point=Zc.lineEnd=b}}function br(n,t){function e(t,e){var r=Math.cos(t),u=Math.cos(e),i=n(r*u);return[i*u*Math.sin(t),i*Math.sin(e)]}return e.invert=function(n,e){var r=Math.sqrt(n*n+e*e),u=t(r),i=Math.sin(u),o=Math.cos(u);return[Math.atan2(n*i,r*o),Math.asin(r&&e*i/r)]},e}function _r(n,t){function e(n,t){o>0?-Ra+Ca>t&&(t=-Ra+Ca):t>Ra-Ca&&(t=Ra-Ca);var e=o/Math.pow(u(t),i);return[e*Math.sin(i*n),o-e*Math.cos(i*n)]}var r=Math.cos(n),u=function(n){return Math.tan(qa/4+n/2)},i=n===t?Math.sin(n):Math.log(r/Math.cos(t))/Math.log(u(t)/u(n)),o=r*Math.pow(u(n),i)/i;return i?(e.invert=function(n,t){var e=o-t,r=K(i)*Math.sqrt(n*n+e*e);return[Math.atan2(n,e)/i,2*Math.atan(Math.pow(o/r,1/i))-Ra]},e):Sr}function wr(n,t){function e(n,t){var e=i-t;return[e*Math.sin(u*n),i-e*Math.cos(u*n)]}var r=Math.cos(n),u=n===t?Math.sin(n):(r-Math.cos(t))/(t-n),i=r/u+n;return ga(u)<Ca?ar:(e.invert=function(n,t){var e=i-t;return[Math.atan2(n,e)/u,i-K(u)*Math.sqrt(n*n+e*e)]},e)}function Sr(n,t){return[n,Math.log(Math.tan(qa/4+t/2))]}function kr(n){var t,e=ur(n),r=e.scale,u=e.translate,i=e.clipExtent;return e.scale=function(){var n=r.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.translate=function(){var n=u.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.clipExtent=function(n){var o=i.apply(e,arguments);if(o===e){if(t=null==n){var a=qa*r(),c=u();i([[c[0]-a,c[1]-a],[c[0]+a,c[1]+a]])}}else t&&(o=null);return o},e.clipExtent(null)}function Er(n,t){return[Math.log(Math.tan(qa/4+t/2)),-n]}function Ar(n){return n[0]}function Nr(n){return n[1]}function Cr(n){for(var t=n.length,e=[0,1],r=2,u=2;t>u;u++){for(;r>1&&Q(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function zr(n,t){return n[0]-t[0]||n[1]-t[1]}function qr(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function Lr(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,c=n[1],l=e[1],s=t[1]-c,f=r[1]-l,h=(a*(c-l)-f*(u-i))/(f*o-a*s);return[u+h*o,c+h*s]}function Tr(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function Rr(){tu(this),this.edge=this.site=this.circle=null}function Dr(n){var t=el.pop()||new Rr;return t.site=n,t}function Pr(n){Xr(n),Qc.remove(n),el.push(n),tu(n)}function Ur(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];Pr(n);for(var c=i;c.circle&&ga(e-c.circle.x)<Ca&&ga(r-c.circle.cy)<Ca;)i=c.P,a.unshift(c),Pr(c),c=i;a.unshift(c),Xr(c);for(var l=o;l.circle&&ga(e-l.circle.x)<Ca&&ga(r-l.circle.cy)<Ca;)o=l.N,a.push(l),Pr(l),l=o;a.push(l),Xr(l);var s,f=a.length;for(s=1;f>s;++s)l=a[s],c=a[s-1],Kr(l.edge,c.site,l.site,u);c=a[0],l=a[f-1],l.edge=Jr(c.site,l.site,null,u),Vr(c),Vr(l)}function jr(n){for(var t,e,r,u,i=n.x,o=n.y,a=Qc._;a;)if(r=Fr(a,o)-i,r>Ca)a=a.L;else{if(u=i-Hr(a,o),!(u>Ca)){r>-Ca?(t=a.P,e=a):u>-Ca?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var c=Dr(n);if(Qc.insert(t,c),t||e){if(t===e)return Xr(t),e=Dr(t.site),Qc.insert(c,e),c.edge=e.edge=Jr(t.site,c.site),Vr(t),void Vr(e);if(!e)return void(c.edge=Jr(t.site,c.site));Xr(t),Xr(e);var l=t.site,s=l.x,f=l.y,h=n.x-s,g=n.y-f,p=e.site,v=p.x-s,d=p.y-f,m=2*(h*d-g*v),y=h*h+g*g,M=v*v+d*d,x={x:(d*y-g*M)/m+s,y:(h*M-v*y)/m+f};Kr(e.edge,l,p,x),c.edge=Jr(l,n,null,x),e.edge=Jr(n,p,null,x),Vr(t),Vr(e)}}function Fr(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-1/0;e=o.site;var a=e.x,c=e.y,l=c-t;if(!l)return a;var s=a-r,f=1/i-1/l,h=s/l;return f?(-h+Math.sqrt(h*h-2*f*(s*s/(-2*l)-c+l/2+u-i/2)))/f+r:(r+a)/2}function Hr(n,t){var e=n.N;if(e)return Fr(e,t);var r=n.site;return r.y===t?r.x:1/0}function Or(n){this.site=n,this.edges=[]}function Ir(n){for(var t,e,r,u,i,o,a,c,l,s,f=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],v=Kc,d=v.length;d--;)if(i=v[d],i&&i.prepare())for(a=i.edges,c=a.length,o=0;c>o;)s=a[o].end(),r=s.x,u=s.y,l=a[++o%c].start(),t=l.x,e=l.y,(ga(r-t)>Ca||ga(u-e)>Ca)&&(a.splice(o,0,new Qr(Gr(i.site,s,ga(r-f)<Ca&&p-u>Ca?{x:f,y:ga(t-f)<Ca?e:p}:ga(u-p)<Ca&&h-r>Ca?{x:ga(e-p)<Ca?t:h,y:p}:ga(r-h)<Ca&&u-g>Ca?{x:h,y:ga(t-h)<Ca?e:g}:ga(u-g)<Ca&&r-f>Ca?{x:ga(e-g)<Ca?t:f,y:g}:null),i.site,null)),++c)}function Yr(n,t){return t.angle-n.angle}function Zr(){tu(this),this.x=this.y=this.arc=this.site=this.cy=null}function Vr(n){var t=n.P,e=n.N;if(t&&e){var r=t.site,u=n.site,i=e.site;if(r!==i){var o=u.x,a=u.y,c=r.x-o,l=r.y-a,s=i.x-o,f=i.y-a,h=2*(c*f-l*s);if(!(h>=-za)){var g=c*c+l*l,p=s*s+f*f,v=(f*g-l*p)/h,d=(c*p-s*g)/h,f=d+a,m=rl.pop()||new Zr;m.arc=n,m.site=u,m.x=v+o,m.y=f+Math.sqrt(v*v+d*d),m.cy=f,n.circle=m;for(var y=null,M=tl._;M;)if(m.y<M.y||m.y===M.y&&m.x<=M.x){if(!M.L){y=M.P;break}M=M.L}else{if(!M.R){y=M;break}M=M.R}tl.insert(y,m),y||(nl=m)}}}}function Xr(n){var t=n.circle;t&&(t.P||(nl=t.N),tl.remove(t),rl.push(t),tu(t),n.circle=null)}function $r(n){for(var t,e=Gc,r=Oe(n[0][0],n[0][1],n[1][0],n[1][1]),u=e.length;u--;)t=e[u],(!Br(t,n)||!r(t)||ga(t.a.x-t.b.x)<Ca&&ga(t.a.y-t.b.y)<Ca)&&(t.a=t.b=null,e.splice(u,1))}function Br(n,t){var e=n.b;if(e)return!0;var r,u,i=n.a,o=t[0][0],a=t[1][0],c=t[0][1],l=t[1][1],s=n.l,f=n.r,h=s.x,g=s.y,p=f.x,v=f.y,d=(h+p)/2,m=(g+v)/2;if(v===g){if(o>d||d>=a)return;if(h>p){if(i){if(i.y>=l)return}else i={x:d,y:c};e={x:d,y:l}}else{if(i){if(i.y<c)return}else i={x:d,y:l};e={x:d,y:c}}}else if(r=(h-p)/(v-g),u=m-r*d,-1>r||r>1)if(h>p){if(i){if(i.y>=l)return}else i={x:(c-u)/r,y:c};e={x:(l-u)/r,y:l}}else{if(i){if(i.y<c)return}else i={x:(l-u)/r,y:l};e={x:(c-u)/r,y:c}}else if(v>g){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.x<o)return}else i={x:a,y:r*a+u};e={x:o,y:r*o+u}}return n.a=i,n.b=e,!0}function Wr(n,t){this.l=n,this.r=t,this.a=this.b=null}function Jr(n,t,e,r){var u=new Wr(n,t);return Gc.push(u),e&&Kr(u,n,t,e),r&&Kr(u,t,n,r),Kc[n.i].edges.push(new Qr(u,n,t)),Kc[t.i].edges.push(new Qr(u,t,n)),u}function Gr(n,t,e){var r=new Wr(n,null);return r.a=t,r.b=e,Gc.push(r),r}function Kr(n,t,e,r){n.a||n.b?n.l===e?n.b=r:n.a=r:(n.a=r,n.l=t,n.r=e)}function Qr(n,t,e){var r=n.a,u=n.b;this.edge=n,this.site=t,this.angle=e?Math.atan2(e.y-t.y,e.x-t.x):n.l===t?Math.atan2(u.x-r.x,r.y-u.y):Math.atan2(r.x-u.x,u.y-r.y)}function nu(){this._=null}function tu(n){n.U=n.C=n.L=n.R=n.P=n.N=null}function eu(n,t){var e=t,r=t.R,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function ru(n,t){var e=t,r=t.L,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function uu(n){for(;n.L;)n=n.L;return n}function iu(n,t){var e,r,u,i=n.sort(ou).pop();for(Gc=[],Kc=new Array(n.length),Qc=new nu,tl=new nu;;)if(u=nl,i&&(!u||i.y<u.y||i.y===u.y&&i.x<u.x))(i.x!==e||i.y!==r)&&(Kc[i.i]=new Or(i),jr(i),e=i.x,r=i.y),i=n.pop();else{if(!u)break;Ur(u.arc)}t&&($r(t),Ir(t));var o={cells:Kc,edges:Gc};return Qc=tl=Gc=Kc=null,o}function ou(n,t){return t.y-n.y||t.x-n.x}function au(n,t,e){return(n.x-e.x)*(t.y-n.y)-(n.x-t.x)*(e.y-n.y)}function cu(n){return n.x}function lu(n){return n.y}function su(){return{leaf:!0,nodes:[],point:null,x:null,y:null}}function fu(n,t,e,r,u,i){if(!n(t,e,r,u,i)){var o=.5*(e+u),a=.5*(r+i),c=t.nodes;c[0]&&fu(n,c[0],e,r,o,a),c[1]&&fu(n,c[1],o,r,u,a),c[2]&&fu(n,c[2],e,a,o,i),c[3]&&fu(n,c[3],o,a,u,i)}}function hu(n,t,e,r,u,i,o){var a,c=1/0;return function l(n,s,f,h,g){if(!(s>i||f>o||r>h||u>g)){if(p=n.point){var p,v=t-n.x,d=e-n.y,m=v*v+d*d;if(c>m){var y=Math.sqrt(c=m);r=t-y,u=e-y,i=t+y,o=e+y,a=p}}for(var M=n.nodes,x=.5*(s+h),b=.5*(f+g),_=t>=x,w=e>=b,S=w<<1|_,k=S+4;k>S;++S)if(n=M[3&S])switch(3&S){case 0:l(n,s,f,x,b);break;case 1:l(n,x,f,h,b);break;case 2:l(n,s,b,x,g);break;case 3:l(n,x,b,h,g)}}}(n,r,u,i,o),a}function gu(n,t){n=ta.rgb(n),t=ta.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+xt(Math.round(e+i*n))+xt(Math.round(r+o*n))+xt(Math.round(u+a*n))}}function pu(n,t){var e,r={},u={};for(e in n)e in t?r[e]=mu(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function vu(n,t){return n=+n,t=+t,function(e){return n*(1-e)+t*e}}function du(n,t){var e,r,u,i=il.lastIndex=ol.lastIndex=0,o=-1,a=[],c=[];for(n+="",t+="";(e=il.exec(n))&&(r=ol.exec(t));)(u=r.index)>i&&(u=t.slice(i,u),a[o]?a[o]+=u:a[++o]=u),(e=e[0])===(r=r[0])?a[o]?a[o]+=r:a[++o]=r:(a[++o]=null,c.push({i:o,x:vu(e,r)})),i=ol.lastIndex;return i<t.length&&(u=t.slice(i),a[o]?a[o]+=u:a[++o]=u),a.length<2?c[0]?(t=c[0].x,function(n){return t(n)+""}):function(){return t}:(t=c.length,function(n){for(var e,r=0;t>r;++r)a[(e=c[r]).i]=e.x(n);return a.join("")})}function mu(n,t){for(var e,r=ta.interpolators.length;--r>=0&&!(e=ta.interpolators[r](n,t)););return e}function yu(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(mu(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function Mu(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function xu(n){return function(t){return 1-n(1-t)}}function bu(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function _u(n){return n*n}function wu(n){return n*n*n}function Su(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function ku(n){return function(t){return Math.pow(t,n)}}function Eu(n){return 1-Math.cos(n*Ra)}function Au(n){return Math.pow(2,10*(n-1))}function Nu(n){return 1-Math.sqrt(1-n*n)}function Cu(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/La*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*La/t)}}function zu(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function qu(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function Lu(n,t){n=ta.hcl(n),t=ta.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return st(e+i*n,r+o*n,u+a*n)+""}}function Tu(n,t){n=ta.hsl(n),t=ta.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return ct(e+i*n,r+o*n,u+a*n)+""}}function Ru(n,t){n=ta.lab(n),t=ta.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return ht(e+i*n,r+o*n,u+a*n)+""}}function Du(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function Pu(n){var t=[n.a,n.b],e=[n.c,n.d],r=ju(t),u=Uu(t,e),i=ju(Fu(e,t,-u))||0;t[0]*e[1]<e[0]*t[1]&&(t[0]*=-1,t[1]*=-1,r*=-1,u*=-1),this.rotate=(r?Math.atan2(t[1],t[0]):Math.atan2(-e[0],e[1]))*Pa,this.translate=[n.e,n.f],this.scale=[r,i],this.skew=i?Math.atan2(u,i)*Pa:0}function Uu(n,t){return n[0]*t[0]+n[1]*t[1]}function ju(n){var t=Math.sqrt(Uu(n,n));return t&&(n[0]/=t,n[1]/=t),t}function Fu(n,t,e){return n[0]+=e*t[0],n[1]+=e*t[1],n}function Hu(n,t){var e,r=[],u=[],i=ta.transform(n),o=ta.transform(t),a=i.translate,c=o.translate,l=i.rotate,s=o.rotate,f=i.skew,h=o.skew,g=i.scale,p=o.scale;return a[0]!=c[0]||a[1]!=c[1]?(r.push("translate(",null,",",null,")"),u.push({i:1,x:vu(a[0],c[0])},{i:3,x:vu(a[1],c[1])})):r.push(c[0]||c[1]?"translate("+c+")":""),l!=s?(l-s>180?s+=360:s-l>180&&(l+=360),u.push({i:r.push(r.pop()+"rotate(",null,")")-2,x:vu(l,s)})):s&&r.push(r.pop()+"rotate("+s+")"),f!=h?u.push({i:r.push(r.pop()+"skewX(",null,")")-2,x:vu(f,h)}):h&&r.push(r.pop()+"skewX("+h+")"),g[0]!=p[0]||g[1]!=p[1]?(e=r.push(r.pop()+"scale(",null,",",null,")"),u.push({i:e-4,x:vu(g[0],p[0])},{i:e-2,x:vu(g[1],p[1])})):(1!=p[0]||1!=p[1])&&r.push(r.pop()+"scale("+p+")"),e=u.length,function(n){for(var t,i=-1;++i<e;)r[(t=u[i]).i]=t.x(n);return r.join("")}}function Ou(n,t){return t=(t-=n=+n)||1/t,function(e){return(e-n)/t}}function Iu(n,t){return t=(t-=n=+n)||1/t,function(e){return Math.max(0,Math.min(1,(e-n)/t))}}function Yu(n){for(var t=n.source,e=n.target,r=Vu(t,e),u=[t];t!==r;)t=t.parent,u.push(t);for(var i=u.length;e!==r;)u.splice(i,0,e),e=e.parent;return u}function Zu(n){for(var t=[],e=n.parent;null!=e;)t.push(n),n=e,e=e.parent;return t.push(n),t}function Vu(n,t){if(n===t)return n;for(var e=Zu(n),r=Zu(t),u=e.pop(),i=r.pop(),o=null;u===i;)o=u,u=e.pop(),i=r.pop();return o}function Xu(n){n.fixed|=2}function $u(n){n.fixed&=-7}function Bu(n){n.fixed|=4,n.px=n.x,n.py=n.y}function Wu(n){n.fixed&=-5}function Ju(n,t,e){var r=0,u=0;if(n.charge=0,!n.leaf)for(var i,o=n.nodes,a=o.length,c=-1;++c<a;)i=o[c],null!=i&&(Ju(i,t,e),n.charge+=i.charge,r+=i.charge*i.cx,u+=i.charge*i.cy);if(n.point){n.leaf||(n.point.x+=Math.random()-.5,n.point.y+=Math.random()-.5);var l=t*e[n.point.index];n.charge+=n.pointCharge=l,r+=l*n.point.x,u+=l*n.point.y}n.cx=r/n.charge,n.cy=u/n.charge}function Gu(n,t){return ta.rebind(n,t,"sort","children","value"),n.nodes=n,n.links=ri,n}function Ku(n,t){for(var e=[n];null!=(n=e.pop());)if(t(n),(u=n.children)&&(r=u.length))for(var r,u;--r>=0;)e.push(u[r])}function Qu(n,t){for(var e=[n],r=[];null!=(n=e.pop());)if(r.push(n),(i=n.children)&&(u=i.length))for(var u,i,o=-1;++o<u;)e.push(i[o]);for(;null!=(n=r.pop());)t(n)}function ni(n){return n.children}function ti(n){return n.value}function ei(n,t){return t.value-n.value}function ri(n){return ta.merge(n.map(function(n){return(n.children||[]).map(function(t){return{source:n,target:t}})}))}function ui(n){return n.x}function ii(n){return n.y}function oi(n,t,e){n.y0=t,n.y=e}function ai(n){return ta.range(n.length)}function ci(n){for(var t=-1,e=n[0].length,r=[];++t<e;)r[t]=0;return r}function li(n){for(var t,e=1,r=0,u=n[0][1],i=n.length;i>e;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function si(n){return n.reduce(fi,0)}function fi(n,t){return n+t[1]}function hi(n,t){return gi(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function gi(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function pi(n){return[ta.min(n),ta.max(n)]}function vi(n,t){return n.value-t.value}function di(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function mi(n,t){n._pack_next=t,t._pack_prev=n}function yi(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function Mi(n){function t(n){s=Math.min(n.x-n.r,s),f=Math.max(n.x+n.r,f),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(l=e.length)){var e,r,u,i,o,a,c,l,s=1/0,f=-1/0,h=1/0,g=-1/0;if(e.forEach(xi),r=e[0],r.x=-r.r,r.y=0,t(r),l>1&&(u=e[1],u.x=u.r,u.y=0,t(u),l>2))for(i=e[2],wi(r,u,i),t(i),di(r,i),r._pack_prev=i,di(i,u),u=r._pack_next,o=3;l>o;o++){wi(r,u,i=e[o]);var p=0,v=1,d=1;for(a=u._pack_next;a!==u;a=a._pack_next,v++)if(yi(a,i)){p=1;break}if(1==p)for(c=r._pack_prev;c!==a._pack_prev&&!yi(c,i);c=c._pack_prev,d++);p?(d>v||v==d&&u.r<r.r?mi(r,u=a):mi(r=c,u),o--):(di(r,i),u=i,t(i))}var m=(s+f)/2,y=(h+g)/2,M=0;for(o=0;l>o;o++)i=e[o],i.x-=m,i.y-=y,M=Math.max(M,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=M,e.forEach(bi)}}function xi(n){n._pack_next=n._pack_prev=n}function bi(n){delete n._pack_next,delete n._pack_prev}function _i(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i<o;)_i(u[i],t,e,r)}function wi(n,t,e){var r=n.r+e.r,u=t.x-n.x,i=t.y-n.y;if(r&&(u||i)){var o=t.r+e.r,a=u*u+i*i;o*=o,r*=r;var c=.5+(r-o)/(2*a),l=Math.sqrt(Math.max(0,2*o*(r+a)-(r-=a)*r-o*o))/(2*a);e.x=n.x+c*u+l*i,e.y=n.y+c*i-l*u}else e.x=n.x+r,e.y=n.y}function Si(n,t){return n.parent==t.parent?1:2}function ki(n){var t=n.children;return t.length?t[0]:n.t}function Ei(n){var t,e=n.children;return(t=e.length)?e[t-1]:n.t}function Ai(n,t,e){var r=e/(t.i-n.i);t.c-=r,t.s+=e,n.c+=r,t.z+=e,t.m+=e}function Ni(n){for(var t,e=0,r=0,u=n.children,i=u.length;--i>=0;)t=u[i],t.z+=e,t.m+=e,e+=t.s+(r+=t.c)}function Ci(n,t,e){return n.a.parent===t.parent?n.a:e}function zi(n){return 1+ta.max(n,function(n){return n.y})}function qi(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function Li(n){var t=n.children;return t&&t.length?Li(t[0]):n}function Ti(n){var t,e=n.children;return e&&(t=e.length)?Ti(e[t-1]):n}function Ri(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function Di(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function Pi(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function Ui(n){return n.rangeExtent?n.rangeExtent():Pi(n.range())}function ji(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Fi(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Hi(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ml}function Oi(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]<n[0]&&(n=n.slice().reverse(),t=t.slice().reverse());++o<=a;)u.push(e(n[o-1],n[o])),i.push(r(t[o-1],t[o]));return function(t){var e=ta.bisect(n,t,1,a)-1;return i[e](u[e](t))}}function Ii(n,t,e,r){function u(){var u=Math.min(n.length,t.length)>2?Oi:ji,c=r?Iu:Ou;return o=u(n,t,c,e),a=u(t,n,c,mu),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(Du)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return Xi(n,t)},i.tickFormat=function(t,e){return $i(n,t,e)},i.nice=function(t){return Zi(n,t),u()},i.copy=function(){return Ii(n,t,e,r)},u()}function Yi(n,t){return ta.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Zi(n,t){return Fi(n,Hi(Vi(n,t)[2]))}function Vi(n,t){null==t&&(t=10);var e=Pi(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function Xi(n,t){return ta.range.apply(ta,Vi(n,t))}function $i(n,t,e){var r=Vi(n,t);if(e){var u=ic.exec(e);if(u.shift(),"s"===u[8]){var i=ta.formatPrefix(Math.max(ga(r[0]),ga(r[1])));return u[7]||(u[7]="."+Bi(i.scale(r[2]))),u[8]="f",e=ta.format(u.join("")),function(n){return e(i.scale(n))+i.symbol}}u[7]||(u[7]="."+Wi(u[8],r)),e=u.join("")}else e=",."+Bi(r[2])+"f";return ta.format(e)}function Bi(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Wi(n,t){var e=Bi(t[2]);return n in yl?Math.abs(e-Bi(Math.max(ga(t[0]),ga(t[1]))))+ +("e"!==n):e-2*("%"===n)}function Ji(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Fi(r.map(u),e?Math:xl);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=Pi(r),o=[],a=n[0],c=n[1],l=Math.floor(u(a)),s=Math.ceil(u(c)),f=t%1?2:t;if(isFinite(s-l)){if(e){for(;s>l;l++)for(var h=1;f>h;h++)o.push(i(l)*h);o.push(i(l))}else for(o.push(i(l));l++<s;)for(var h=f-1;h>0;h--)o.push(i(l)*h);for(l=0;o[l]<a;l++);for(s=o.length;o[s-1]>c;s--);o=o.slice(l,s)}return o},o.tickFormat=function(n,t){if(!arguments.length)return Ml;arguments.length<2?t=Ml:"function"!=typeof t&&(t=ta.format(t));var r,a=Math.max(.1,n/o.ticks().length),c=e?(r=1e-12,Math.ceil):(r=-1e-12,Math.floor);return function(n){return n/i(c(u(n)+r))<=a?t(n):""}},o.copy=function(){return Ji(n.copy(),t,e,r)},Yi(o,n)}function Gi(n,t,e){function r(t){return n(u(t))}var u=Ki(t),i=Ki(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return Xi(e,n)},r.tickFormat=function(n,t){return $i(e,n,t)},r.nice=function(n){return r.domain(Zi(e,n))},r.exponent=function(o){return arguments.length?(u=Ki(t=o),i=Ki(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Gi(n.copy(),t,e)},Yi(r,n)}function Ki(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Qi(n,t){function e(e){return i[((u.get(e)||("range"===t.t?u.set(e,n.push(e)):0/0))-1)%i.length]}function r(t,e){return ta.range(n.length).map(function(n){return t+e*n})}var u,i,o;return e.domain=function(r){if(!arguments.length)return n;n=[],u=new l;for(var i,o=-1,a=r.length;++o<a;)u.has(i=r[o])||u.set(i,n.push(i));return e[t.t].apply(e,t.a)},e.range=function(n){return arguments.length?(i=n,o=0,t={t:"range",a:arguments},e):i},e.rangePoints=function(u,a){arguments.length<2&&(a=0);var c=u[0],l=u[1],s=n.length<2?(c=(c+l)/2,0):(l-c)/(n.length-1+a);return i=r(c+s*a/2,s),o=0,t={t:"rangePoints",a:arguments},e},e.rangeRoundPoints=function(u,a){arguments.length<2&&(a=0);var c=u[0],l=u[1],s=n.length<2?(c=l=Math.round((c+l)/2),0):(l-c)/(n.length-1+a)|0;return i=r(c+Math.round(s*a/2+(l-c-(n.length-1+a)*s)/2),s),o=0,t={t:"rangeRoundPoints",a:arguments},e},e.rangeBands=function(u,a,c){arguments.length<2&&(a=0),arguments.length<3&&(c=a);var l=u[1]<u[0],s=u[l-0],f=u[1-l],h=(f-s)/(n.length-a+2*c);return i=r(s+h*c,h),l&&i.reverse(),o=h*(1-a),t={t:"rangeBands",a:arguments},e},e.rangeRoundBands=function(u,a,c){arguments.length<2&&(a=0),arguments.length<3&&(c=a);var l=u[1]<u[0],s=u[l-0],f=u[1-l],h=Math.floor((f-s)/(n.length-a+2*c));return i=r(s+Math.round((f-s-(n.length-a)*h)/2),h),l&&i.reverse(),o=Math.round(h*(1-a)),t={t:"rangeRoundBands",a:arguments},e},e.rangeBand=function(){return o},e.rangeExtent=function(){return Pi(t.a[0])},e.copy=function(){return Qi(n,t)},e.domain(n)}function no(n,t){function i(){var e=0,r=t.length;for(a=[];++e<r;)a[e-1]=ta.quantile(n,e/r);return o}function o(n){return isNaN(n=+n)?void 0:t[ta.bisect(a,n)]}var a;return o.domain=function(t){return arguments.length?(n=t.map(r).filter(u).sort(e),i()):n},o.range=function(n){return arguments.length?(t=n,i()):t},o.quantiles=function(){return a},o.invertExtent=function(e){return e=t.indexOf(e),0>e?[0/0,0/0]:[e>0?a[e-1]:n[0],e<a.length?a[e]:n[n.length-1]]},o.copy=function(){return no(n,t)},i()}function to(n,t,e){function r(t){return e[Math.max(0,Math.min(o,Math.floor(i*(t-n))))]}function u(){return i=e.length/(t-n),o=e.length-1,r}var i,o;return r.domain=function(e){return arguments.length?(n=+e[0],t=+e[e.length-1],u()):[n,t]},r.range=function(n){return arguments.length?(e=n,u()):e},r.invertExtent=function(t){return t=e.indexOf(t),t=0>t?0/0:t/i+n,[t,t+1/i]},r.copy=function(){return to(n,t,e)},u()}function eo(n,t){function e(e){return e>=e?t[ta.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return eo(n,t)},e}function ro(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return Xi(n,t)},t.tickFormat=function(t,e){return $i(n,t,e)},t.copy=function(){return ro(n)},t}function uo(){return 0}function io(n){return n.innerRadius}function oo(n){return n.outerRadius}function ao(n){return n.startAngle}function co(n){return n.endAngle}function lo(n){return n&&n.padAngle}function so(n,t,e,r){return(n-e)*t-(t-r)*n>0?0:1}function fo(n,t,e,r,u){var i=n[0]-t[0],o=n[1]-t[1],a=(u?r:-r)/Math.sqrt(i*i+o*o),c=a*o,l=-a*i,s=n[0]+c,f=n[1]+l,h=t[0]+c,g=t[1]+l,p=(s+h)/2,v=(f+g)/2,d=h-s,m=g-f,y=d*d+m*m,M=e-r,x=s*g-h*f,b=(0>m?-1:1)*Math.sqrt(M*M*y-x*x),_=(x*m-d*b)/y,w=(-x*d-m*b)/y,S=(x*m+d*b)/y,k=(-x*d+m*b)/y,E=_-p,A=w-v,N=S-p,C=k-v;return E*E+A*A>N*N+C*C&&(_=S,w=k),[[_-c,w-l],[_*e/M,w*e/M]]}function ho(n){function t(t){function o(){l.push("M",i(n(s),a))}for(var c,l=[],s=[],f=-1,h=t.length,g=Et(e),p=Et(r);++f<h;)u.call(this,c=t[f],f)?s.push([+g.call(this,c,f),+p.call(this,c,f)]):s.length&&(o(),s=[]);return s.length&&o(),l.length?l.join(""):null}var e=Ar,r=Nr,u=Ne,i=go,o=i.key,a=.7;return t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t.defined=function(n){return arguments.length?(u=n,t):u},t.interpolate=function(n){return arguments.length?(o="function"==typeof n?i=n:(i=El.get(n)||go).key,t):o},t.tension=function(n){return arguments.length?(a=n,t):a},t}function go(n){return n.join("L")}function po(n){return go(n)+"Z"}function vo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r[0]+(r=n[t])[0])/2,"V",r[1]);return e>1&&u.push("H",r[0]),u.join("")}function mo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("V",(r=n[t])[1],"H",r[0]);return u.join("")}function yo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r=n[t])[0],"V",r[1]);return u.join("")}function Mo(n,t){return n.length<4?go(n):n[1]+_o(n.slice(1,-1),wo(n,t))}function xo(n,t){return n.length<3?go(n):n[0]+_o((n.push(n[0]),n),wo([n[n.length-2]].concat(n,[n[1]]),t))}function bo(n,t){return n.length<3?go(n):n[0]+_o(n,wo(n,t))}function _o(n,t){if(t.length<1||n.length!=t.length&&n.length!=t.length+2)return go(n);var e=n.length!=t.length,r="",u=n[0],i=n[1],o=t[0],a=o,c=1;if(e&&(r+="Q"+(i[0]-2*o[0]/3)+","+(i[1]-2*o[1]/3)+","+i[0]+","+i[1],u=n[1],c=2),t.length>1){a=t[1],i=n[c],c++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var l=2;l<t.length;l++,c++)i=n[c],a=t[l],r+="S"+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1]}if(e){var s=n[c];r+="Q"+(i[0]+2*a[0]/3)+","+(i[1]+2*a[1]/3)+","+s[0]+","+s[1]}return r}function wo(n,t){for(var e,r=[],u=(1-t)/2,i=n[0],o=n[1],a=1,c=n.length;++a<c;)e=i,i=o,o=n[a],r.push([u*(o[0]-e[0]),u*(o[1]-e[1])]);return r}function So(n){if(n.length<3)return go(n);var t=1,e=n.length,r=n[0],u=r[0],i=r[1],o=[u,u,u,(r=n[1])[0]],a=[i,i,i,r[1]],c=[u,",",i,"L",No(Cl,o),",",No(Cl,a)];for(n.push(n[e-1]);++t<=e;)r=n[t],o.shift(),o.push(r[0]),a.shift(),a.push(r[1]),Co(c,o,a);return n.pop(),c.push("L",r),c.join("")}function ko(n){if(n.length<4)return go(n);for(var t,e=[],r=-1,u=n.length,i=[0],o=[0];++r<3;)t=n[r],i.push(t[0]),o.push(t[1]);for(e.push(No(Cl,i)+","+No(Cl,o)),--r;++r<u;)t=n[r],i.shift(),i.push(t[0]),o.shift(),o.push(t[1]),Co(e,i,o);return e.join("")}function Eo(n){for(var t,e,r=-1,u=n.length,i=u+4,o=[],a=[];++r<4;)e=n[r%u],o.push(e[0]),a.push(e[1]);for(t=[No(Cl,o),",",No(Cl,a)],--r;++r<i;)e=n[r%u],o.shift(),o.push(e[0]),a.shift(),a.push(e[1]),Co(t,o,a);return t.join("")}function Ao(n,t){var e=n.length-1;if(e)for(var r,u,i=n[0][0],o=n[0][1],a=n[e][0]-i,c=n[e][1]-o,l=-1;++l<=e;)r=n[l],u=l/e,r[0]=t*r[0]+(1-t)*(i+u*a),r[1]=t*r[1]+(1-t)*(o+u*c);return So(n)}function No(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]+n[3]*t[3]}function Co(n,t,e){n.push("C",No(Al,t),",",No(Al,e),",",No(Nl,t),",",No(Nl,e),",",No(Cl,t),",",No(Cl,e))}function zo(n,t){return(t[1]-n[1])/(t[0]-n[0])}function qo(n){for(var t=0,e=n.length-1,r=[],u=n[0],i=n[1],o=r[0]=zo(u,i);++t<e;)r[t]=(o+(o=zo(u=i,i=n[t+1])))/2;return r[t]=o,r}function Lo(n){for(var t,e,r,u,i=[],o=qo(n),a=-1,c=n.length-1;++a<c;)t=zo(n[a],n[a+1]),ga(t)<Ca?o[a]=o[a+1]=0:(e=o[a]/t,r=o[a+1]/t,u=e*e+r*r,u>9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=c;)u=(n[Math.min(c,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function To(n){return n.length<3?go(n):n[0]+_o(n,Lo(n))}function Ro(n){for(var t,e,r,u=-1,i=n.length;++u<i;)t=n[u],e=t[0],r=t[1]-Ra,t[0]=e*Math.cos(r),t[1]=e*Math.sin(r);return n}function Do(n){function t(t){function c(){v.push("M",a(n(m),f),s,l(n(d.reverse()),f),"Z")}for(var h,g,p,v=[],d=[],m=[],y=-1,M=t.length,x=Et(e),b=Et(u),_=e===r?function(){return g}:Et(r),w=u===i?function(){return p}:Et(i);++y<M;)o.call(this,h=t[y],y)?(d.push([g=+x.call(this,h,y),p=+b.call(this,h,y)]),m.push([+_.call(this,h,y),+w.call(this,h,y)])):d.length&&(c(),d=[],m=[]);return d.length&&c(),v.length?v.join(""):null}var e=Ar,r=Ar,u=0,i=Nr,o=Ne,a=go,c=a.key,l=a,s="L",f=.7;return t.x=function(n){return arguments.length?(e=r=n,t):r},t.x0=function(n){return arguments.length?(e=n,t):e},t.x1=function(n){return arguments.length?(r=n,t):r
 },t.y=function(n){return arguments.length?(u=i=n,t):i},t.y0=function(n){return arguments.length?(u=n,t):u},t.y1=function(n){return arguments.length?(i=n,t):i},t.defined=function(n){return arguments.length?(o=n,t):o},t.interpolate=function(n){return arguments.length?(c="function"==typeof n?a=n:(a=El.get(n)||go).key,l=a.reverse||a,s=a.closed?"M":"L",t):c},t.tension=function(n){return arguments.length?(f=n,t):f},t}function Po(n){return n.radius}function Uo(n){return[n.x,n.y]}function jo(n){return function(){var t=n.apply(this,arguments),e=t[0],r=t[1]-Ra;return[e*Math.cos(r),e*Math.sin(r)]}}function Fo(){return 64}function Ho(){return"circle"}function Oo(n){var t=Math.sqrt(n/qa);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function Io(n){return function(){var t,e;(t=this[n])&&(e=t[t.active])&&(--t.count?delete t[t.active]:delete this[n],t.active+=.5,e.event&&e.event.interrupt.call(this,this.__data__,e.index))}}function Yo(n,t,e){return ya(n,Pl),n.namespace=t,n.id=e,n}function Zo(n,t,e,r){var u=n.id,i=n.namespace;return Y(n,"function"==typeof e?function(n,o,a){n[i][u].tween.set(t,r(e.call(n,n.__data__,o,a)))}:(e=r(e),function(n){n[i][u].tween.set(t,e)}))}function Vo(n){return null==n&&(n=""),function(){this.textContent=n}}function Xo(n){return null==n?"__transition__":"__transition_"+n+"__"}function $o(n,t,e,r,u){var i=n[e]||(n[e]={active:0,count:0}),o=i[r];if(!o){var a=u.time;o=i[r]={tween:new l,time:a,delay:u.delay,duration:u.duration,ease:u.ease,index:t},u=null,++i.count,ta.timer(function(u){function c(e){if(i.active>r)return s();var u=i[i.active];u&&(--i.count,delete i[i.active],u.event&&u.event.interrupt.call(n,n.__data__,u.index)),i.active=r,o.event&&o.event.start.call(n,n.__data__,t),o.tween.forEach(function(e,r){(r=r.call(n,n.__data__,t))&&v.push(r)}),h=o.ease,f=o.duration,ta.timer(function(){return p.c=l(e||1)?Ne:l,1},0,a)}function l(e){if(i.active!==r)return 1;for(var u=e/f,a=h(u),c=v.length;c>0;)v[--c].call(n,a);return u>=1?(o.event&&o.event.end.call(n,n.__data__,t),s()):void 0}function s(){return--i.count?delete i[r]:delete n[e],1}var f,h,g=o.delay,p=ec,v=[];return p.t=g+a,u>=g?c(u-g):void(p.c=c)},0,a)}}function Bo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate("+(isFinite(r)?r:e(n))+",0)"})}function Wo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate(0,"+(isFinite(r)?r:e(n))+")"})}function Jo(n){return n.toISOString()}function Go(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=ta.bisect(Vl,u);return i==Vl.length?[t.year,Vi(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/Vl[i-1]<Vl[i]/u?i-1:i]:[Bl,Vi(n,e)[2]]}return r.invert=function(t){return Ko(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain(t),r):n.domain().map(Ko)},r.nice=function(n,t){function e(e){return!isNaN(e)&&!n.range(e,Ko(+e+1),t).length}var i=r.domain(),o=Pi(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),r.domain(Fi(i,t>1?{floor:function(t){for(;e(t=n.floor(t));)t=Ko(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Ko(+t+1);return t}}:n))},r.ticks=function(n,t){var e=Pi(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Ko(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Go(n.copy(),t,e)},Yi(r,n)}function Ko(n){return new Date(n)}function Qo(n){return JSON.parse(n.responseText)}function na(n){var t=ua.createRange();return t.selectNode(ua.body),t.createContextualFragment(n.responseText)}var ta={version:"3.5.6"},ea=[].slice,ra=function(n){return ea.call(n)},ua=this.document;if(ua)try{ra(ua.documentElement.childNodes)[0].nodeType}catch(ia){ra=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}if(Date.now||(Date.now=function(){return+new Date}),ua)try{ua.createElement("DIV").style.setProperty("opacity",0,"")}catch(oa){var aa=this.Element.prototype,ca=aa.setAttribute,la=aa.setAttributeNS,sa=this.CSSStyleDeclaration.prototype,fa=sa.setProperty;aa.setAttribute=function(n,t){ca.call(this,n,t+"")},aa.setAttributeNS=function(n,t,e){la.call(this,n,t,e+"")},sa.setProperty=function(n,t,e){fa.call(this,n,t+"",e)}}ta.ascending=e,ta.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:0/0},ta.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&e>r&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&e>r&&(e=r)}return e},ta.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&r>e&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&r>e&&(e=r)}return e},ta.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i<o;)if(null!=(r=n[i])&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=n[i])&&(e>r&&(e=r),r>u&&(u=r))}else{for(;++i<o;)if(null!=(r=t.call(n,n[i],i))&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=t.call(n,n[i],i))&&(e>r&&(e=r),r>u&&(u=r))}return[e,u]},ta.sum=function(n,t){var e,r=0,i=n.length,o=-1;if(1===arguments.length)for(;++o<i;)u(e=+n[o])&&(r+=e);else for(;++o<i;)u(e=+t.call(n,n[o],o))&&(r+=e);return r},ta.mean=function(n,t){var e,i=0,o=n.length,a=-1,c=o;if(1===arguments.length)for(;++a<o;)u(e=r(n[a]))?i+=e:--c;else for(;++a<o;)u(e=r(t.call(n,n[a],a)))?i+=e:--c;return c?i/c:void 0},ta.quantile=function(n,t){var e=(n.length-1)*t+1,r=Math.floor(e),u=+n[r-1],i=e-r;return i?u+i*(n[r]-u):u},ta.median=function(n,t){var i,o=[],a=n.length,c=-1;if(1===arguments.length)for(;++c<a;)u(i=r(n[c]))&&o.push(i);else for(;++c<a;)u(i=r(t.call(n,n[c],c)))&&o.push(i);return o.length?ta.quantile(o.sort(e),.5):void 0},ta.variance=function(n,t){var e,i,o=n.length,a=0,c=0,l=-1,s=0;if(1===arguments.length)for(;++l<o;)u(e=r(n[l]))&&(i=e-a,a+=i/++s,c+=i*(e-a));else for(;++l<o;)u(e=r(t.call(n,n[l],l)))&&(i=e-a,a+=i/++s,c+=i*(e-a));return s>1?c/(s-1):void 0},ta.deviation=function(){var n=ta.variance.apply(this,arguments);return n?Math.sqrt(n):n};var ha=i(e);ta.bisectLeft=ha.left,ta.bisect=ta.bisectRight=ha.right,ta.bisector=function(n){return i(1===n.length?function(t,r){return e(n(t),r)}:n)},ta.shuffle=function(n,t,e){(i=arguments.length)<3&&(e=n.length,2>i&&(t=0));for(var r,u,i=e-t;i;)u=Math.random()*i--|0,r=n[i+t],n[i+t]=n[u+t],n[u+t]=r;return n},ta.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},ta.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},ta.zip=function(){if(!(r=arguments.length))return[];for(var n=-1,t=ta.min(arguments,o),e=new Array(t);++n<t;)for(var r,u=-1,i=e[n]=new Array(r);++u<r;)i[u]=arguments[u][n];return e},ta.transpose=function(n){return ta.zip.apply(ta,n)},ta.keys=function(n){var t=[];for(var e in n)t.push(e);return t},ta.values=function(n){var t=[];for(var e in n)t.push(n[e]);return t},ta.entries=function(n){var t=[];for(var e in n)t.push({key:e,value:n[e]});return t},ta.merge=function(n){for(var t,e,r,u=n.length,i=-1,o=0;++i<u;)o+=n[i].length;for(e=new Array(o);--u>=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var ga=Math.abs;ta.range=function(n,t,e){if(arguments.length<3&&(e=1,arguments.length<2&&(t=n,n=0)),(t-n)/e===1/0)throw new Error("infinite range");var r,u=[],i=a(ga(e)),o=-1;if(n*=i,t*=i,e*=i,0>e)for(;(r=n+e*++o)>t;)u.push(r/i);else for(;(r=n+e*++o)<t;)u.push(r/i);return u},ta.map=function(n,t){var e=new l;if(n instanceof l)n.forEach(function(n,t){e.set(n,t)});else if(Array.isArray(n)){var r,u=-1,i=n.length;if(1===arguments.length)for(;++u<i;)e.set(u,n[u]);else for(;++u<i;)e.set(t.call(n,r=n[u],u),r)}else for(var o in n)e.set(o,n[o]);return e};var pa="__proto__",va="\x00";c(l,{has:h,get:function(n){return this._[s(n)]},set:function(n,t){return this._[s(n)]=t},remove:g,keys:p,values:function(){var n=[];for(var t in this._)n.push(this._[t]);return n},entries:function(){var n=[];for(var t in this._)n.push({key:f(t),value:this._[t]});return n},size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t),this._[t])}}),ta.nest=function(){function n(t,o,a){if(a>=i.length)return r?r.call(u,o):e?o.sort(e):o;for(var c,s,f,h,g=-1,p=o.length,v=i[a++],d=new l;++g<p;)(h=d.get(c=v(s=o[g])))?h.push(s):d.set(c,[s]);return t?(s=t(),f=function(e,r){s.set(e,n(t,r,a))}):(s={},f=function(e,r){s[e]=n(t,r,a)}),d.forEach(f),s}function t(n,e){if(e>=i.length)return n;var r=[],u=o[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,u={},i=[],o=[];return u.map=function(t,e){return n(e,t,0)},u.entries=function(e){return t(n(ta.map,e,0),0)},u.key=function(n){return i.push(n),u},u.sortKeys=function(n){return o[i.length-1]=n,u},u.sortValues=function(n){return e=n,u},u.rollup=function(n){return r=n,u},u},ta.set=function(n){var t=new m;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},c(m,{has:h,add:function(n){return this._[s(n+="")]=!0,n},remove:g,values:p,size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t))}}),ta.behavior={},ta.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r<u;)n[e=arguments[r]]=M(n,t,t[e]);return n};var da=["webkit","ms","moz","Moz","o","O"];ta.dispatch=function(){for(var n=new _,t=-1,e=arguments.length;++t<e;)n[arguments[t]]=w(n);return n},_.prototype.on=function(n,t){var e=n.indexOf("."),r="";if(e>=0&&(r=n.slice(e+1),n=n.slice(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},ta.event=null,ta.requote=function(n){return n.replace(ma,"\\$&")};var ma=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,ya={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},Ma=function(n,t){return t.querySelector(n)},xa=function(n,t){return t.querySelectorAll(n)},ba=function(n,t){var e=n.matches||n[x(n,"matchesSelector")];return(ba=function(n,t){return e.call(n,t)})(n,t)};"function"==typeof Sizzle&&(Ma=function(n,t){return Sizzle(n,t)[0]||null},xa=Sizzle,ba=Sizzle.matchesSelector),ta.selection=function(){return ta.select(ua.documentElement)};var _a=ta.selection.prototype=[];_a.select=function(n){var t,e,r,u,i=[];n=N(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]),t.parentNode=(r=this[o]).parentNode;for(var c=-1,l=r.length;++c<l;)(u=r[c])?(t.push(e=n.call(u,u.__data__,c,o)),e&&"__data__"in u&&(e.__data__=u.__data__)):t.push(null)}return A(i)},_a.selectAll=function(n){var t,e,r=[];n=C(n);for(var u=-1,i=this.length;++u<i;)for(var o=this[u],a=-1,c=o.length;++a<c;)(e=o[a])&&(r.push(t=ra(n.call(e,e.__data__,a,u))),t.parentNode=e);return A(r)};var wa={svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};ta.ns={prefix:wa,qualify:function(n){var t=n.indexOf(":"),e=n;return t>=0&&(e=n.slice(0,t),n=n.slice(t+1)),wa.hasOwnProperty(e)?{space:wa[e],local:n}:n}},_a.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=ta.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(z(t,n[t]));return this}return this.each(z(n,t))},_a.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=T(n)).length,u=-1;if(t=e.classList){for(;++u<r;)if(!t.contains(n[u]))return!1}else for(t=e.getAttribute("class");++u<r;)if(!L(n[u]).test(t))return!1;return!0}for(t in n)this.each(R(t,n[t]));return this}return this.each(R(n,t))},_a.style=function(n,e,r){var u=arguments.length;if(3>u){if("string"!=typeof n){2>u&&(e="");for(r in n)this.each(P(r,n[r],e));return this}if(2>u){var i=this.node();return t(i).getComputedStyle(i,null).getPropertyValue(n)}r=""}return this.each(P(n,e,r))},_a.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(U(t,n[t]));return this}return this.each(U(n,t))},_a.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},_a.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},_a.append=function(n){return n=j(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},_a.insert=function(n,t){return n=j(n),t=N(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},_a.remove=function(){return this.each(F)},_a.data=function(n,t){function e(n,e){var r,u,i,o=n.length,f=e.length,h=Math.min(o,f),g=new Array(f),p=new Array(f),v=new Array(o);if(t){var d,m=new l,y=new Array(o);for(r=-1;++r<o;)m.has(d=t.call(u=n[r],u.__data__,r))?v[r]=u:m.set(d,u),y[r]=d;for(r=-1;++r<f;)(u=m.get(d=t.call(e,i=e[r],r)))?u!==!0&&(g[r]=u,u.__data__=i):p[r]=H(i),m.set(d,!0);for(r=-1;++r<o;)m.get(y[r])!==!0&&(v[r]=n[r])}else{for(r=-1;++r<h;)u=n[r],i=e[r],u?(u.__data__=i,g[r]=u):p[r]=H(i);for(;f>r;++r)p[r]=H(e[r]);for(;o>r;++r)v[r]=n[r]}p.update=g,p.parentNode=g.parentNode=v.parentNode=n.parentNode,a.push(p),c.push(g),s.push(v)}var r,u,i=-1,o=this.length;if(!arguments.length){for(n=new Array(o=(r=this[0]).length);++i<o;)(u=r[i])&&(n[i]=u.__data__);return n}var a=Z([]),c=A([]),s=A([]);if("function"==typeof n)for(;++i<o;)e(r=this[i],n.call(r,r.parentNode.__data__,i));else for(;++i<o;)e(r=this[i],n);return c.enter=function(){return a},c.exit=function(){return s},c},_a.datum=function(n){return arguments.length?this.property("__data__",n):this.property("__data__")},_a.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return A(u)},_a.order=function(){for(var n=-1,t=this.length;++n<t;)for(var e,r=this[n],u=r.length-1,i=r[u];--u>=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},_a.sort=function(n){n=I.apply(this,arguments);for(var t=-1,e=this.length;++t<e;)this[t].sort(n);return this.order()},_a.each=function(n){return Y(this,function(t,e,r){n.call(t,t.__data__,e,r)})},_a.call=function(n){var t=ra(arguments);return n.apply(t[0]=this,t),this},_a.empty=function(){return!this.node()},_a.node=function(){for(var n=0,t=this.length;t>n;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},_a.size=function(){var n=0;return Y(this,function(){++n}),n};var Sa=[];ta.selection.enter=Z,ta.selection.enter.prototype=Sa,Sa.append=_a.append,Sa.empty=_a.empty,Sa.node=_a.node,Sa.call=_a.call,Sa.size=_a.size,Sa.select=function(n){for(var t,e,r,u,i,o=[],a=-1,c=this.length;++a<c;){r=(u=this[a]).update,o.push(t=[]),t.parentNode=u.parentNode;for(var l=-1,s=u.length;++l<s;)(i=u[l])?(t.push(r[l]=e=n.call(u.parentNode,i.__data__,l,a)),e.__data__=i.__data__):t.push(null)}return A(o)},Sa.insert=function(n,t){return arguments.length<2&&(t=V(this)),_a.insert.call(this,n,t)},ta.select=function(t){var e;return"string"==typeof t?(e=[Ma(t,ua)],e.parentNode=ua.documentElement):(e=[t],e.parentNode=n(t)),A([e])},ta.selectAll=function(n){var t;return"string"==typeof n?(t=ra(xa(n,ua)),t.parentNode=ua.documentElement):(t=n,t.parentNode=null),A([t])},_a.on=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(X(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(X(n,t,e))};var ka=ta.map({mouseenter:"mouseover",mouseleave:"mouseout"});ua&&ka.forEach(function(n){"on"+n in ua&&ka.remove(n)});var Ea,Aa=0;ta.mouse=function(n){return J(n,k())};var Na=this.navigator&&/WebKit/.test(this.navigator.userAgent)?-1:0;ta.touch=function(n,t,e){if(arguments.length<3&&(e=t,t=k().changedTouches),t)for(var r,u=0,i=t.length;i>u;++u)if((r=t[u]).identifier===e)return J(n,r)},ta.behavior.drag=function(){function n(){this.on("mousedown.drag",i).on("touchstart.drag",o)}function e(n,t,e,i,o){return function(){function a(){var n,e,r=t(h,v);r&&(n=r[0]-M[0],e=r[1]-M[1],p|=n|e,M=r,g({type:"drag",x:r[0]+l[0],y:r[1]+l[1],dx:n,dy:e}))}function c(){t(h,v)&&(m.on(i+d,null).on(o+d,null),y(p&&ta.event.target===f),g({type:"dragend"}))}var l,s=this,f=ta.event.target,h=s.parentNode,g=r.of(s,arguments),p=0,v=n(),d=".drag"+(null==v?"":"-"+v),m=ta.select(e(f)).on(i+d,a).on(o+d,c),y=W(f),M=t(h,v);u?(l=u.apply(s,arguments),l=[l.x-M[0],l.y-M[1]]):l=[0,0],g({type:"dragstart"})}}var r=E(n,"drag","dragstart","dragend"),u=null,i=e(b,ta.mouse,t,"mousemove","mouseup"),o=e(G,ta.touch,y,"touchmove","touchend");return n.origin=function(t){return arguments.length?(u=t,n):u},ta.rebind(n,r,"on")},ta.touches=function(n,t){return arguments.length<2&&(t=k().touches),t?ra(t).map(function(t){var e=J(n,t);return e.identifier=t.identifier,e}):[]};var Ca=1e-6,za=Ca*Ca,qa=Math.PI,La=2*qa,Ta=La-Ca,Ra=qa/2,Da=qa/180,Pa=180/qa,Ua=Math.SQRT2,ja=2,Fa=4;ta.interpolateZoom=function(n,t){function e(n){var t=n*y;if(m){var e=rt(v),o=i/(ja*h)*(e*ut(Ua*t+v)-et(v));return[r+o*l,u+o*s,i*e/rt(Ua*t+v)]}return[r+n*l,u+n*s,i*Math.exp(Ua*t)]}var r=n[0],u=n[1],i=n[2],o=t[0],a=t[1],c=t[2],l=o-r,s=a-u,f=l*l+s*s,h=Math.sqrt(f),g=(c*c-i*i+Fa*f)/(2*i*ja*h),p=(c*c-i*i-Fa*f)/(2*c*ja*h),v=Math.log(Math.sqrt(g*g+1)-g),d=Math.log(Math.sqrt(p*p+1)-p),m=d-v,y=(m||Math.log(c/i))/Ua;return e.duration=1e3*y,e},ta.behavior.zoom=function(){function n(n){n.on(q,f).on(Oa+".zoom",g).on("dblclick.zoom",p).on(R,h)}function e(n){return[(n[0]-k.x)/k.k,(n[1]-k.y)/k.k]}function r(n){return[n[0]*k.k+k.x,n[1]*k.k+k.y]}function u(n){k.k=Math.max(N[0],Math.min(N[1],n))}function i(n,t){t=r(t),k.x+=n[0]-t[0],k.y+=n[1]-t[1]}function o(t,e,r,o){t.__chart__={x:k.x,y:k.y,k:k.k},u(Math.pow(2,o)),i(d=e,r),t=ta.select(t),C>0&&(t=t.transition().duration(C)),t.call(n.event)}function a(){b&&b.domain(x.range().map(function(n){return(n-k.x)/k.k}).map(x.invert)),w&&w.domain(_.range().map(function(n){return(n-k.y)/k.k}).map(_.invert))}function c(n){z++||n({type:"zoomstart"})}function l(n){a(),n({type:"zoom",scale:k.k,translate:[k.x,k.y]})}function s(n){--z||(n({type:"zoomend"}),d=null)}function f(){function n(){f=1,i(ta.mouse(u),g),l(a)}function r(){h.on(L,null).on(T,null),p(f&&ta.event.target===o),s(a)}var u=this,o=ta.event.target,a=D.of(u,arguments),f=0,h=ta.select(t(u)).on(L,n).on(T,r),g=e(ta.mouse(u)),p=W(u);Dl.call(u),c(a)}function h(){function n(){var n=ta.touches(p);return g=k.k,n.forEach(function(n){n.identifier in d&&(d[n.identifier]=e(n))}),n}function t(){var t=ta.event.target;ta.select(t).on(x,r).on(b,a),_.push(t);for(var e=ta.event.changedTouches,u=0,i=e.length;i>u;++u)d[e[u].identifier]=null;var c=n(),l=Date.now();if(1===c.length){if(500>l-M){var s=c[0];o(p,s,d[s.identifier],Math.floor(Math.log(k.k)/Math.LN2)+1),S()}M=l}else if(c.length>1){var s=c[0],f=c[1],h=s[0]-f[0],g=s[1]-f[1];m=h*h+g*g}}function r(){var n,t,e,r,o=ta.touches(p);Dl.call(p);for(var a=0,c=o.length;c>a;++a,r=null)if(e=o[a],r=d[e.identifier]){if(t)break;n=e,t=r}if(r){var s=(s=e[0]-n[0])*s+(s=e[1]-n[1])*s,f=m&&Math.sqrt(s/m);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+r[0])/2,(t[1]+r[1])/2],u(f*g)}M=null,i(n,t),l(v)}function a(){if(ta.event.touches.length){for(var t=ta.event.changedTouches,e=0,r=t.length;r>e;++e)delete d[t[e].identifier];for(var u in d)return void n()}ta.selectAll(_).on(y,null),w.on(q,f).on(R,h),E(),s(v)}var g,p=this,v=D.of(p,arguments),d={},m=0,y=".zoom-"+ta.event.changedTouches[0].identifier,x="touchmove"+y,b="touchend"+y,_=[],w=ta.select(p),E=W(p);t(),c(v),w.on(q,null).on(R,t)}function g(){var n=D.of(this,arguments);y?clearTimeout(y):(Dl.call(this),v=e(d=m||ta.mouse(this)),c(n)),y=setTimeout(function(){y=null,s(n)},50),S(),u(Math.pow(2,.002*Ha())*k.k),i(d,v),l(n)}function p(){var n=ta.mouse(this),t=Math.log(k.k)/Math.LN2;o(this,n,e(n),ta.event.shiftKey?Math.ceil(t)-1:Math.floor(t)+1)}var v,d,m,y,M,x,b,_,w,k={x:0,y:0,k:1},A=[960,500],N=Ia,C=250,z=0,q="mousedown.zoom",L="mousemove.zoom",T="mouseup.zoom",R="touchstart.zoom",D=E(n,"zoomstart","zoom","zoomend");return Oa||(Oa="onwheel"in ua?(Ha=function(){return-ta.event.deltaY*(ta.event.deltaMode?120:1)},"wheel"):"onmousewheel"in ua?(Ha=function(){return ta.event.wheelDelta},"mousewheel"):(Ha=function(){return-ta.event.detail},"MozMousePixelScroll")),n.event=function(n){n.each(function(){var n=D.of(this,arguments),t=k;Tl?ta.select(this).transition().each("start.zoom",function(){k=this.__chart__||{x:0,y:0,k:1},c(n)}).tween("zoom:zoom",function(){var e=A[0],r=A[1],u=d?d[0]:e/2,i=d?d[1]:r/2,o=ta.interpolateZoom([(u-k.x)/k.k,(i-k.y)/k.k,e/k.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),a=e/r[2];this.__chart__=k={x:u-r[0]*a,y:i-r[1]*a,k:a},l(n)}}).each("interrupt.zoom",function(){s(n)}).each("end.zoom",function(){s(n)}):(this.__chart__=k,c(n),l(n),s(n))})},n.translate=function(t){return arguments.length?(k={x:+t[0],y:+t[1],k:k.k},a(),n):[k.x,k.y]},n.scale=function(t){return arguments.length?(k={x:k.x,y:k.y,k:+t},a(),n):k.k},n.scaleExtent=function(t){return arguments.length?(N=null==t?Ia:[+t[0],+t[1]],n):N},n.center=function(t){return arguments.length?(m=t&&[+t[0],+t[1]],n):m},n.size=function(t){return arguments.length?(A=t&&[+t[0],+t[1]],n):A},n.duration=function(t){return arguments.length?(C=+t,n):C},n.x=function(t){return arguments.length?(b=t,x=t.copy(),k={x:0,y:0,k:1},n):b},n.y=function(t){return arguments.length?(w=t,_=t.copy(),k={x:0,y:0,k:1},n):w},ta.rebind(n,D,"on")};var Ha,Oa,Ia=[0,1/0];ta.color=ot,ot.prototype.toString=function(){return this.rgb()+""},ta.hsl=at;var Ya=at.prototype=new ot;Ya.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,this.l/n)},Ya.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,n*this.l)},Ya.rgb=function(){return ct(this.h,this.s,this.l)},ta.hcl=lt;var Za=lt.prototype=new ot;Za.brighter=function(n){return new lt(this.h,this.c,Math.min(100,this.l+Va*(arguments.length?n:1)))},Za.darker=function(n){return new lt(this.h,this.c,Math.max(0,this.l-Va*(arguments.length?n:1)))},Za.rgb=function(){return st(this.h,this.c,this.l).rgb()},ta.lab=ft;var Va=18,Xa=.95047,$a=1,Ba=1.08883,Wa=ft.prototype=new ot;Wa.brighter=function(n){return new ft(Math.min(100,this.l+Va*(arguments.length?n:1)),this.a,this.b)},Wa.darker=function(n){return new ft(Math.max(0,this.l-Va*(arguments.length?n:1)),this.a,this.b)},Wa.rgb=function(){return ht(this.l,this.a,this.b)},ta.rgb=mt;var Ja=mt.prototype=new ot;Ja.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),new mt(Math.min(255,t/n),Math.min(255,e/n),Math.min(255,r/n))):new mt(u,u,u)},Ja.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new mt(n*this.r,n*this.g,n*this.b)},Ja.hsl=function(){return _t(this.r,this.g,this.b)},Ja.toString=function(){return"#"+xt(this.r)+xt(this.g)+xt(this.b)};var Ga=ta.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Ga.forEach(function(n,t){Ga.set(n,yt(t))}),ta.functor=Et,ta.xhr=At(y),ta.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=Nt(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),c=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=new Function("d","return {"+n.map(function(n,t){return JSON.stringify(n)+": d["+t+"]"}).join(",")+"}");r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(s>=l)return o;if(u)return u=!1,i;var t=s;if(34===n.charCodeAt(t)){for(var e=t;e++<l;)if(34===n.charCodeAt(e)){if(34!==n.charCodeAt(e+1))break;++e}s=e+2;var r=n.charCodeAt(e+1);return 13===r?(u=!0,10===n.charCodeAt(e+2)&&++s):10===r&&(u=!0),n.slice(t+1,e).replace(/""/g,'"')}for(;l>s;){var r=n.charCodeAt(s++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(s)&&(++s,++a);else if(r!==c)continue;return n.slice(t,s-a)}return n.slice(t)}for(var r,u,i={},o={},a=[],l=n.length,s=0,f=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();t&&null==(h=t(h,f++))||a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new m,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},ta.csv=ta.dsv(",","text/csv"),ta.tsv=ta.dsv("	","text/tab-separated-values");var Ka,Qa,nc,tc,ec,rc=this[x(this,"requestAnimationFrame")]||function(n){setTimeout(n,17)};ta.timer=function(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,f:!1,n:null};Qa?Qa.n=i:Ka=i,Qa=i,nc||(tc=clearTimeout(tc),nc=1,rc(qt))},ta.timer.flush=function(){Lt(),Tt()},ta.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var uc=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Dt);ta.formatPrefix=function(n,t){var e=0;return n&&(0>n&&(n*=-1),t&&(n=ta.round(n,Rt(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((e-1)/3)))),uc[8+e/3]};var ic=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,oc=ta.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=ta.round(n,Rt(n,t))).toFixed(Math.max(0,Math.min(20,Rt(n*(1+1e-15),t))))}}),ac=ta.time={},cc=Date;jt.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){lc.setUTCDate.apply(this._,arguments)},setDay:function(){lc.setUTCDay.apply(this._,arguments)},setFullYear:function(){lc.setUTCFullYear.apply(this._,arguments)},setHours:function(){lc.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){lc.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){lc.setUTCMinutes.apply(this._,arguments)},setMonth:function(){lc.setUTCMonth.apply(this._,arguments)},setSeconds:function(){lc.setUTCSeconds.apply(this._,arguments)},setTime:function(){lc.setTime.apply(this._,arguments)}};var lc=Date.prototype;ac.year=Ft(function(n){return n=ac.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),ac.years=ac.year.range,ac.years.utc=ac.year.utc.range,ac.day=Ft(function(n){var t=new cc(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),ac.days=ac.day.range,ac.days.utc=ac.day.utc.range,ac.dayOfYear=function(n){var t=ac.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=ac[n]=Ft(function(n){return(n=ac.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});ac[n+"s"]=e.range,ac[n+"s"].utc=e.utc.range,ac[n+"OfYear"]=function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)}}),ac.week=ac.sunday,ac.weeks=ac.sunday.range,ac.weeks.utc=ac.sunday.utc.range,ac.weekOfYear=ac.sundayOfYear;var sc={"-":"",_:" ",0:"0"},fc=/^\s*\d+/,hc=/^%/;ta.locale=function(n){return{numberFormat:Pt(n),timeFormat:Ot(n)}};var gc=ta.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});ta.format=gc.numberFormat,ta.geo={},ce.prototype={s:0,t:0,add:function(n){le(n,this.t,pc),le(pc.s,this.s,this),this.s?this.t+=pc.t:this.s=pc.t
 },reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var pc=new ce;ta.geo.stream=function(n,t){n&&vc.hasOwnProperty(n.type)?vc[n.type](n,t):se(n,t)};var vc={Feature:function(n,t){se(n.geometry,t)},FeatureCollection:function(n,t){for(var e=n.features,r=-1,u=e.length;++r<u;)se(e[r].geometry,t)}},dc={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates,t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)n=e[r],t.point(n[0],n[1],n[2])},LineString:function(n,t){fe(n.coordinates,t,0)},MultiLineString:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)fe(e[r],t,0)},Polygon:function(n,t){he(n.coordinates,t)},MultiPolygon:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)he(e[r],t)},GeometryCollection:function(n,t){for(var e=n.geometries,r=-1,u=e.length;++r<u;)se(e[r],t)}};ta.geo.area=function(n){return mc=0,ta.geo.stream(n,Mc),mc};var mc,yc=new ce,Mc={sphere:function(){mc+=4*qa},point:b,lineStart:b,lineEnd:b,polygonStart:function(){yc.reset(),Mc.lineStart=ge},polygonEnd:function(){var n=2*yc;mc+=0>n?4*qa+n:n,Mc.lineStart=Mc.lineEnd=Mc.point=b}};ta.geo.bounds=function(){function n(n,t){M.push(x=[s=n,h=n]),f>t&&(f=t),t>g&&(g=t)}function t(t,e){var r=pe([t*Da,e*Da]);if(m){var u=de(m,r),i=[u[1],-u[0],0],o=de(i,u);Me(o),o=xe(o);var c=t-p,l=c>0?1:-1,v=o[0]*Pa*l,d=ga(c)>180;if(d^(v>l*p&&l*t>v)){var y=o[1]*Pa;y>g&&(g=y)}else if(v=(v+360)%360-180,d^(v>l*p&&l*t>v)){var y=-o[1]*Pa;f>y&&(f=y)}else f>e&&(f=e),e>g&&(g=e);d?p>t?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t):h>=s?(s>t&&(s=t),t>h&&(h=t)):t>p?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t)}else n(t,e);m=r,p=t}function e(){b.point=t}function r(){x[0]=s,x[1]=h,b.point=n,m=null}function u(n,e){if(m){var r=n-p;y+=ga(r)>180?r+(r>0?360:-360):r}else v=n,d=e;Mc.point(n,e),t(n,e)}function i(){Mc.lineStart()}function o(){u(v,d),Mc.lineEnd(),ga(y)>Ca&&(s=-(h=180)),x[0]=s,x[1]=h,m=null}function a(n,t){return(t-=n)<0?t+360:t}function c(n,t){return n[0]-t[0]}function l(n,t){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}var s,f,h,g,p,v,d,m,y,M,x,b={point:n,lineStart:e,lineEnd:r,polygonStart:function(){b.point=u,b.lineStart=i,b.lineEnd=o,y=0,Mc.polygonStart()},polygonEnd:function(){Mc.polygonEnd(),b.point=n,b.lineStart=e,b.lineEnd=r,0>yc?(s=-(h=180),f=-(g=90)):y>Ca?g=90:-Ca>y&&(f=-90),x[0]=s,x[1]=h}};return function(n){g=h=-(s=f=1/0),M=[],ta.geo.stream(n,b);var t=M.length;if(t){M.sort(c);for(var e,r=1,u=M[0],i=[u];t>r;++r)e=M[r],l(e[0],u)||l(e[1],u)?(a(u[0],e[1])>a(u[0],u[1])&&(u[1]=e[1]),a(e[0],u[1])>a(u[0],u[1])&&(u[0]=e[0])):i.push(u=e);for(var o,e,p=-1/0,t=i.length-1,r=0,u=i[t];t>=r;u=e,++r)e=i[r],(o=a(u[1],e[0]))>p&&(p=o,s=e[0],h=u[1])}return M=x=null,1/0===s||1/0===f?[[0/0,0/0],[0/0,0/0]]:[[s,f],[h,g]]}}(),ta.geo.centroid=function(n){xc=bc=_c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,qc);var t=Nc,e=Cc,r=zc,u=t*t+e*e+r*r;return za>u&&(t=kc,e=Ec,r=Ac,Ca>bc&&(t=_c,e=wc,r=Sc),u=t*t+e*e+r*r,za>u)?[0/0,0/0]:[Math.atan2(e,t)*Pa,tt(r/Math.sqrt(u))*Pa]};var xc,bc,_c,wc,Sc,kc,Ec,Ac,Nc,Cc,zc,qc={sphere:b,point:_e,lineStart:Se,lineEnd:ke,polygonStart:function(){qc.lineStart=Ee},polygonEnd:function(){qc.lineStart=Se}},Lc=Le(Ne,Pe,je,[-qa,-qa/2]),Tc=1e9;ta.geo.clipExtent=function(){var n,t,e,r,u,i,o={stream:function(n){return u&&(u.valid=!1),u=i(n),u.valid=!0,u},extent:function(a){return arguments.length?(i=Ie(n=+a[0][0],t=+a[0][1],e=+a[1][0],r=+a[1][1]),u&&(u.valid=!1,u=null),o):[[n,t],[e,r]]}};return o.extent([[0,0],[960,500]])},(ta.geo.conicEqualArea=function(){return Ye(Ze)}).raw=Ze,ta.geo.albers=function(){return ta.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},ta.geo.albersUsa=function(){function n(n){var i=n[0],o=n[1];return t=null,e(i,o),t||(r(i,o),t)||u(i,o),t}var t,e,r,u,i=ta.geo.albers(),o=ta.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=ta.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),c={point:function(n,e){t=[n,e]}};return n.invert=function(n){var t=i.scale(),e=i.translate(),r=(n[0]-e[0])/t,u=(n[1]-e[1])/t;return(u>=.12&&.234>u&&r>=-.425&&-.214>r?o:u>=.166&&.234>u&&r>=-.214&&-.115>r?a:i).invert(n)},n.stream=function(n){var t=i.stream(n),e=o.stream(n),r=a.stream(n);return{point:function(n,u){t.point(n,u),e.point(n,u),r.point(n,u)},sphere:function(){t.sphere(),e.sphere(),r.sphere()},lineStart:function(){t.lineStart(),e.lineStart(),r.lineStart()},lineEnd:function(){t.lineEnd(),e.lineEnd(),r.lineEnd()},polygonStart:function(){t.polygonStart(),e.polygonStart(),r.polygonStart()},polygonEnd:function(){t.polygonEnd(),e.polygonEnd(),r.polygonEnd()}}},n.precision=function(t){return arguments.length?(i.precision(t),o.precision(t),a.precision(t),n):i.precision()},n.scale=function(t){return arguments.length?(i.scale(t),o.scale(.35*t),a.scale(t),n.translate(i.translate())):i.scale()},n.translate=function(t){if(!arguments.length)return i.translate();var l=i.scale(),s=+t[0],f=+t[1];return e=i.translate(t).clipExtent([[s-.455*l,f-.238*l],[s+.455*l,f+.238*l]]).stream(c).point,r=o.translate([s-.307*l,f+.201*l]).clipExtent([[s-.425*l+Ca,f+.12*l+Ca],[s-.214*l-Ca,f+.234*l-Ca]]).stream(c).point,u=a.translate([s-.205*l,f+.212*l]).clipExtent([[s-.214*l+Ca,f+.166*l+Ca],[s-.115*l-Ca,f+.234*l-Ca]]).stream(c).point,n},n.scale(1070)};var Rc,Dc,Pc,Uc,jc,Fc,Hc={point:b,lineStart:b,lineEnd:b,polygonStart:function(){Dc=0,Hc.lineStart=Ve},polygonEnd:function(){Hc.lineStart=Hc.lineEnd=Hc.point=b,Rc+=ga(Dc/2)}},Oc={point:Xe,lineStart:b,lineEnd:b,polygonStart:b,polygonEnd:b},Ic={point:We,lineStart:Je,lineEnd:Ge,polygonStart:function(){Ic.lineStart=Ke},polygonEnd:function(){Ic.point=We,Ic.lineStart=Je,Ic.lineEnd=Ge}};ta.geo.path=function(){function n(n){return n&&("function"==typeof a&&i.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=u(i)),ta.geo.stream(n,o)),i.result()}function t(){return o=null,n}var e,r,u,i,o,a=4.5;return n.area=function(n){return Rc=0,ta.geo.stream(n,u(Hc)),Rc},n.centroid=function(n){return _c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,u(Ic)),zc?[Nc/zc,Cc/zc]:Ac?[kc/Ac,Ec/Ac]:Sc?[_c/Sc,wc/Sc]:[0/0,0/0]},n.bounds=function(n){return jc=Fc=-(Pc=Uc=1/0),ta.geo.stream(n,u(Oc)),[[Pc,Uc],[jc,Fc]]},n.projection=function(n){return arguments.length?(u=(e=n)?n.stream||tr(n):y,t()):e},n.context=function(n){return arguments.length?(i=null==(r=n)?new $e:new Qe(n),"function"!=typeof a&&i.pointRadius(a),t()):r},n.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(i.pointRadius(+t),+t),n):a},n.projection(ta.geo.albersUsa()).context(null)},ta.geo.transform=function(n){return{stream:function(t){var e=new er(t);for(var r in n)e[r]=n[r];return e}}},er.prototype={point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},ta.geo.projection=ur,ta.geo.projectionMutator=ir,(ta.geo.equirectangular=function(){return ur(ar)}).raw=ar.invert=ar,ta.geo.rotation=function(n){function t(t){return t=n(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t}return n=lr(n[0]%360*Da,n[1]*Da,n.length>2?n[2]*Da:0),t.invert=function(t){return t=n.invert(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t},t},cr.invert=ar,ta.geo.circle=function(){function n(){var n="function"==typeof r?r.apply(this,arguments):r,t=lr(-n[0]*Da,-n[1]*Da,0).invert,u=[];return e(null,null,1,{point:function(n,e){u.push(n=t(n,e)),n[0]*=Pa,n[1]*=Pa}}),{type:"Polygon",coordinates:[u]}}var t,e,r=[0,0],u=6;return n.origin=function(t){return arguments.length?(r=t,n):r},n.angle=function(r){return arguments.length?(e=gr((t=+r)*Da,u*Da),n):t},n.precision=function(r){return arguments.length?(e=gr(t*Da,(u=+r)*Da),n):u},n.angle(90)},ta.geo.distance=function(n,t){var e,r=(t[0]-n[0])*Da,u=n[1]*Da,i=t[1]*Da,o=Math.sin(r),a=Math.cos(r),c=Math.sin(u),l=Math.cos(u),s=Math.sin(i),f=Math.cos(i);return Math.atan2(Math.sqrt((e=f*o)*e+(e=l*s-c*f*a)*e),c*s+l*f*a)},ta.geo.graticule=function(){function n(){return{type:"MultiLineString",coordinates:t()}}function t(){return ta.range(Math.ceil(i/d)*d,u,d).map(h).concat(ta.range(Math.ceil(l/m)*m,c,m).map(g)).concat(ta.range(Math.ceil(r/p)*p,e,p).filter(function(n){return ga(n%d)>Ca}).map(s)).concat(ta.range(Math.ceil(a/v)*v,o,v).filter(function(n){return ga(n%m)>Ca}).map(f))}var e,r,u,i,o,a,c,l,s,f,h,g,p=10,v=p,d=90,m=360,y=2.5;return n.lines=function(){return t().map(function(n){return{type:"LineString",coordinates:n}})},n.outline=function(){return{type:"Polygon",coordinates:[h(i).concat(g(c).slice(1),h(u).reverse().slice(1),g(l).reverse().slice(1))]}},n.extent=function(t){return arguments.length?n.majorExtent(t).minorExtent(t):n.minorExtent()},n.majorExtent=function(t){return arguments.length?(i=+t[0][0],u=+t[1][0],l=+t[0][1],c=+t[1][1],i>u&&(t=i,i=u,u=t),l>c&&(t=l,l=c,c=t),n.precision(y)):[[i,l],[u,c]]},n.minorExtent=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],a=+t[0][1],o=+t[1][1],r>e&&(t=r,r=e,e=t),a>o&&(t=a,a=o,o=t),n.precision(y)):[[r,a],[e,o]]},n.step=function(t){return arguments.length?n.majorStep(t).minorStep(t):n.minorStep()},n.majorStep=function(t){return arguments.length?(d=+t[0],m=+t[1],n):[d,m]},n.minorStep=function(t){return arguments.length?(p=+t[0],v=+t[1],n):[p,v]},n.precision=function(t){return arguments.length?(y=+t,s=vr(a,o,90),f=dr(r,e,y),h=vr(l,c,90),g=dr(i,u,y),n):y},n.majorExtent([[-180,-90+Ca],[180,90-Ca]]).minorExtent([[-180,-80-Ca],[180,80+Ca]])},ta.geo.greatArc=function(){function n(){return{type:"LineString",coordinates:[t||r.apply(this,arguments),e||u.apply(this,arguments)]}}var t,e,r=mr,u=yr;return n.distance=function(){return ta.geo.distance(t||r.apply(this,arguments),e||u.apply(this,arguments))},n.source=function(e){return arguments.length?(r=e,t="function"==typeof e?null:e,n):r},n.target=function(t){return arguments.length?(u=t,e="function"==typeof t?null:t,n):u},n.precision=function(){return arguments.length?n:0},n},ta.geo.interpolate=function(n,t){return Mr(n[0]*Da,n[1]*Da,t[0]*Da,t[1]*Da)},ta.geo.length=function(n){return Yc=0,ta.geo.stream(n,Zc),Yc};var Yc,Zc={sphere:b,point:b,lineStart:xr,lineEnd:b,polygonStart:b,polygonEnd:b},Vc=br(function(n){return Math.sqrt(2/(1+n))},function(n){return 2*Math.asin(n/2)});(ta.geo.azimuthalEqualArea=function(){return ur(Vc)}).raw=Vc;var Xc=br(function(n){var t=Math.acos(n);return t&&t/Math.sin(t)},y);(ta.geo.azimuthalEquidistant=function(){return ur(Xc)}).raw=Xc,(ta.geo.conicConformal=function(){return Ye(_r)}).raw=_r,(ta.geo.conicEquidistant=function(){return Ye(wr)}).raw=wr;var $c=br(function(n){return 1/n},Math.atan);(ta.geo.gnomonic=function(){return ur($c)}).raw=$c,Sr.invert=function(n,t){return[n,2*Math.atan(Math.exp(t))-Ra]},(ta.geo.mercator=function(){return kr(Sr)}).raw=Sr;var Bc=br(function(){return 1},Math.asin);(ta.geo.orthographic=function(){return ur(Bc)}).raw=Bc;var Wc=br(function(n){return 1/(1+n)},function(n){return 2*Math.atan(n)});(ta.geo.stereographic=function(){return ur(Wc)}).raw=Wc,Er.invert=function(n,t){return[-t,2*Math.atan(Math.exp(n))-Ra]},(ta.geo.transverseMercator=function(){var n=kr(Er),t=n.center,e=n.rotate;return n.center=function(n){return n?t([-n[1],n[0]]):(n=t(),[n[1],-n[0]])},n.rotate=function(n){return n?e([n[0],n[1],n.length>2?n[2]+90:90]):(n=e(),[n[0],n[1],n[2]-90])},e([0,0,90])}).raw=Er,ta.geom={},ta.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=Et(e),i=Et(r),o=n.length,a=[],c=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(zr),t=0;o>t;t++)c.push([a[t][0],-a[t][1]]);var l=Cr(a),s=Cr(c),f=s[0]===l[0],h=s[s.length-1]===l[l.length-1],g=[];for(t=l.length-1;t>=0;--t)g.push(n[a[l[t]][2]]);for(t=+f;t<s.length-h;++t)g.push(n[a[s[t]][2]]);return g}var e=Ar,r=Nr;return arguments.length?t(n):(t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t)},ta.geom.polygon=function(n){return ya(n,Jc),n};var Jc=ta.geom.polygon.prototype=[];Jc.area=function(){for(var n,t=-1,e=this.length,r=this[e-1],u=0;++t<e;)n=r,r=this[t],u+=n[1]*r[0]-n[0]*r[1];return.5*u},Jc.centroid=function(n){var t,e,r=-1,u=this.length,i=0,o=0,a=this[u-1];for(arguments.length||(n=-1/(6*this.area()));++r<u;)t=a,a=this[r],e=t[0]*a[1]-a[0]*t[1],i+=(t[0]+a[0])*e,o+=(t[1]+a[1])*e;return[i*n,o*n]},Jc.clip=function(n){for(var t,e,r,u,i,o,a=Tr(n),c=-1,l=this.length-Tr(this),s=this[l-1];++c<l;){for(t=n.slice(),n.length=0,u=this[c],i=t[(r=t.length-a)-1],e=-1;++e<r;)o=t[e],qr(o,s,u)?(qr(i,s,u)||n.push(Lr(i,o,s,u)),n.push(o)):qr(i,s,u)&&n.push(Lr(i,o,s,u)),i=o;a&&n.push(n[0]),s=u}return n};var Gc,Kc,Qc,nl,tl,el=[],rl=[];Or.prototype.prepare=function(){for(var n,t=this.edges,e=t.length;e--;)n=t[e].edge,n.b&&n.a||t.splice(e,1);return t.sort(Yr),t.length},Qr.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},nu.prototype={insert:function(n,t){var e,r,u;if(n){if(t.P=n,t.N=n.N,n.N&&(n.N.P=t),n.N=t,n.R){for(n=n.R;n.L;)n=n.L;n.L=t}else n.R=t;e=n}else this._?(n=uu(this._),t.P=null,t.N=n,n.P=n.L=t,e=n):(t.P=t.N=null,this._=t,e=null);for(t.L=t.R=null,t.U=e,t.C=!0,n=t;e&&e.C;)r=e.U,e===r.L?(u=r.R,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.R&&(eu(this,e),n=e,e=n.U),e.C=!1,r.C=!0,ru(this,r))):(u=r.L,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.L&&(ru(this,e),n=e,e=n.U),e.C=!1,r.C=!0,eu(this,r))),e=n.U;this._.C=!1},remove:function(n){n.N&&(n.N.P=n.P),n.P&&(n.P.N=n.N),n.N=n.P=null;var t,e,r,u=n.U,i=n.L,o=n.R;if(e=i?o?uu(o):i:o,u?u.L===n?u.L=e:u.R=e:this._=e,i&&o?(r=e.C,e.C=n.C,e.L=i,i.U=e,e!==o?(u=e.U,e.U=n.U,n=e.R,u.L=n,e.R=o,o.U=e):(e.U=u,u=e,n=e.R)):(r=n.C,n=e),n&&(n.U=u),!r){if(n&&n.C)return void(n.C=!1);do{if(n===this._)break;if(n===u.L){if(t=u.R,t.C&&(t.C=!1,u.C=!0,eu(this,u),t=u.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,ru(this,t),t=u.R),t.C=u.C,u.C=t.R.C=!1,eu(this,u),n=this._;break}}else if(t=u.L,t.C&&(t.C=!1,u.C=!0,ru(this,u),t=u.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,eu(this,t),t=u.L),t.C=u.C,u.C=t.L.C=!1,ru(this,u),n=this._;break}t.C=!0,n=u,u=u.U}while(!n.C);n&&(n.C=!1)}}},ta.geom.voronoi=function(n){function t(n){var t=new Array(n.length),r=a[0][0],u=a[0][1],i=a[1][0],o=a[1][1];return iu(e(n),a).cells.forEach(function(e,a){var c=e.edges,l=e.site,s=t[a]=c.length?c.map(function(n){var t=n.start();return[t.x,t.y]}):l.x>=r&&l.x<=i&&l.y>=u&&l.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];s.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/Ca)*Ca,y:Math.round(o(n,t)/Ca)*Ca,i:t}})}var r=Ar,u=Nr,i=r,o=u,a=ul;return n?t(n):(t.links=function(n){return iu(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return iu(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(Yr),c=-1,l=a.length,s=a[l-1].edge,f=s.l===o?s.r:s.l;++c<l;)u=s,i=f,s=a[c].edge,f=s.l===o?s.r:s.l,r<i.i&&r<f.i&&au(o,i,f)<0&&t.push([n[r],n[i.i],n[f.i]])}),t},t.x=function(n){return arguments.length?(i=Et(r=n),t):r},t.y=function(n){return arguments.length?(o=Et(u=n),t):u},t.clipExtent=function(n){return arguments.length?(a=null==n?ul:n,t):a===ul?null:a},t.size=function(n){return arguments.length?t.clipExtent(n&&[[0,0],n]):a===ul?null:a&&a[1]},t)};var ul=[[-1e6,-1e6],[1e6,1e6]];ta.geom.delaunay=function(n){return ta.geom.voronoi().triangles(n)},ta.geom.quadtree=function(n,t,e,r,u){function i(n){function i(n,t,e,r,u,i,o,a){if(!isNaN(e)&&!isNaN(r))if(n.leaf){var c=n.x,s=n.y;if(null!=c)if(ga(c-e)+ga(s-r)<.01)l(n,t,e,r,u,i,o,a);else{var f=n.point;n.x=n.y=n.point=null,l(n,f,c,s,u,i,o,a),l(n,t,e,r,u,i,o,a)}else n.x=e,n.y=r,n.point=t}else l(n,t,e,r,u,i,o,a)}function l(n,t,e,r,u,o,a,c){var l=.5*(u+a),s=.5*(o+c),f=e>=l,h=r>=s,g=h<<1|f;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=su()),f?u=l:a=l,h?o=s:c=s,i(n,t,e,r,u,o,a,c)}var s,f,h,g,p,v,d,m,y,M=Et(a),x=Et(c);if(null!=t)v=t,d=e,m=r,y=u;else if(m=y=-(v=d=1/0),f=[],h=[],p=n.length,o)for(g=0;p>g;++g)s=n[g],s.x<v&&(v=s.x),s.y<d&&(d=s.y),s.x>m&&(m=s.x),s.y>y&&(y=s.y),f.push(s.x),h.push(s.y);else for(g=0;p>g;++g){var b=+M(s=n[g],g),_=+x(s,g);v>b&&(v=b),d>_&&(d=_),b>m&&(m=b),_>y&&(y=_),f.push(b),h.push(_)}var w=m-v,S=y-d;w>S?y=d+w:m=v+S;var k=su();if(k.add=function(n){i(k,n,+M(n,++g),+x(n,g),v,d,m,y)},k.visit=function(n){fu(n,k,v,d,m,y)},k.find=function(n){return hu(k,n[0],n[1],v,d,m,y)},g=-1,null==t){for(;++g<p;)i(k,n[g],f[g],h[g],v,d,m,y);--g}else n.forEach(k.add);return f=h=n=s=null,k}var o,a=Ar,c=Nr;return(o=arguments.length)?(a=cu,c=lu,3===o&&(u=e,r=t,e=t=0),i(n)):(i.x=function(n){return arguments.length?(a=n,i):a},i.y=function(n){return arguments.length?(c=n,i):c},i.extent=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=+n[0][0],e=+n[0][1],r=+n[1][0],u=+n[1][1]),i):null==t?null:[[t,e],[r,u]]},i.size=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=e=0,r=+n[0],u=+n[1]),i):null==t?null:[r-t,u-e]},i)},ta.interpolateRgb=gu,ta.interpolateObject=pu,ta.interpolateNumber=vu,ta.interpolateString=du;var il=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,ol=new RegExp(il.source,"g");ta.interpolate=mu,ta.interpolators=[function(n,t){var e=typeof t;return("string"===e?Ga.has(t.toLowerCase())||/^(#|rgb\(|hsl\()/i.test(t)?gu:du:t instanceof ot?gu:Array.isArray(t)?yu:"object"===e&&isNaN(t)?pu:vu)(n,t)}],ta.interpolateArray=yu;var al=function(){return y},cl=ta.map({linear:al,poly:ku,quad:function(){return _u},cubic:function(){return wu},sin:function(){return Eu},exp:function(){return Au},circle:function(){return Nu},elastic:Cu,back:zu,bounce:function(){return qu}}),ll=ta.map({"in":y,out:xu,"in-out":bu,"out-in":function(n){return bu(xu(n))}});ta.ease=function(n){var t=n.indexOf("-"),e=t>=0?n.slice(0,t):n,r=t>=0?n.slice(t+1):"in";return e=cl.get(e)||al,r=ll.get(r)||y,Mu(r(e.apply(null,ea.call(arguments,1))))},ta.interpolateHcl=Lu,ta.interpolateHsl=Tu,ta.interpolateLab=Ru,ta.interpolateRound=Du,ta.transform=function(n){var t=ua.createElementNS(ta.ns.prefix.svg,"g");return(ta.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Pu(e?e.matrix:sl)})(n)},Pu.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var sl={a:1,b:0,c:0,d:1,e:0,f:0};ta.interpolateTransform=Hu,ta.layout={},ta.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++e<r;)t.push(Yu(n[e]));return t}},ta.layout.chord=function(){function n(){var n,l,f,h,g,p={},v=[],d=ta.range(i),m=[];for(e=[],r=[],n=0,h=-1;++h<i;){for(l=0,g=-1;++g<i;)l+=u[h][g];v.push(l),m.push(ta.range(i)),n+=l}for(o&&d.sort(function(n,t){return o(v[n],v[t])}),a&&m.forEach(function(n,t){n.sort(function(n,e){return a(u[t][n],u[t][e])})}),n=(La-s*i)/n,l=0,h=-1;++h<i;){for(f=l,g=-1;++g<i;){var y=d[h],M=m[y][g],x=u[y][M],b=l,_=l+=x*n;p[y+"-"+M]={index:y,subindex:M,startAngle:b,endAngle:_,value:x}}r[y]={index:y,startAngle:f,endAngle:l,value:(l-f)/n},l+=s}for(h=-1;++h<i;)for(g=h-1;++g<i;){var w=p[h+"-"+g],S=p[g+"-"+h];(w.value||S.value)&&e.push(w.value<S.value?{source:S,target:w}:{source:w,target:S})}c&&t()}function t(){e.sort(function(n,t){return c((n.source.value+n.target.value)/2,(t.source.value+t.target.value)/2)})}var e,r,u,i,o,a,c,l={},s=0;return l.matrix=function(n){return arguments.length?(i=(u=n)&&u.length,e=r=null,l):u},l.padding=function(n){return arguments.length?(s=n,e=r=null,l):s},l.sortGroups=function(n){return arguments.length?(o=n,e=r=null,l):o},l.sortSubgroups=function(n){return arguments.length?(a=n,e=null,l):a},l.sortChords=function(n){return arguments.length?(c=n,e&&t(),l):c},l.chords=function(){return e||n(),e},l.groups=function(){return r||n(),r},l},ta.layout.force=function(){function n(n){return function(t,e,r,u){if(t.point!==n){var i=t.cx-n.x,o=t.cy-n.y,a=u-e,c=i*i+o*o;if(c>a*a/d){if(p>c){var l=t.charge/c;n.px-=i*l,n.py-=o*l}return!0}if(t.point&&c&&p>c){var l=t.pointCharge/c;n.px-=i*l,n.py-=o*l}}return!t.charge}}function t(n){n.px=ta.event.x,n.py=ta.event.y,a.resume()}var e,r,u,i,o,a={},c=ta.dispatch("start","tick","end"),l=[1,1],s=.9,f=fl,h=hl,g=-30,p=gl,v=.1,d=.64,m=[],M=[];return a.tick=function(){if((r*=.99)<.005)return c.end({type:"end",alpha:r=0}),!0;var t,e,a,f,h,p,d,y,x,b=m.length,_=M.length;for(e=0;_>e;++e)a=M[e],f=a.source,h=a.target,y=h.x-f.x,x=h.y-f.y,(p=y*y+x*x)&&(p=r*i[e]*((p=Math.sqrt(p))-u[e])/p,y*=p,x*=p,h.x-=y*(d=f.weight/(h.weight+f.weight)),h.y-=x*d,f.x+=y*(d=1-d),f.y+=x*d);if((d=r*v)&&(y=l[0]/2,x=l[1]/2,e=-1,d))for(;++e<b;)a=m[e],a.x+=(y-a.x)*d,a.y+=(x-a.y)*d;if(g)for(Ju(t=ta.geom.quadtree(m),r,o),e=-1;++e<b;)(a=m[e]).fixed||t.visit(n(a));for(e=-1;++e<b;)a=m[e],a.fixed?(a.x=a.px,a.y=a.py):(a.x-=(a.px-(a.px=a.x))*s,a.y-=(a.py-(a.py=a.y))*s);c.tick({type:"tick",alpha:r})},a.nodes=function(n){return arguments.length?(m=n,a):m},a.links=function(n){return arguments.length?(M=n,a):M},a.size=function(n){return arguments.length?(l=n,a):l},a.linkDistance=function(n){return arguments.length?(f="function"==typeof n?n:+n,a):f},a.distance=a.linkDistance,a.linkStrength=function(n){return arguments.length?(h="function"==typeof n?n:+n,a):h},a.friction=function(n){return arguments.length?(s=+n,a):s},a.charge=function(n){return arguments.length?(g="function"==typeof n?n:+n,a):g},a.chargeDistance=function(n){return arguments.length?(p=n*n,a):Math.sqrt(p)},a.gravity=function(n){return arguments.length?(v=+n,a):v},a.theta=function(n){return arguments.length?(d=n*n,a):Math.sqrt(d)},a.alpha=function(n){return arguments.length?(n=+n,r?r=n>0?n:0:n>0&&(c.start({type:"start",alpha:r=n}),ta.timer(a.tick)),a):r},a.start=function(){function n(n,r){if(!e){for(e=new Array(c),a=0;c>a;++a)e[a]=[];for(a=0;s>a;++a){var u=M[a];e[u.source.index].push(u.target),e[u.target.index].push(u.source)}}for(var i,o=e[t],a=-1,l=o.length;++a<l;)if(!isNaN(i=o[a][n]))return i;return Math.random()*r}var t,e,r,c=m.length,s=M.length,p=l[0],v=l[1];for(t=0;c>t;++t)(r=m[t]).index=t,r.weight=0;for(t=0;s>t;++t)r=M[t],"number"==typeof r.source&&(r.source=m[r.source]),"number"==typeof r.target&&(r.target=m[r.target]),++r.source.weight,++r.target.weight;for(t=0;c>t;++t)r=m[t],isNaN(r.x)&&(r.x=n("x",p)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(u=[],"function"==typeof f)for(t=0;s>t;++t)u[t]=+f.call(this,M[t],t);else for(t=0;s>t;++t)u[t]=f;if(i=[],"function"==typeof h)for(t=0;s>t;++t)i[t]=+h.call(this,M[t],t);else for(t=0;s>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,m[t],t);else for(t=0;c>t;++t)o[t]=g;return a.resume()},a.resume=function(){return a.alpha(.1)},a.stop=function(){return a.alpha(0)},a.drag=function(){return e||(e=ta.behavior.drag().origin(y).on("dragstart.force",Xu).on("drag.force",t).on("dragend.force",$u)),arguments.length?void this.on("mouseover.force",Bu).on("mouseout.force",Wu).call(e):e},ta.rebind(a,c,"on")};var fl=20,hl=1,gl=1/0;ta.layout.hierarchy=function(){function n(u){var i,o=[u],a=[];for(u.depth=0;null!=(i=o.pop());)if(a.push(i),(l=e.call(n,i,i.depth))&&(c=l.length)){for(var c,l,s;--c>=0;)o.push(s=l[c]),s.parent=i,s.depth=i.depth+1;r&&(i.value=0),i.children=l}else r&&(i.value=+r.call(n,i,i.depth)||0),delete i.children;return Qu(u,function(n){var e,u;t&&(e=n.children)&&e.sort(t),r&&(u=n.parent)&&(u.value+=n.value)}),a}var t=ei,e=ni,r=ti;return n.sort=function(e){return arguments.length?(t=e,n):t},n.children=function(t){return arguments.length?(e=t,n):e},n.value=function(t){return arguments.length?(r=t,n):r},n.revalue=function(t){return r&&(Ku(t,function(n){n.children&&(n.value=0)}),Qu(t,function(t){var e;t.children||(t.value=+r.call(n,t,t.depth)||0),(e=t.parent)&&(e.value+=t.value)})),t},n},ta.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,c,l=-1;for(r=t.value?r/t.value:0;++l<o;)n(a=i[l],e,c=a.value*r,u),e+=c}}function t(n){var e=n.children,r=0;if(e&&(u=e.length))for(var u,i=-1;++i<u;)r=Math.max(r,t(e[i]));return 1+r}function e(e,i){var o=r.call(this,e,i);return n(o[0],0,u[0],u[1]/t(o[0])),o}var r=ta.layout.hierarchy(),u=[1,1];return e.size=function(n){return arguments.length?(u=n,e):u},Gu(e,r)},ta.layout.pie=function(){function n(o){var a,c=o.length,l=o.map(function(e,r){return+t.call(n,e,r)}),s=+("function"==typeof r?r.apply(this,arguments):r),f=("function"==typeof u?u.apply(this,arguments):u)-s,h=Math.min(Math.abs(f)/c,+("function"==typeof i?i.apply(this,arguments):i)),g=h*(0>f?-1:1),p=(f-c*g)/ta.sum(l),v=ta.range(c),d=[];return null!=e&&v.sort(e===pl?function(n,t){return l[t]-l[n]}:function(n,t){return e(o[n],o[t])}),v.forEach(function(n){d[n]={data:o[n],value:a=l[n],startAngle:s,endAngle:s+=a*p+g,padAngle:h}}),d}var t=Number,e=pl,r=0,u=La,i=0;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n.padAngle=function(t){return arguments.length?(i=t,n):i},n};var pl={};ta.layout.stack=function(){function n(a,c){if(!(h=a.length))return a;var l=a.map(function(e,r){return t.call(n,e,r)}),s=l.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),f=e.call(n,s,c);l=ta.permute(l,f),s=ta.permute(s,f);var h,g,p,v,d=r.call(n,s,c),m=l[0].length;for(p=0;m>p;++p)for(u.call(n,l[0][p],v=d[p],s[0][p][1]),g=1;h>g;++g)u.call(n,l[g][p],v+=s[g-1][p][1],s[g][p][1]);return a}var t=y,e=ai,r=ci,u=oi,i=ui,o=ii;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:vl.get(t)||ai,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:dl.get(t)||ci,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var vl=ta.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(li),i=n.map(si),o=ta.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,c=0,l=[],s=[];for(t=0;r>t;++t)e=o[t],c>a?(a+=i[e],l.push(e)):(c+=i[e],s.push(e));return s.reverse().concat(l)},reverse:function(n){return ta.range(n.length).reverse()},"default":ai}),dl=ta.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,c=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)c[e]=(a-o[e])/2;return c},wiggle:function(n){var t,e,r,u,i,o,a,c,l,s=n.length,f=n[0],h=f.length,g=[];for(g[0]=c=l=0,e=1;h>e;++e){for(t=0,u=0;s>t;++t)u+=n[t][e][1];for(t=0,i=0,a=f[e][0]-f[e-1][0];s>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=c-=u?i/u*a:0,l>c&&(l=c)}for(e=0;h>e;++e)g[e]-=l;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:ci});ta.layout.histogram=function(){function n(n,i){for(var o,a,c=[],l=n.map(e,this),s=r.call(this,l,i),f=u.call(this,s,l,i),i=-1,h=l.length,g=f.length-1,p=t?1:1/h;++i<g;)o=c[i]=[],o.dx=f[i+1]-(o.x=f[i]),o.y=0;if(g>0)for(i=-1;++i<h;)a=l[i],a>=s[0]&&a<=s[1]&&(o=c[ta.bisect(f,a,1,g)-1],o.y+=p,o.push(n[i]));return c}var t=!0,e=Number,r=pi,u=hi;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=Et(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return gi(n,t)}:Et(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},ta.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],c=u[0],l=u[1],s=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,Qu(a,function(n){n.r=+s(n.value)}),Qu(a,Mi),r){var f=r*(t?1:Math.max(2*a.r/c,2*a.r/l))/2;Qu(a,function(n){n.r+=f}),Qu(a,Mi),Qu(a,function(n){n.r-=f})}return _i(a,c/2,l/2,t?1:1/Math.max(2*a.r/c,2*a.r/l)),o}var t,e=ta.layout.hierarchy().sort(vi),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Gu(n,e)},ta.layout.tree=function(){function n(n,u){var s=o.call(this,n,u),f=s[0],h=t(f);if(Qu(h,e),h.parent.m=-h.z,Ku(h,r),l)Ku(f,i);else{var g=f,p=f,v=f;Ku(f,function(n){n.x<g.x&&(g=n),n.x>p.x&&(p=n),n.depth>v.depth&&(v=n)});var d=a(g,p)/2-g.x,m=c[0]/(p.x+a(p,g)/2+d),y=c[1]/(v.depth||1);Ku(f,function(n){n.x=(n.x+d)*m,n.y=n.depth*y})}return s}function t(n){for(var t,e={A:null,children:[n]},r=[e];null!=(t=r.pop());)for(var u,i=t.children,o=0,a=i.length;a>o;++o)r.push((i[o]=u={_:i[o],parent:t,children:(u=i[o].children)&&u.slice()||[],A:null,a:null,z:0,m:0,c:0,s:0,t:null,i:o}).a=u);return e.children[0]}function e(n){var t=n.children,e=n.parent.children,r=n.i?e[n.i-1]:null;if(t.length){Ni(n);var i=(t[0].z+t[t.length-1].z)/2;r?(n.z=r.z+a(n._,r._),n.m=n.z-i):n.z=i}else r&&(n.z=r.z+a(n._,r._));n.parent.A=u(n,r,n.parent.A||e[0])}function r(n){n._.x=n.z+n.parent.m,n.m+=n.parent.m}function u(n,t,e){if(t){for(var r,u=n,i=n,o=t,c=u.parent.children[0],l=u.m,s=i.m,f=o.m,h=c.m;o=Ei(o),u=ki(u),o&&u;)c=ki(c),i=Ei(i),i.a=n,r=o.z+f-u.z-l+a(o._,u._),r>0&&(Ai(Ci(o,n,e),n,r),l+=r,s+=r),f+=o.m,l+=u.m,h+=c.m,s+=i.m;o&&!Ei(i)&&(i.t=o,i.m+=f-s),u&&!ki(c)&&(c.t=u,c.m+=l-h,e=n)}return e}function i(n){n.x*=c[0],n.y=n.depth*c[1]}var o=ta.layout.hierarchy().sort(null).value(null),a=Si,c=[1,1],l=null;return n.separation=function(t){return arguments.length?(a=t,n):a},n.size=function(t){return arguments.length?(l=null==(c=t)?i:null,n):l?null:c},n.nodeSize=function(t){return arguments.length?(l=null==(c=t)?null:i,n):l?c:null},Gu(n,o)},ta.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),c=a[0],l=0;Qu(c,function(n){var t=n.children;t&&t.length?(n.x=qi(t),n.y=zi(t)):(n.x=o?l+=e(n,o):0,n.y=0,o=n)});var s=Li(c),f=Ti(c),h=s.x-e(s,f)/2,g=f.x+e(f,s)/2;return Qu(c,u?function(n){n.x=(n.x-c.x)*r[0],n.y=(c.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(c.y?n.y/c.y:1))*r[1]}),a}var t=ta.layout.hierarchy().sort(null).value(null),e=Si,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Gu(n,t)},ta.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++u<i;)r=(e=n[u]).value*(0>t?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,c,l=f(e),s=[],h=i.slice(),p=1/0,v="slice"===g?l.dx:"dice"===g?l.dy:"slice-dice"===g?1&e.depth?l.dy:l.dx:Math.min(l.dx,l.dy);for(n(h,l.dx*l.dy/e.value),s.area=0;(c=h.length)>0;)s.push(o=h[c-1]),s.area+=o.area,"squarify"!==g||(a=r(s,v))<=p?(h.pop(),p=a):(s.area-=s.pop().area,u(s,v,l,!1),v=Math.min(l.dx,l.dy),s.length=s.area=0,p=1/0);s.length&&(u(s,v,l,!0),s.length=s.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=f(t),a=r.slice(),c=[];for(n(a,o.dx*o.dy/t.value),c.area=0;i=a.pop();)c.push(i),c.area+=i.area,null!=i.z&&(u(c,i.z?o.dx:o.dy,o,!a.length),c.length=c.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++o<a;)(e=n[o].area)&&(i>e&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,l=e.y,s=t?c(n.area/t):0;if(t==e.dx){for((r||s>e.dy)&&(s=e.dy);++i<o;)u=n[i],u.x=a,u.y=l,u.dy=s,a+=u.dx=Math.min(e.x+e.dx-a,s?c(u.area/s):0);u.z=!0,u.dx+=e.x+e.dx-a,e.y+=s,e.dy-=s}else{for((r||s>e.dx)&&(s=e.dx);++i<o;)u=n[i],u.x=a,u.y=l,u.dx=s,l+=u.dy=Math.min(e.y+e.dy-l,s?c(u.area/s):0);u.z=!1,u.dy+=e.y+e.dy-l,e.x+=s,e.dx-=s}}function i(r){var u=o||a(r),i=u[0];return i.x=0,i.y=0,i.dx=l[0],i.dy=l[1],o&&a.revalue(i),n([i],i.dx*i.dy/i.value),(o?e:t)(i),h&&(o=u),u}var o,a=ta.layout.hierarchy(),c=Math.round,l=[1,1],s=null,f=Ri,h=!1,g="squarify",p=.5*(1+Math.sqrt(5));
-    return i.size=function(n){return arguments.length?(l=n,i):l},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Ri(t):Di(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return Di(t,n)}if(!arguments.length)return s;var r;return f=null==(s=n)?Ri:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Gu(i,a)},ta.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=ta.random.normal.apply(ta,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=ta.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},ta.scale={};var ml={floor:y,ceil:y};ta.scale.linear=function(){return Ii([0,1],[0,1],mu,!1)};var yl={s:1,g:1,p:1,r:1,e:1};ta.scale.log=function(){return Ji(ta.scale.linear().domain([0,1]),10,!0,[1,10])};var Ml=ta.format(".0e"),xl={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};ta.scale.pow=function(){return Gi(ta.scale.linear(),1,[0,1])},ta.scale.sqrt=function(){return ta.scale.pow().exponent(.5)},ta.scale.ordinal=function(){return Qi([],{t:"range",a:[[]]})},ta.scale.category10=function(){return ta.scale.ordinal().range(bl)},ta.scale.category20=function(){return ta.scale.ordinal().range(_l)},ta.scale.category20b=function(){return ta.scale.ordinal().range(wl)},ta.scale.category20c=function(){return ta.scale.ordinal().range(Sl)};var bl=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(Mt),_l=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(Mt),wl=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(Mt),Sl=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(Mt);ta.scale.quantile=function(){return no([],[])},ta.scale.quantize=function(){return to(0,1,[0,1])},ta.scale.threshold=function(){return eo([.5],[0,1])},ta.scale.identity=function(){return ro([0,1])},ta.svg={},ta.svg.arc=function(){function n(){var n=Math.max(0,+e.apply(this,arguments)),l=Math.max(0,+r.apply(this,arguments)),s=o.apply(this,arguments)-Ra,f=a.apply(this,arguments)-Ra,h=Math.abs(f-s),g=s>f?0:1;if(n>l&&(p=l,l=n,n=p),h>=Ta)return t(l,g)+(n?t(n,1-g):"")+"Z";var p,v,d,m,y,M,x,b,_,w,S,k,E=0,A=0,N=[];if((m=(+c.apply(this,arguments)||0)/2)&&(d=i===kl?Math.sqrt(n*n+l*l):+i.apply(this,arguments),g||(A*=-1),l&&(A=tt(d/l*Math.sin(m))),n&&(E=tt(d/n*Math.sin(m)))),l){y=l*Math.cos(s+A),M=l*Math.sin(s+A),x=l*Math.cos(f-A),b=l*Math.sin(f-A);var C=Math.abs(f-s-2*A)<=qa?0:1;if(A&&so(y,M,x,b)===g^C){var z=(s+f)/2;y=l*Math.cos(z),M=l*Math.sin(z),x=b=null}}else y=M=0;if(n){_=n*Math.cos(f-E),w=n*Math.sin(f-E),S=n*Math.cos(s+E),k=n*Math.sin(s+E);var q=Math.abs(s-f+2*E)<=qa?0:1;if(E&&so(_,w,S,k)===1-g^q){var L=(s+f)/2;_=n*Math.cos(L),w=n*Math.sin(L),S=k=null}}else _=w=0;if((p=Math.min(Math.abs(l-n)/2,+u.apply(this,arguments)))>.001){v=l>n^g?0:1;var T=null==S?[_,w]:null==x?[y,M]:Lr([y,M],[S,k],[x,b],[_,w]),R=y-T[0],D=M-T[1],P=x-T[0],U=b-T[1],j=1/Math.sin(Math.acos((R*P+D*U)/(Math.sqrt(R*R+D*D)*Math.sqrt(P*P+U*U)))/2),F=Math.sqrt(T[0]*T[0]+T[1]*T[1]);if(null!=x){var H=Math.min(p,(l-F)/(j+1)),O=fo(null==S?[_,w]:[S,k],[y,M],l,H,g),I=fo([x,b],[_,w],l,H,g);p===H?N.push("M",O[0],"A",H,",",H," 0 0,",v," ",O[1],"A",l,",",l," 0 ",1-g^so(O[1][0],O[1][1],I[1][0],I[1][1]),",",g," ",I[1],"A",H,",",H," 0 0,",v," ",I[0]):N.push("M",O[0],"A",H,",",H," 0 1,",v," ",I[0])}else N.push("M",y,",",M);if(null!=S){var Y=Math.min(p,(n-F)/(j-1)),Z=fo([y,M],[S,k],n,-Y,g),V=fo([_,w],null==x?[y,M]:[x,b],n,-Y,g);p===Y?N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",V[1],"A",n,",",n," 0 ",g^so(V[1][0],V[1][1],Z[1][0],Z[1][1]),",",1-g," ",Z[1],"A",Y,",",Y," 0 0,",v," ",Z[0]):N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",Z[0])}else N.push("L",_,",",w)}else N.push("M",y,",",M),null!=x&&N.push("A",l,",",l," 0 ",C,",",g," ",x,",",b),N.push("L",_,",",w),null!=S&&N.push("A",n,",",n," 0 ",q,",",1-g," ",S,",",k);return N.push("Z"),N.join("")}function t(n,t){return"M0,"+n+"A"+n+","+n+" 0 1,"+t+" 0,"+-n+"A"+n+","+n+" 0 1,"+t+" 0,"+n}var e=io,r=oo,u=uo,i=kl,o=ao,a=co,c=lo;return n.innerRadius=function(t){return arguments.length?(e=Et(t),n):e},n.outerRadius=function(t){return arguments.length?(r=Et(t),n):r},n.cornerRadius=function(t){return arguments.length?(u=Et(t),n):u},n.padRadius=function(t){return arguments.length?(i=t==kl?kl:Et(t),n):i},n.startAngle=function(t){return arguments.length?(o=Et(t),n):o},n.endAngle=function(t){return arguments.length?(a=Et(t),n):a},n.padAngle=function(t){return arguments.length?(c=Et(t),n):c},n.centroid=function(){var n=(+e.apply(this,arguments)+ +r.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-Ra;return[Math.cos(t)*n,Math.sin(t)*n]},n};var kl="auto";ta.svg.line=function(){return ho(y)};var El=ta.map({linear:go,"linear-closed":po,step:vo,"step-before":mo,"step-after":yo,basis:So,"basis-open":ko,"basis-closed":Eo,bundle:Ao,cardinal:bo,"cardinal-open":Mo,"cardinal-closed":xo,monotone:To});El.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var Al=[0,2/3,1/3,0],Nl=[0,1/3,2/3,0],Cl=[0,1/6,2/3,1/6];ta.svg.line.radial=function(){var n=ho(Ro);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},mo.reverse=yo,yo.reverse=mo,ta.svg.area=function(){return Do(y)},ta.svg.area.radial=function(){var n=Do(Ro);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},ta.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),l=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,l)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,l.r,l.p0)+r(l.r,l.p1,l.a1-l.a0)+u(l.r,l.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)-Ra,s=l.call(n,u,r)-Ra;return{r:i,a0:o,a1:s,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(s),i*Math.sin(s)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>qa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=mr,o=yr,a=Po,c=ao,l=co;return n.radius=function(t){return arguments.length?(a=Et(t),n):a},n.source=function(t){return arguments.length?(i=Et(t),n):i},n.target=function(t){return arguments.length?(o=Et(t),n):o},n.startAngle=function(t){return arguments.length?(c=Et(t),n):c},n.endAngle=function(t){return arguments.length?(l=Et(t),n):l},n},ta.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=mr,e=yr,r=Uo;return n.source=function(e){return arguments.length?(t=Et(e),n):t},n.target=function(t){return arguments.length?(e=Et(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},ta.svg.diagonal.radial=function(){var n=ta.svg.diagonal(),t=Uo,e=n.projection;return n.projection=function(n){return arguments.length?e(jo(t=n)):t},n},ta.svg.symbol=function(){function n(n,r){return(zl.get(t.call(this,n,r))||Oo)(e.call(this,n,r))}var t=Ho,e=Fo;return n.type=function(e){return arguments.length?(t=Et(e),n):t},n.size=function(t){return arguments.length?(e=Et(t),n):e},n};var zl=ta.map({circle:Oo,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Ll)),e=t*Ll;return"M0,"+-t+"L"+e+",0 0,"+t+" "+-e+",0Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});ta.svg.symbolTypes=zl.keys();var ql=Math.sqrt(3),Ll=Math.tan(30*Da);_a.transition=function(n){for(var t,e,r=Tl||++Ul,u=Xo(n),i=[],o=Rl||{time:Date.now(),ease:Su,delay:0,duration:250},a=-1,c=this.length;++a<c;){i.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(e=l[s])&&$o(e,s,u,r,o),t.push(e)}return Yo(i,u,r)},_a.interrupt=function(n){return this.each(null==n?Dl:Io(Xo(n)))};var Tl,Rl,Dl=Io(Xo()),Pl=[],Ul=0;Pl.call=_a.call,Pl.empty=_a.empty,Pl.node=_a.node,Pl.size=_a.size,ta.transition=function(n,t){return n&&n.transition?Tl?n.transition(t):n:ta.selection().transition(n)},ta.transition.prototype=Pl,Pl.select=function(n){var t,e,r,u=this.id,i=this.namespace,o=[];n=N(n);for(var a=-1,c=this.length;++a<c;){o.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(r=l[s])&&(e=n.call(r,r.__data__,s,a))?("__data__"in r&&(e.__data__=r.__data__),$o(e,s,i,u,r[i][u]),t.push(e)):t.push(null)}return Yo(o,i,u)},Pl.selectAll=function(n){var t,e,r,u,i,o=this.id,a=this.namespace,c=[];n=C(n);for(var l=-1,s=this.length;++l<s;)for(var f=this[l],h=-1,g=f.length;++h<g;)if(r=f[h]){i=r[a][o],e=n.call(r,r.__data__,h,l),c.push(t=[]);for(var p=-1,v=e.length;++p<v;)(u=e[p])&&$o(u,p,a,o,i),t.push(u)}return Yo(c,a,o)},Pl.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Yo(u,this.namespace,this.id)},Pl.tween=function(n,t){var e=this.id,r=this.namespace;return arguments.length<2?this.node()[r][e].tween.get(n):Y(this,null==t?function(t){t[r][e].tween.remove(n)}:function(u){u[r][e].tween.set(n,t)})},Pl.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Hu:mu,a=ta.ns.qualify(n);return Zo(this,"attr."+n,t,a.local?i:u)},Pl.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=ta.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Pl.style=function(n,e,r){function u(){this.style.removeProperty(n)}function i(e){return null==e?u:(e+="",function(){var u,i=t(this).getComputedStyle(this,null).getPropertyValue(n);return i!==e&&(u=mu(i,e),function(t){this.style.setProperty(n,u(t),r)})})}var o=arguments.length;if(3>o){if("string"!=typeof n){2>o&&(e="");for(r in n)this.style(r,n[r],e);return this}r=""}return Zo(this,"style."+n,e,i)},Pl.styleTween=function(n,e,r){function u(u,i){var o=e.call(this,u,i,t(this).getComputedStyle(this,null).getPropertyValue(n));return o&&function(t){this.style.setProperty(n,o(t),r)}}return arguments.length<3&&(r=""),this.tween("style."+n,u)},Pl.text=function(n){return Zo(this,"text",n,Vo)},Pl.remove=function(){var n=this.namespace;return this.each("end.transition",function(){var t;this[n].count<2&&(t=this.parentNode)&&t.removeChild(this)})},Pl.ease=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].ease:("function"!=typeof n&&(n=ta.ease.apply(ta,arguments)),Y(this,function(r){r[e][t].ease=n}))},Pl.delay=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].delay:Y(this,"function"==typeof n?function(r,u,i){r[e][t].delay=+n.call(r,r.__data__,u,i)}:(n=+n,function(r){r[e][t].delay=n}))},Pl.duration=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].duration:Y(this,"function"==typeof n?function(r,u,i){r[e][t].duration=Math.max(1,n.call(r,r.__data__,u,i))}:(n=Math.max(1,n),function(r){r[e][t].duration=n}))},Pl.each=function(n,t){var e=this.id,r=this.namespace;if(arguments.length<2){var u=Rl,i=Tl;try{Tl=e,Y(this,function(t,u,i){Rl=t[r][e],n.call(t,t.__data__,u,i)})}finally{Rl=u,Tl=i}}else Y(this,function(u){var i=u[r][e];(i.event||(i.event=ta.dispatch("start","end","interrupt"))).on(n,t)});return this},Pl.transition=function(){for(var n,t,e,r,u=this.id,i=++Ul,o=this.namespace,a=[],c=0,l=this.length;l>c;c++){a.push(n=[]);for(var t=this[c],s=0,f=t.length;f>s;s++)(e=t[s])&&(r=e[o][u],$o(e,s,o,i,{time:r.time,ease:r.ease,delay:r.delay+r.duration,duration:r.duration})),n.push(e)}return Yo(a,o,i)},ta.svg.axis=function(){function n(n){n.each(function(){var n,l=ta.select(this),s=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):y:t,p=l.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Ca),d=ta.transition(p.exit()).style("opacity",Ca).remove(),m=ta.transition(p.order()).style("opacity",1),M=Math.max(u,0)+o,x=Ui(f),b=l.selectAll(".domain").data([0]),_=(b.enter().append("path").attr("class","domain"),ta.transition(b));v.append("line"),v.append("text");var w,S,k,E,A=v.select("line"),N=m.select("line"),C=p.select("text").text(g),z=v.select("text"),q=m.select("text"),L="top"===r||"left"===r?-1:1;if("bottom"===r||"top"===r?(n=Bo,w="x",k="y",S="x2",E="y2",C.attr("dy",0>L?"0em":".71em").style("text-anchor","middle"),_.attr("d","M"+x[0]+","+L*i+"V0H"+x[1]+"V"+L*i)):(n=Wo,w="y",k="x",S="y2",E="x2",C.attr("dy",".32em").style("text-anchor",0>L?"end":"start"),_.attr("d","M"+L*i+","+x[0]+"H0V"+x[1]+"H"+L*i)),A.attr(E,L*u),z.attr(k,L*M),N.attr(S,0).attr(E,L*u),q.attr(w,0).attr(k,L*M),f.rangeBand){var T=f,R=T.rangeBand()/2;s=f=function(n){return T(n)+R}}else s.rangeBand?s=f:d.call(n,f,s);v.call(n,s,f),m.call(n,f,f)})}var t,e=ta.scale.linear(),r=jl,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in Fl?t+"":jl,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var jl="bottom",Fl={top:1,right:1,bottom:1,left:1};ta.svg.brush=function(){function n(t){t.each(function(){var t=ta.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",i).on("touchstart.brush",i),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(v,y);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return Hl[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var c,f=ta.transition(t),h=ta.transition(o);l&&(c=Ui(l),h.attr("x",c[0]).attr("width",c[1]-c[0]),r(f)),s&&(c=Ui(s),h.attr("y",c[0]).attr("height",c[1]-c[0]),u(f)),e(f)})}function e(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+f[+/e$/.test(n)]+","+h[+/^s/.test(n)]+")"})}function r(n){n.select(".extent").attr("x",f[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",f[1]-f[0])}function u(n){n.select(".extent").attr("y",h[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",h[1]-h[0])}function i(){function i(){32==ta.event.keyCode&&(C||(M=null,q[0]-=f[1],q[1]-=h[1],C=2),S())}function v(){32==ta.event.keyCode&&2==C&&(q[0]+=f[1],q[1]+=h[1],C=0,S())}function d(){var n=ta.mouse(b),t=!1;x&&(n[0]+=x[0],n[1]+=x[1]),C||(ta.event.altKey?(M||(M=[(f[0]+f[1])/2,(h[0]+h[1])/2]),q[0]=f[+(n[0]<M[0])],q[1]=h[+(n[1]<M[1])]):M=null),A&&m(n,l,0)&&(r(k),t=!0),N&&m(n,s,1)&&(u(k),t=!0),t&&(e(k),w({type:"brush",mode:C?"move":"resize"}))}function m(n,t,e){var r,u,i=Ui(t),c=i[0],l=i[1],s=q[e],v=e?h:f,d=v[1]-v[0];return C&&(c-=s,l-=d+s),r=(e?p:g)?Math.max(c,Math.min(l,n[e])):n[e],C?u=(r+=s)+d:(M&&(s=Math.max(c,Math.min(l,2*M[e]-r))),r>s?(u=r,r=s):u=s),v[0]!=r||v[1]!=u?(e?a=null:o=null,v[0]=r,v[1]=u,!0):void 0}function y(){d(),k.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),ta.select("body").style("cursor",null),L.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),z(),w({type:"brushend"})}var M,x,b=this,_=ta.select(ta.event.target),w=c.of(b,arguments),k=ta.select(b),E=_.datum(),A=!/^(n|s)$/.test(E)&&l,N=!/^(e|w)$/.test(E)&&s,C=_.classed("extent"),z=W(b),q=ta.mouse(b),L=ta.select(t(b)).on("keydown.brush",i).on("keyup.brush",v);if(ta.event.changedTouches?L.on("touchmove.brush",d).on("touchend.brush",y):L.on("mousemove.brush",d).on("mouseup.brush",y),k.interrupt().selectAll("*").interrupt(),C)q[0]=f[0]-q[0],q[1]=h[0]-q[1];else if(E){var T=+/w$/.test(E),R=+/^n/.test(E);x=[f[1-T]-q[0],h[1-R]-q[1]],q[0]=f[T],q[1]=h[R]}else ta.event.altKey&&(M=q.slice());k.style("pointer-events","none").selectAll(".resize").style("display",null),ta.select("body").style("cursor",_.style("cursor")),w({type:"brushstart"}),d()}var o,a,c=E(n,"brushstart","brush","brushend"),l=null,s=null,f=[0,0],h=[0,0],g=!0,p=!0,v=Ol[0];return n.event=function(n){n.each(function(){var n=c.of(this,arguments),t={x:f,y:h,i:o,j:a},e=this.__chart__||t;this.__chart__=t,Tl?ta.select(this).transition().each("start.brush",function(){o=e.i,a=e.j,f=e.x,h=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=yu(f,t.x),r=yu(h,t.y);return o=a=null,function(u){f=t.x=e(u),h=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){o=t.i,a=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(l=t,v=Ol[!l<<1|!s],n):l},n.y=function(t){return arguments.length?(s=t,v=Ol[!l<<1|!s],n):s},n.clamp=function(t){return arguments.length?(l&&s?(g=!!t[0],p=!!t[1]):l?g=!!t:s&&(p=!!t),n):l&&s?[g,p]:l?g:s?p:null},n.extent=function(t){var e,r,u,i,c;return arguments.length?(l&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),o=[e,r],l.invert&&(e=l(e),r=l(r)),e>r&&(c=e,e=r,r=c),(e!=f[0]||r!=f[1])&&(f=[e,r])),s&&(u=t[0],i=t[1],l&&(u=u[1],i=i[1]),a=[u,i],s.invert&&(u=s(u),i=s(i)),u>i&&(c=u,u=i,i=c),(u!=h[0]||i!=h[1])&&(h=[u,i])),n):(l&&(o?(e=o[0],r=o[1]):(e=f[0],r=f[1],l.invert&&(e=l.invert(e),r=l.invert(r)),e>r&&(c=e,e=r,r=c))),s&&(a?(u=a[0],i=a[1]):(u=h[0],i=h[1],s.invert&&(u=s.invert(u),i=s.invert(i)),u>i&&(c=u,u=i,i=c))),l&&s?[[e,u],[r,i]]:l?[e,r]:s&&[u,i])},n.clear=function(){return n.empty()||(f=[0,0],h=[0,0],o=a=null),n},n.empty=function(){return!!l&&f[0]==f[1]||!!s&&h[0]==h[1]},ta.rebind(n,c,"on")};var Hl={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Ol=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Il=ac.format=gc.timeFormat,Yl=Il.utc,Zl=Yl("%Y-%m-%dT%H:%M:%S.%LZ");Il.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Jo:Zl,Jo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Jo.toString=Zl.toString,ac.second=Ft(function(n){return new cc(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),ac.seconds=ac.second.range,ac.seconds.utc=ac.second.utc.range,ac.minute=Ft(function(n){return new cc(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),ac.minutes=ac.minute.range,ac.minutes.utc=ac.minute.utc.range,ac.hour=Ft(function(n){var t=n.getTimezoneOffset()/60;return new cc(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),ac.hours=ac.hour.range,ac.hours.utc=ac.hour.utc.range,ac.month=Ft(function(n){return n=ac.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),ac.months=ac.month.range,ac.months.utc=ac.month.utc.range;var Vl=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Xl=[[ac.second,1],[ac.second,5],[ac.second,15],[ac.second,30],[ac.minute,1],[ac.minute,5],[ac.minute,15],[ac.minute,30],[ac.hour,1],[ac.hour,3],[ac.hour,6],[ac.hour,12],[ac.day,1],[ac.day,2],[ac.week,1],[ac.month,1],[ac.month,3],[ac.year,1]],$l=Il.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",Ne]]),Bl={range:function(n,t,e){return ta.range(Math.ceil(n/e)*e,+t,e).map(Ko)},floor:y,ceil:y};Xl.year=ac.year,ac.scale=function(){return Go(ta.scale.linear(),Xl,$l)};var Wl=Xl.map(function(n){return[n[0].utc,n[1]]}),Jl=Yl.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",Ne]]);Wl.year=ac.year.utc,ac.scale.utc=function(){return Go(ta.scale.linear(),Wl,Jl)},ta.text=At(function(n){return n.responseText}),ta.json=function(n,t){return Nt(n,"application/json",Qo,t)},ta.html=function(n,t){return Nt(n,"text/html",na,t)},ta.xml=At(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(ta):"object"==typeof module&&module.exports&&(module.exports=ta),this.d3=ta}();
\ No newline at end of file
+    return i.size=function(n){return arguments.length?(l=n,i):l},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Ri(t):Di(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return Di(t,n)}if(!arguments.length)return s;var r;return f=null==(s=n)?Ri:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Gu(i,a)},ta.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=ta.random.normal.apply(ta,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=ta.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},ta.scale={};var ml={floor:y,ceil:y};ta.scale.linear=function(){return Ii([0,1],[0,1],mu,!1)};var yl={s:1,g:1,p:1,r:1,e:1};ta.scale.log=function(){return Ji(ta.scale.linear().domain([0,1]),10,!0,[1,10])};var Ml=ta.format(".0e"),xl={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};ta.scale.pow=function(){return Gi(ta.scale.linear(),1,[0,1])},ta.scale.sqrt=function(){return ta.scale.pow().exponent(.5)},ta.scale.ordinal=function(){return Qi([],{t:"range",a:[[]]})},ta.scale.category10=function(){return ta.scale.ordinal().range(bl)},ta.scale.category20=function(){return ta.scale.ordinal().range(_l)},ta.scale.category20b=function(){return ta.scale.ordinal().range(wl)},ta.scale.category20c=function(){return ta.scale.ordinal().range(Sl)};var bl=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(Mt),_l=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(Mt),wl=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(Mt),Sl=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(Mt);ta.scale.quantile=function(){return no([],[])},ta.scale.quantize=function(){return to(0,1,[0,1])},ta.scale.threshold=function(){return eo([.5],[0,1])},ta.scale.identity=function(){return ro([0,1])},ta.svg={},ta.svg.arc=function(){function n(){var n=Math.max(0,+e.apply(this,arguments)),l=Math.max(0,+r.apply(this,arguments)),s=o.apply(this,arguments)-Ra,f=a.apply(this,arguments)-Ra,h=Math.abs(f-s),g=s>f?0:1;if(n>l&&(p=l,l=n,n=p),h>=Ta)return t(l,g)+(n?t(n,1-g):"")+"Z";var p,v,d,m,y,M,x,b,_,w,S,k,E=0,A=0,N=[];if((m=(+c.apply(this,arguments)||0)/2)&&(d=i===kl?Math.sqrt(n*n+l*l):+i.apply(this,arguments),g||(A*=-1),l&&(A=tt(d/l*Math.sin(m))),n&&(E=tt(d/n*Math.sin(m)))),l){y=l*Math.cos(s+A),M=l*Math.sin(s+A),x=l*Math.cos(f-A),b=l*Math.sin(f-A);var C=Math.abs(f-s-2*A)<=qa?0:1;if(A&&so(y,M,x,b)===g^C){var z=(s+f)/2;y=l*Math.cos(z),M=l*Math.sin(z),x=b=null}}else y=M=0;if(n){_=n*Math.cos(f-E),w=n*Math.sin(f-E),S=n*Math.cos(s+E),k=n*Math.sin(s+E);var q=Math.abs(s-f+2*E)<=qa?0:1;if(E&&so(_,w,S,k)===1-g^q){var L=(s+f)/2;_=n*Math.cos(L),w=n*Math.sin(L),S=k=null}}else _=w=0;if((p=Math.min(Math.abs(l-n)/2,+u.apply(this,arguments)))>.001){v=l>n^g?0:1;var T=null==S?[_,w]:null==x?[y,M]:Lr([y,M],[S,k],[x,b],[_,w]),R=y-T[0],D=M-T[1],P=x-T[0],U=b-T[1],j=1/Math.sin(Math.acos((R*P+D*U)/(Math.sqrt(R*R+D*D)*Math.sqrt(P*P+U*U)))/2),F=Math.sqrt(T[0]*T[0]+T[1]*T[1]);if(null!=x){var H=Math.min(p,(l-F)/(j+1)),O=fo(null==S?[_,w]:[S,k],[y,M],l,H,g),I=fo([x,b],[_,w],l,H,g);p===H?N.push("M",O[0],"A",H,",",H," 0 0,",v," ",O[1],"A",l,",",l," 0 ",1-g^so(O[1][0],O[1][1],I[1][0],I[1][1]),",",g," ",I[1],"A",H,",",H," 0 0,",v," ",I[0]):N.push("M",O[0],"A",H,",",H," 0 1,",v," ",I[0])}else N.push("M",y,",",M);if(null!=S){var Y=Math.min(p,(n-F)/(j-1)),Z=fo([y,M],[S,k],n,-Y,g),V=fo([_,w],null==x?[y,M]:[x,b],n,-Y,g);p===Y?N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",V[1],"A",n,",",n," 0 ",g^so(V[1][0],V[1][1],Z[1][0],Z[1][1]),",",1-g," ",Z[1],"A",Y,",",Y," 0 0,",v," ",Z[0]):N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",Z[0])}else N.push("L",_,",",w)}else N.push("M",y,",",M),null!=x&&N.push("A",l,",",l," 0 ",C,",",g," ",x,",",b),N.push("L",_,",",w),null!=S&&N.push("A",n,",",n," 0 ",q,",",1-g," ",S,",",k);return N.push("Z"),N.join("")}function t(n,t){return"M0,"+n+"A"+n+","+n+" 0 1,"+t+" 0,"+-n+"A"+n+","+n+" 0 1,"+t+" 0,"+n}var e=io,r=oo,u=uo,i=kl,o=ao,a=co,c=lo;return n.innerRadius=function(t){return arguments.length?(e=Et(t),n):e},n.outerRadius=function(t){return arguments.length?(r=Et(t),n):r},n.cornerRadius=function(t){return arguments.length?(u=Et(t),n):u},n.padRadius=function(t){return arguments.length?(i=t==kl?kl:Et(t),n):i},n.startAngle=function(t){return arguments.length?(o=Et(t),n):o},n.endAngle=function(t){return arguments.length?(a=Et(t),n):a},n.padAngle=function(t){return arguments.length?(c=Et(t),n):c},n.centroid=function(){var n=(+e.apply(this,arguments)+ +r.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-Ra;return[Math.cos(t)*n,Math.sin(t)*n]},n};var kl="auto";ta.svg.line=function(){return ho(y)};var El=ta.map({linear:go,"linear-closed":po,step:vo,"step-before":mo,"step-after":yo,basis:So,"basis-open":ko,"basis-closed":Eo,bundle:Ao,cardinal:bo,"cardinal-open":Mo,"cardinal-closed":xo,monotone:To});El.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var Al=[0,2/3,1/3,0],Nl=[0,1/3,2/3,0],Cl=[0,1/6,2/3,1/6];ta.svg.line.radial=function(){var n=ho(Ro);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},mo.reverse=yo,yo.reverse=mo,ta.svg.area=function(){return Do(y)},ta.svg.area.radial=function(){var n=Do(Ro);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},ta.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),l=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,l)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,l.r,l.p0)+r(l.r,l.p1,l.a1-l.a0)+u(l.r,l.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)-Ra,s=l.call(n,u,r)-Ra;return{r:i,a0:o,a1:s,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(s),i*Math.sin(s)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>qa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=mr,o=yr,a=Po,c=ao,l=co;return n.radius=function(t){return arguments.length?(a=Et(t),n):a},n.source=function(t){return arguments.length?(i=Et(t),n):i},n.target=function(t){return arguments.length?(o=Et(t),n):o},n.startAngle=function(t){return arguments.length?(c=Et(t),n):c},n.endAngle=function(t){return arguments.length?(l=Et(t),n):l},n},ta.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=mr,e=yr,r=Uo;return n.source=function(e){return arguments.length?(t=Et(e),n):t},n.target=function(t){return arguments.length?(e=Et(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},ta.svg.diagonal.radial=function(){var n=ta.svg.diagonal(),t=Uo,e=n.projection;return n.projection=function(n){return arguments.length?e(jo(t=n)):t},n},ta.svg.symbol=function(){function n(n,r){return(zl.get(t.call(this,n,r))||Oo)(e.call(this,n,r))}var t=Ho,e=Fo;return n.type=function(e){return arguments.length?(t=Et(e),n):t},n.size=function(t){return arguments.length?(e=Et(t),n):e},n};var zl=ta.map({circle:Oo,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Ll)),e=t*Ll;return"M0,"+-t+"L"+e+",0 0,"+t+" "+-e+",0Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});ta.svg.symbolTypes=zl.keys();var ql=Math.sqrt(3),Ll=Math.tan(30*Da);_a.transition=function(n){for(var t,e,r=Tl||++Ul,u=Xo(n),i=[],o=Rl||{time:Date.now(),ease:Su,delay:0,duration:250},a=-1,c=this.length;++a<c;){i.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(e=l[s])&&$o(e,s,u,r,o),t.push(e)}return Yo(i,u,r)},_a.interrupt=function(n){return this.each(null==n?Dl:Io(Xo(n)))};var Tl,Rl,Dl=Io(Xo()),Pl=[],Ul=0;Pl.call=_a.call,Pl.empty=_a.empty,Pl.node=_a.node,Pl.size=_a.size,ta.transition=function(n,t){return n&&n.transition?Tl?n.transition(t):n:ta.selection().transition(n)},ta.transition.prototype=Pl,Pl.select=function(n){var t,e,r,u=this.id,i=this.namespace,o=[];n=N(n);for(var a=-1,c=this.length;++a<c;){o.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(r=l[s])&&(e=n.call(r,r.__data__,s,a))?("__data__"in r&&(e.__data__=r.__data__),$o(e,s,i,u,r[i][u]),t.push(e)):t.push(null)}return Yo(o,i,u)},Pl.selectAll=function(n){var t,e,r,u,i,o=this.id,a=this.namespace,c=[];n=C(n);for(var l=-1,s=this.length;++l<s;)for(var f=this[l],h=-1,g=f.length;++h<g;)if(r=f[h]){i=r[a][o],e=n.call(r,r.__data__,h,l),c.push(t=[]);for(var p=-1,v=e.length;++p<v;)(u=e[p])&&$o(u,p,a,o,i),t.push(u)}return Yo(c,a,o)},Pl.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Yo(u,this.namespace,this.id)},Pl.tween=function(n,t){var e=this.id,r=this.namespace;return arguments.length<2?this.node()[r][e].tween.get(n):Y(this,null==t?function(t){t[r][e].tween.remove(n)}:function(u){u[r][e].tween.set(n,t)})},Pl.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Hu:mu,a=ta.ns.qualify(n);return Zo(this,"attr."+n,t,a.local?i:u)},Pl.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=ta.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Pl.style=function(n,e,r){function u(){this.style.removeProperty(n)}function i(e){return null==e?u:(e+="",function(){var u,i=t(this).getComputedStyle(this,null).getPropertyValue(n);return i!==e&&(u=mu(i,e),function(t){this.style.setProperty(n,u(t),r)})})}var o=arguments.length;if(3>o){if("string"!=typeof n){2>o&&(e="");for(r in n)this.style(r,n[r],e);return this}r=""}return Zo(this,"style."+n,e,i)},Pl.styleTween=function(n,e,r){function u(u,i){var o=e.call(this,u,i,t(this).getComputedStyle(this,null).getPropertyValue(n));return o&&function(t){this.style.setProperty(n,o(t),r)}}return arguments.length<3&&(r=""),this.tween("style."+n,u)},Pl.text=function(n){return Zo(this,"text",n,Vo)},Pl.remove=function(){var n=this.namespace;return this.each("end.transition",function(){var t;this[n].count<2&&(t=this.parentNode)&&t.removeChild(this)})},Pl.ease=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].ease:("function"!=typeof n&&(n=ta.ease.apply(ta,arguments)),Y(this,function(r){r[e][t].ease=n}))},Pl.delay=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].delay:Y(this,"function"==typeof n?function(r,u,i){r[e][t].delay=+n.call(r,r.__data__,u,i)}:(n=+n,function(r){r[e][t].delay=n}))},Pl.duration=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].duration:Y(this,"function"==typeof n?function(r,u,i){r[e][t].duration=Math.max(1,n.call(r,r.__data__,u,i))}:(n=Math.max(1,n),function(r){r[e][t].duration=n}))},Pl.each=function(n,t){var e=this.id,r=this.namespace;if(arguments.length<2){var u=Rl,i=Tl;try{Tl=e,Y(this,function(t,u,i){Rl=t[r][e],n.call(t,t.__data__,u,i)})}finally{Rl=u,Tl=i}}else Y(this,function(u){var i=u[r][e];(i.event||(i.event=ta.dispatch("start","end","interrupt"))).on(n,t)});return this},Pl.transition=function(){for(var n,t,e,r,u=this.id,i=++Ul,o=this.namespace,a=[],c=0,l=this.length;l>c;c++){a.push(n=[]);for(var t=this[c],s=0,f=t.length;f>s;s++)(e=t[s])&&(r=e[o][u],$o(e,s,o,i,{time:r.time,ease:r.ease,delay:r.delay+r.duration,duration:r.duration})),n.push(e)}return Yo(a,o,i)},ta.svg.axis=function(){function n(n){n.each(function(){var n,l=ta.select(this),s=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):y:t,p=l.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Ca),d=ta.transition(p.exit()).style("opacity",Ca).remove(),m=ta.transition(p.order()).style("opacity",1),M=Math.max(u,0)+o,x=Ui(f),b=l.selectAll(".domain").data([0]),_=(b.enter().append("path").attr("class","domain"),ta.transition(b));v.append("line"),v.append("text");var w,S,k,E,A=v.select("line"),N=m.select("line"),C=p.select("text").text(g),z=v.select("text"),q=m.select("text"),L="top"===r||"left"===r?-1:1;if("bottom"===r||"top"===r?(n=Bo,w="x",k="y",S="x2",E="y2",C.attr("dy",0>L?"0em":".71em").style("text-anchor","middle"),_.attr("d","M"+x[0]+","+L*i+"V0H"+x[1]+"V"+L*i)):(n=Wo,w="y",k="x",S="y2",E="x2",C.attr("dy",".32em").style("text-anchor",0>L?"end":"start"),_.attr("d","M"+L*i+","+x[0]+"H0V"+x[1]+"H"+L*i)),A.attr(E,L*u),z.attr(k,L*M),N.attr(S,0).attr(E,L*u),q.attr(w,0).attr(k,L*M),f.rangeBand){var T=f,R=T.rangeBand()/2;s=f=function(n){return T(n)+R}}else s.rangeBand?s=f:d.call(n,f,s);v.call(n,s,f),m.call(n,f,f)})}var t,e=ta.scale.linear(),r=jl,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in Fl?t+"":jl,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var jl="bottom",Fl={top:1,right:1,bottom:1,left:1};ta.svg.brush=function(){function n(t){t.each(function(){var t=ta.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",i).on("touchstart.brush",i),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(v,y);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return Hl[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var c,f=ta.transition(t),h=ta.transition(o);l&&(c=Ui(l),h.attr("x",c[0]).attr("width",c[1]-c[0]),r(f)),s&&(c=Ui(s),h.attr("y",c[0]).attr("height",c[1]-c[0]),u(f)),e(f)})}function e(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+f[+/e$/.test(n)]+","+h[+/^s/.test(n)]+")"})}function r(n){n.select(".extent").attr("x",f[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",f[1]-f[0])}function u(n){n.select(".extent").attr("y",h[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",h[1]-h[0])}function i(){function i(){32==ta.event.keyCode&&(C||(M=null,q[0]-=f[1],q[1]-=h[1],C=2),S())}function v(){32==ta.event.keyCode&&2==C&&(q[0]+=f[1],q[1]+=h[1],C=0,S())}function d(){var n=ta.mouse(b),t=!1;x&&(n[0]+=x[0],n[1]+=x[1]),C||(ta.event.altKey?(M||(M=[(f[0]+f[1])/2,(h[0]+h[1])/2]),q[0]=f[+(n[0]<M[0])],q[1]=h[+(n[1]<M[1])]):M=null),A&&m(n,l,0)&&(r(k),t=!0),N&&m(n,s,1)&&(u(k),t=!0),t&&(e(k),w({type:"brush",mode:C?"move":"resize"}))}function m(n,t,e){var r,u,i=Ui(t),c=i[0],l=i[1],s=q[e],v=e?h:f,d=v[1]-v[0];return C&&(c-=s,l-=d+s),r=(e?p:g)?Math.max(c,Math.min(l,n[e])):n[e],C?u=(r+=s)+d:(M&&(s=Math.max(c,Math.min(l,2*M[e]-r))),r>s?(u=r,r=s):u=s),v[0]!=r||v[1]!=u?(e?a=null:o=null,v[0]=r,v[1]=u,!0):void 0}function y(){d(),k.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),ta.select("body").style("cursor",null),L.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),z(),w({type:"brushend"})}var M,x,b=this,_=ta.select(ta.event.target),w=c.of(b,arguments),k=ta.select(b),E=_.datum(),A=!/^(n|s)$/.test(E)&&l,N=!/^(e|w)$/.test(E)&&s,C=_.classed("extent"),z=W(b),q=ta.mouse(b),L=ta.select(t(b)).on("keydown.brush",i).on("keyup.brush",v);if(ta.event.changedTouches?L.on("touchmove.brush",d).on("touchend.brush",y):L.on("mousemove.brush",d).on("mouseup.brush",y),k.interrupt().selectAll("*").interrupt(),C)q[0]=f[0]-q[0],q[1]=h[0]-q[1];else if(E){var T=+/w$/.test(E),R=+/^n/.test(E);x=[f[1-T]-q[0],h[1-R]-q[1]],q[0]=f[T],q[1]=h[R]}else ta.event.altKey&&(M=q.slice());k.style("pointer-events","none").selectAll(".resize").style("display",null),ta.select("body").style("cursor",_.style("cursor")),w({type:"brushstart"}),d()}var o,a,c=E(n,"brushstart","brush","brushend"),l=null,s=null,f=[0,0],h=[0,0],g=!0,p=!0,v=Ol[0];return n.event=function(n){n.each(function(){var n=c.of(this,arguments),t={x:f,y:h,i:o,j:a},e=this.__chart__||t;this.__chart__=t,Tl?ta.select(this).transition().each("start.brush",function(){o=e.i,a=e.j,f=e.x,h=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=yu(f,t.x),r=yu(h,t.y);return o=a=null,function(u){f=t.x=e(u),h=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){o=t.i,a=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(l=t,v=Ol[!l<<1|!s],n):l},n.y=function(t){return arguments.length?(s=t,v=Ol[!l<<1|!s],n):s},n.clamp=function(t){return arguments.length?(l&&s?(g=!!t[0],p=!!t[1]):l?g=!!t:s&&(p=!!t),n):l&&s?[g,p]:l?g:s?p:null},n.extent=function(t){var e,r,u,i,c;return arguments.length?(l&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),o=[e,r],l.invert&&(e=l(e),r=l(r)),e>r&&(c=e,e=r,r=c),(e!=f[0]||r!=f[1])&&(f=[e,r])),s&&(u=t[0],i=t[1],l&&(u=u[1],i=i[1]),a=[u,i],s.invert&&(u=s(u),i=s(i)),u>i&&(c=u,u=i,i=c),(u!=h[0]||i!=h[1])&&(h=[u,i])),n):(l&&(o?(e=o[0],r=o[1]):(e=f[0],r=f[1],l.invert&&(e=l.invert(e),r=l.invert(r)),e>r&&(c=e,e=r,r=c))),s&&(a?(u=a[0],i=a[1]):(u=h[0],i=h[1],s.invert&&(u=s.invert(u),i=s.invert(i)),u>i&&(c=u,u=i,i=c))),l&&s?[[e,u],[r,i]]:l?[e,r]:s&&[u,i])},n.clear=function(){return n.empty()||(f=[0,0],h=[0,0],o=a=null),n},n.empty=function(){return!!l&&f[0]==f[1]||!!s&&h[0]==h[1]},ta.rebind(n,c,"on")};var Hl={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Ol=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Il=ac.format=gc.timeFormat,Yl=Il.utc,Zl=Yl("%Y-%m-%dT%H:%M:%S.%LZ");Il.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Jo:Zl,Jo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Jo.toString=Zl.toString,ac.second=Ft(function(n){return new cc(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),ac.seconds=ac.second.range,ac.seconds.utc=ac.second.utc.range,ac.minute=Ft(function(n){return new cc(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),ac.minutes=ac.minute.range,ac.minutes.utc=ac.minute.utc.range,ac.hour=Ft(function(n){var t=n.getTimezoneOffset()/60;return new cc(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),ac.hours=ac.hour.range,ac.hours.utc=ac.hour.utc.range,ac.month=Ft(function(n){return n=ac.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),ac.months=ac.month.range,ac.months.utc=ac.month.utc.range;var Vl=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Xl=[[ac.second,1],[ac.second,5],[ac.second,15],[ac.second,30],[ac.minute,1],[ac.minute,5],[ac.minute,15],[ac.minute,30],[ac.hour,1],[ac.hour,3],[ac.hour,6],[ac.hour,12],[ac.day,1],[ac.day,2],[ac.week,1],[ac.month,1],[ac.month,3],[ac.year,1]],$l=Il.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",Ne]]),Bl={range:function(n,t,e){return ta.range(Math.ceil(n/e)*e,+t,e).map(Ko)},floor:y,ceil:y};Xl.year=ac.year,ac.scale=function(){return Go(ta.scale.linear(),Xl,$l)};var Wl=Xl.map(function(n){return[n[0].utc,n[1]]}),Jl=Yl.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",Ne]]);Wl.year=ac.year.utc,ac.scale.utc=function(){return Go(ta.scale.linear(),Wl,Jl)},ta.text=At(function(n){return n.responseText}),ta.json=function(n,t){return Nt(n,"application/json",Qo,t)},ta.html=function(n,t){return Nt(n,"text/html",na,t)},ta.xml=At(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(ta):"object"==typeof module&&module.exports&&(module.exports=ta),this.d3=ta}();
diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
index 1b987e533b..4650fabedf 100755
--- a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
+++ b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
@@ -106,7 +106,7 @@ Group.prototype.merge = function(capability, people) {
 /**
  * Removes a person from the group. Will destroy the group if the last person is removed.
  */
-Group.prototype.removePerson = function(person) { 
+Group.prototype.removePerson = function(person) {
     this.people = this.people.filter(function(a) {
         return (a != person && a.id != person.id);
     });
@@ -169,7 +169,7 @@ Graph.prototype.removeCapability = function(term) {
             var cs = {};
             var shifted = false;
             $.each(g.groups[i].capabilities, function(key, c) {
-                cs[c.term] = c;                
+                cs[c.term] = c;
             });
             consideringGroups: for (var j = 0; j < g.groups.length; j++) {
                 if (j == i) continue;
@@ -368,7 +368,7 @@ FullResultQueryUnit.prototype.fetch = function() {
     request.buildScriptTag();
     request.addScriptTag();
 */
-} 
+}
 
 var showPanel = function(name) {
     $(".titles li").removeClass("activeTab");
@@ -380,14 +380,14 @@ var showPanel = function(name) {
  * The DetailsPanel prototype controls the display of information in the sidebar.
  */
 var DetailsPanel = function(element) {
-    this.panel = element;   
+    this.panel = element;
 }
 DetailsPanel.prototype.clearDetails = function() {
     $(this.panel).empty();
 }
 DetailsPanel.prototype.showDetails = function(mode, id) {
     showPanel("logg");
-    
+
     var that = this;
     var departments = {};
     var deptNames = [];
@@ -436,7 +436,7 @@ DetailsPanel.prototype.showDetails = function(mode, id) {
             );
             title.after(DetailsPanel.makebarchart(deptNames, departments));
     } else $(this.panel).empty().append(this.groupInfo(id, g.groups[id], mode, id));
-} 
+}
 DetailsPanel.prototype.groupInfo = function(i, group, mode, id) {
     var that = this;
     var departments = {};
@@ -504,10 +504,10 @@ DetailsPanel.prototype.groupInfo = function(i, group, mode, id) {
                         .append(DetailsPanel.makeslidedown(p.queryText(group.capabilities), p.fullInfo["md_8"], "grants"))
                         .append(DetailsPanel.makeslidedown(p.queryText(group.capabilities), p.fullInfo["md_U"], "publications"))
 
-                        
-                        
+
+
                     )
-                
+
             }, $("<div/>"))
         );
 }
@@ -529,7 +529,7 @@ DetailsPanel.makeslidedown = function(q, l, name) {
                 return list.append($("<li>" + grant + "</li>"));
             }, $("<ul/>")
                 .addClass("publist").css("display", "none"))
-                .append(l.length > 5 
+                .append(l.length > 5
                     ? $("<li/>")
                     /*.append(
                         $("<a>(view more)</a>")
@@ -561,12 +561,12 @@ DetailsPanel.makebarchart = function(deptNames, departments) {
     });
     return div;
 };
-            
+
 var loadCapability = function() {
     if (hidden) unhide();
     if (!queryQueue.length) finish();
     else {
-        disableSubButton(); 
+        disableSubButton();
         var query = queryQueue.pop();
         var jsonurl = contextPath + "/visualizationAjax?vis=capabilitymap&query=" + encodeURIComponent(query) + "&callback=ipretResults"
         var request = new JSONscriptRequest(jsonurl);
@@ -633,17 +633,17 @@ var getLinkColor = function() {
 var render = function() {
     if (!force) $("#infovis").empty();
     //if (!g.groups.length) return;
-    
+
     if (force) force.stop();
-    
+
     var d3_graph = g.tod3();
     var nodes = d3_graph.nodes;
     var labelAnchors = d3_graph.labelAnchors;
     var labelAnchorLinks = d3_graph.labelAnchorLinks;
     var links = d3_graph.links;
     var delta = !!force;
-    
-    
+
+
     var w = $("#infovis").width(), h = 600;
     if (schemes[$("#colorScheme").val()] !== undefined && scheme != schemes[$("#colorScheme").val()]) {
         scheme = schemes[$("#colorScheme").val()];
@@ -664,7 +664,7 @@ var render = function() {
             .attr('width', w).attr('height', h).attr('fill', scheme["backgroundcolor"])
             .on("click", unhighlight)
             .on("touchstart", unhighlight);
-        
+
         edge_layer = vis.append("svg:g");
         node_layer = vis.append("svg:g");//.attr('width', w).attr('height', h).attr("fill", "transparent");
         label_layer = vis.append("svg:g");
@@ -685,7 +685,7 @@ var render = function() {
                 .linkStrength(function(x) {
                     return x.weight * 10
                 });
-        
+
         force2 = d3.layout
             .force().gravity(0)
             .linkDistance(0).linkStrength(8).charge(-100).size([w, h]);
@@ -695,14 +695,14 @@ var render = function() {
     transformto(force.links(), links);
     transformto(force2.nodes(), labelAnchors);
     transformto(force2.links(), labelAnchorLinks);
-    
+
     if (delta) {
         force.alpha(0.05);
         force2.alpha(0.05);
     }
     force.start();
     force2.start();
-    
+
     link_data = edge_layer.selectAll("line.link").data(links, function(d) { return d.uid; });
     link_data.enter().append("svg:line")
         .attr("class", "link")
@@ -713,7 +713,7 @@ var render = function() {
         });
     link_data.exit().remove();
     link = edge_layer.selectAll("line.link");
-    
+
     var node_data = node_layer.selectAll("g.node").data(force.nodes(), function(d) { return d.uid; });
     var node = node_data.enter().append("svg:g");
     console.log("nodes:");
@@ -728,7 +728,7 @@ var render = function() {
         })
         .on("touchstart", function(d) {
             highlight(d.identifier);
-            detailsPane.showDetails(d.nodetype, d.identifier);        
+            detailsPane.showDetails(d.nodetype, d.identifier);
         })
         .style("stroke", scheme["nodestroke"])
         .style("stroke-width", 2)
@@ -758,10 +758,10 @@ var render = function() {
         .call(force.drag);
     node_data.exit().remove();
     node = d3.selectAll("g.node");
-    
+
     var anchorLink = label_layer.selectAll("line.anchorLink").data(labelAnchorLinks, function(d) { return d.uid; });
     anchorLink.exit().remove();
-    
+
     var anchor_data = label_layer.selectAll("g.anchorNode").data(force2.nodes(), function(d) { return d.uid; });
     var anchorNode = anchor_data.enter().append("svg:g").attr("class", "anchorNode");
     anchorNode.append("svg:circle").attr("r", 0).style("fill", "#FFF");
@@ -775,7 +775,7 @@ var render = function() {
         .style("text-shadow", function(d) {
             return d.node.nodetype == "group" ? "none" :
                 "2px 0px " + scheme["nodestroke"] +
-                ", -2px 0px " + scheme["nodestroke"] + 
+                ", -2px 0px " + scheme["nodestroke"] +
                 ", 0px 2px " + scheme["nodestroke"] +
                 ", 0px -2px " + scheme["nodestroke"];
         }).on("click", function(d) {
@@ -787,7 +787,7 @@ var render = function() {
     });
     anchor_data.exit().remove();
     anchorNode = label_layer.selectAll("g.anchorNode");
-    
+
     var updateLink = function() {
     	this.attr("x1", function(d) {
     		return d.source.x;
@@ -798,13 +798,13 @@ var render = function() {
     	}).attr("y2", function(d) {
     		return d.target.y;
     	});
-    
+
     }
     var updateNode = function() {
     	this.attr("transform", function(d) {
     		return "translate(" + d.x + "," + d.y + ")";
     	});
-    
+
     }
     force.on("tick", function() {
         $("#log button:first-child").html("pause");
@@ -828,9 +828,9 @@ var render = function() {
     	anchorNode.call(updateNode);
     	link.call(updateLink);
     	anchorLink.call(updateLink);
-    
+
     });
-    
+
     // refresh UI
     $("#log").empty().append($("<button>pause</button>")
         .bind("click", function() {
@@ -873,7 +873,7 @@ var render = function() {
                     .css("cursor", "pointer")
                 )
                 .prepend($("<input/>").attr("type", "checkbox")
-                    .attr("name", c.term)                   
+                    .attr("name", c.term)
                 )
             );
     });
@@ -920,8 +920,8 @@ var generateGraphPersonList = function() {
 }
 var generateGraphSVG = function() {
     download(
-        "<?xml version=\"1.0\" standalone=\"no\"?>\n" + 
-        "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" " +  
+        "<?xml version=\"1.0\" standalone=\"no\"?>\n" +
+        "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" " +
         "\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n" +
         $("#infovis").html().replace("<svg", "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\"")
     , "svg");
@@ -942,7 +942,7 @@ var showhideadvanced = function(button) {
         $(button).html("Hide advanced");
     } else {
         $("#advanced_options").slideUp();
-        $("#advanced_options").data("shown", false);        
+        $("#advanced_options").data("shown", false);
         $(button).html("Show advanced");
     }
 }
@@ -988,7 +988,7 @@ var reset = function() {
         force = undefined;
         $("#infovis").html("");
         window.location.hash = "";
-        
+
         $("#log_printout").empty();
         detailsPane.clearDetails();
         $("#graphDetails").attr("value", "");
@@ -1002,7 +1002,7 @@ var reset = function() {
         $("#helptext").fadeIn();
     }
     render();
-    
+
 }
 var unhide = function() {
     hidden = false;
@@ -1018,10 +1018,10 @@ var unhide = function() {
     $("#helptext").fadeOut();
     $("#center-container").fadeIn();
 }
-   
+
 function run_demo(demoValues) {
     demoValues.forEach(function(query) {
-        queryQueue.push(query); 
+        queryQueue.push(query);
     });
     progressBar.reset(demoValues.length, 1);
     addKwd(false);
@@ -1045,12 +1045,12 @@ $(document).ready(function() {
     queryCutoffElem = document.getElementById('queryCutoff');
     detailsPane = new DetailsPanel('#inner-details');
     g = new Graph();
-    
+
     // results section text backup
     $(".result_section").each(function() {
         $(this).data("original", $(this).html());
     });
-    
+
     // querycutoffelem hadling
     $(queryCutoffElem).bind("keyup", function() {
         var that = this;
@@ -1080,7 +1080,7 @@ $(document).ready(function() {
         $(this).data("prev", $(this).val());
     });
     $(queryCutoffElem).data("prev", $(queryCutoffElem).val());
-    
+
     // URL hash reading
     if (window.location.hash != "") {
         var preset = decodeURI(window.location.hash).slice(1).split("|");
@@ -1089,7 +1089,7 @@ $(document).ready(function() {
         if (preset[2] == "1") expandLastQuery = 1;
         addKwd();
     }
-    
+
     // queryfield
     $("#query").bind("focus", function() {
         $(this).data("previous", $(this).val());
@@ -1101,7 +1101,7 @@ $(document).ready(function() {
     });
     $("#query").focus();
     enableSubButton();
-    
+
     // tabs
     $(".tabs div ul li + li + li + li + li").parent().children(":last-child").find("a").trigger("click");
     $(".tabs ul.titles li[class!=\"full\"]").bind("click", function(e) {
@@ -1123,6 +1123,6 @@ var transformto = function(a, b) { // a = b
         if (b.indexOf(a[i]) == -1) a.splice(i, 1);
         else i++;
     }
-    
+
 }
-            
+
diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/jsr_class.js b/webapp/src/main/webapp/js/visualization/capabilitymap/jsr_class.js
index d267de4a5f..1bc697f0c5 100755
--- a/webapp/src/main/webapp/js/visualization/capabilitymap/jsr_class.js
+++ b/webapp/src/main/webapp/js/visualization/capabilitymap/jsr_class.js
@@ -7,12 +7,12 @@
 // Date: December 7th, 2005
 //
 // A SECURITY WARNING FROM DOUGLAS CROCKFORD:
-// "The dynamic <script> tag hack suffers from a problem. It allows a page 
-// to access data from any server in the web, which is really useful. 
-// Unfortunately, the data is returned in the form of a script. That script 
-// can deliver the data, but it runs with the same authority as scripts on 
-// the base page, so it is able to steal cookies or misuse the authorization 
-// of the user with the server. A rogue script can do destructive things to 
+// "The dynamic <script> tag hack suffers from a problem. It allows a page
+// to access data from any server in the web, which is really useful.
+// Unfortunately, the data is returned in the form of a script. That script
+// can deliver the data, but it runs with the same authority as scripts on
+// the base page, so it is able to steal cookies or misuse the authorization
+// of the user with the server. A rogue script can do destructive things to
 // the relationship between the user and the base server."
 //
 // So, be extremely cautious in your use of this script.
@@ -21,9 +21,9 @@
 // Sample Usage:
 //
 // <script type="text/javascript" src="jsr_class.js"></script>
-// 
+//
 // function callbackfunc(jsonData) {
-//      alert('Latitude = ' + jsonData.ResultSet.Result[0].Latitude + 
+//      alert('Latitude = ' + jsonData.ResultSet.Result[0].Latitude +
 //            '  Longitude = ' + jsonData.ResultSet.Result[0].Longitude);
 //      aObj.removeScriptTag();
 // }
@@ -41,7 +41,7 @@
 //
 function JSONscriptRequest(fullUrl) {
     // REST request path
-    this.fullUrl = fullUrl; 
+    this.fullUrl = fullUrl;
     // Keep IE from caching requests
     this.noCacheIE = '&noCacheIE=' + (new Date()).getTime();
     // Get the DOM location to put the script tag
@@ -59,19 +59,19 @@ JSONscriptRequest.prototype.buildScriptTag = function () {
 
     // Create the script tag
     this.scriptObj = document.createElement("script");
-    
+
     // Add script object attributes
     this.scriptObj.setAttribute("type", "text/javascript");
     this.scriptObj.setAttribute("charset", "utf-8");
     this.scriptObj.setAttribute("src", this.fullUrl + this.noCacheIE);
     this.scriptObj.setAttribute("id", this.scriptId);
 };
- 
+
 // removeScriptTag method
-// 
+//
 JSONscriptRequest.prototype.removeScriptTag = function () {
     // Destroy the script tag
-    this.headLoc.removeChild(this.scriptObj);  
+    this.headLoc.removeChild(this.scriptObj);
 };
 
 // addScriptTag method
diff --git a/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js b/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js
index 1aac31bcd1..0e2fb52bb1 100644
--- a/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js
+++ b/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js
@@ -8,32 +8,32 @@ var collaboratorTableMetadata = {
 	tableColumnTitle1: i18nStringsCoPi.investigatorString,
 	tableColumnTitle2: i18nStringsCoPi.grantsWithString + " <br />",
 	tableCSVFileLink: egoCoInvestigatorsListDataFileURL,
-	jsonNumberWorksProperty: "number_of_investigated_grants" 
+	jsonNumberWorksProperty: "number_of_investigated_grants"
 };
 
-var visType = "coprincipalinvestigator"; 
+var visType = "coprincipalinvestigator";
 var visKeyForFlash = "CoPI";
 
 
 function renderStatsOnNodeClicked(json){
-	
+
 	//console.log(json);
 	var obj = jQuery.parseJSON(json);
-	
+
 	var works = "";
 	var persons = "";
 	var relation = "";
 	var earliest_work = "";
 	var latest_work = "";
 	var number_of_works = "";
-	
+
 	works = i18nStringsCoPi.grantsCapitalized;
 	persons = i18nStringsCoPi.coInvestigatorCapitalized;
 	relation = "coinvestigation";
 	earliest_work = obj.earliest_grant;
 	latest_work = obj.latest_grant;
 	number_of_works = obj.number_of_investigated_grants;
-	
+
 	$("#dataPanel").attr("style","visibility:visible");
 	$("#works").empty().append(number_of_works);
 
@@ -41,56 +41,56 @@ function renderStatsOnNodeClicked(json){
 	 * Here obj.url points to the uri of that individual
 	 */
 	if(obj.url){
-		
+
 		if (obj.url === unEncodedEgoURI) {
-			
+
 			$("#investigatorName").addClass('investigator_name').removeClass('neutral_investigator_name');
 			$('#num_works > .investigator_stats_text').text(works);
 			$('#num_investigators > .investigator_stats_text').text(persons);
-			
+
 			var vivoProfileURL = $("a#profileUrl").detach();
-			
+
 			$("#profile-links").empty().append(vivoProfileURL);
-			
+
 		} else {
 
 			$("#investigatorName").addClass('neutral_investigator_name').removeClass('investigator_name');
 			$('#num_works > .investigator_stats_text').text('Joint ' + works);
 			$('#num_investigators > .investigator_stats_text').text('Joint ' + persons);
-			
+
 
 			if ($("#coInvestigationVisUrl").length > 0) {
-				
+
 				$("#coInvestigationVisUrl").attr("href", getWellFormedURLs(obj.url, relation));
-				
+
 			} else {
-				
+
 				$("#profile-links")
 				.append(" | ")
-				.append('<a href="' + getWellFormedURLs(obj.url, relation) 
-							+ '" id="coInvestigationVisUrl">Co-investigator network</a>');	
-			} 
-			
+				.append('<a href="' + getWellFormedURLs(obj.url, relation)
+							+ '" id="coInvestigationVisUrl">Co-investigator network</a>');
+			}
+
 		}
-		
+
 		$("#profileUrl").attr("href", getWellFormedURLs(obj.url, "profile"));
 
-		processProfileInformation("investigatorName", 
+		processProfileInformation("investigatorName",
 				"profileMoniker",
 				"profileImage",
 				jQuery.parseJSON(getWellFormedURLs(obj.url, "profile_info")),
 				true,
 				true);
-		
-		
+
+
 
 	} else{
 		$("#profileUrl").attr("href","#");
 		$("#coInvestigationVisUrl").attr("href","#");
 	}
 
-	$("#coInvestigators").empty().append(obj.noOfCorelations);	
-	
+	$("#coInvestigators").empty().append(obj.noOfCorelations);
+
 	$("#firstGrant").empty().append(earliest_work);
 	(earliest_work)?$("#fGrant").attr("style","visibility:visible"):$("#fGrant").attr("style","visibility:hidden");
 	$("#lastGrant").empty().append(latest_work);
diff --git a/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js b/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js
index eec6ae6764..c7307063f1 100644
--- a/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js
+++ b/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js
@@ -27,15 +27,15 @@ function ControlVersion()
 		try {
 			// version will be set for 6.X players only
 			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
+
 			// installed player is some revision of 6.0
 			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
+			// so we have to be careful.
+
 			// default to the first public version
 			version = "WIN 6,0,21,0";
 
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)
 			axo.AllowScriptAccess = "always";
 
 			// safe to call for 6.0r47 or greater
@@ -75,7 +75,7 @@ function ControlVersion()
 			version = -1;
 		}
 	}
-	
+
 	return version;
 }
 
@@ -83,13 +83,13 @@ function ControlVersion()
 function GetSwfVer(){
 	// NS/Opera version >= 3 check for Flash plugin in plugin array
 	var flashVer = -1;
-	
+
 	if (navigator.plugins != null && navigator.plugins.length > 0) {
 		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
 			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
 			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
 			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
+			var tempArrayMajor = descArray[2].split(".");
 			var versionMajor = tempArrayMajor[0];
 			var versionMinor = tempArrayMajor[1];
 			var versionRevision = descArray[3];
@@ -165,7 +165,7 @@ function AC_AddExtension(src, ext)
     if (path.length >= ext.length && path.lastIndexOf(ext) == (path.length - ext.length))
       return src;
     else
-      return src.replace(/\?/, ext+'?'); 
+      return src.replace(/\?/, ext+'?');
   }
   else
   {
@@ -177,8 +177,8 @@ function AC_AddExtension(src, ext)
   }
 }
 
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
+function AC_Generateobj(objAttrs, params, embedAttrs)
+{
     var str = '';
     if (isIE && isWin && !isOpera)
     {
@@ -200,7 +200,7 @@ function AC_Generateobj(objAttrs, params, embedAttrs)
 }
 
 function AC_FL_RunContent(){
-  var ret = 
+  var ret =
     AC_GetArgs
     (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
      , "application/x-shockwave-flash"
@@ -214,16 +214,16 @@ function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
   ret.params = new Object();
   ret.objAttrs = new Object();
   for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
+    var currArg = args[i].toLowerCase();
 
-    switch (currArg){	
+    switch (currArg){
       case "classid":
         break;
       case "pluginspage":
         ret.embedAttrs[args[i]] = args[i+1];
         break;
       case "src":
-      case "movie":	
+      case "movie":
         args[i+1] = AC_AddExtension(args[i+1], ext);
         ret.embedAttrs["src"] = args[i+1];
         ret.params[srcParamName] = args[i+1];
@@ -273,7 +273,7 @@ function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
       case "width":
       case "height":
       case "align":
-      case "vspace": 
+      case "vspace":
       case "hspace":
       case "class":
       case "title":
diff --git a/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js b/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js
index 34886448e8..e560432179 100644
--- a/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js
+++ b/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js
@@ -8,23 +8,23 @@ var collaboratorTableMetadata = {
 	tableColumnTitle1: i18nStringsCoauthorship.authorString,
 	tableColumnTitle2: i18nStringsCoauthorship.publicationsWith + " <br />",
 	tableCSVFileLink: egoCoAuthorsListDataFileURL,
-	jsonNumberWorksProperty: "number_of_authored_works" 
+	jsonNumberWorksProperty: "number_of_authored_works"
 };
 
-var visType = "coauthorship"; 
+var visType = "coauthorship";
 var visKeyForFlash = "CoAuthor";
 
 function renderStatsOnNodeClicked(json){
-	
+
 	var obj = jQuery.parseJSON(json);
-	
+
 	var works = "";
 	var persons = "";
 	var relation = "";
 	var earliest_work = "";
 	var latest_work = "";
 	var number_of_works = "";
-	
+
 	works = i18nStringsCoauthorship.publicationsString;
 	persons = i18nStringsCoauthorship.coauthorsString;
 	relation = "coauthorship"
@@ -39,17 +39,17 @@ function renderStatsOnNodeClicked(json){
 	 * Here obj.url points to the uri of that individual
 	 */
 	if(obj.url){
-		
+
 		if (obj.url === unEncodedEgoURI) {
-			
+
 			$("#authorName").addClass('author_name').removeClass('neutral_author_name');
 			$('#num_works > .author_stats_text').text(works);
 			$('#num_authors > .author_stats_text').text(persons);
-			
+
 			var vivoProfileURL = $("a#profileUrl").detach();
-			
+
 			$("#profile-links").empty().append(vivoProfileURL);
-			
+
 		} else {
 
 			$("#authorName").addClass('neutral_author_name').removeClass('author_name');
@@ -57,36 +57,36 @@ function renderStatsOnNodeClicked(json){
 			$('#num_authors > .author_stats_text').text('Joint ' + persons);
 
 			if ($("#coAuthorshipVisUrl").length > 0) {
-				
+
 				$("#coAuthorshipVisUrl").attr("href", getWellFormedURLs(obj.url, relation));
-				
+
 			} else {
-				
+
 				$("#profile-links")
 				.append(" | ")
-				.append('<a href="' + getWellFormedURLs(obj.url, relation) 
-							+ '" id="coAuthorshipVisUrl">Co-author network</a>');	
-			} 
+				.append('<a href="' + getWellFormedURLs(obj.url, relation)
+							+ '" id="coAuthorshipVisUrl">Co-author network</a>');
+			}
 		}
-		
+
 		$("#profileUrl").attr("href", getWellFormedURLs(obj.url, "profile"));
-		
-		processProfileInformation("authorName", 
+
+		processProfileInformation("authorName",
 				"profileMoniker",
 				"profileImage",
 				jQuery.parseJSON(getWellFormedURLs(obj.url, "profile_info")),
 				true,
 				true);
-		
-		
+
+
 
 	} else {
 		$("#profileUrl").attr("href","#");
 		$("#coAuthorshipVisUrl").attr("href","#");
 	}
 
-	$("#coAuthors").empty().append(obj.noOfCorelations);	
-	
+	$("#coAuthors").empty().append(obj.noOfCorelations);
+
 	$("#firstPublication").empty().append(earliest_work);
 	(earliest_work)?$("#fPub").attr("style","visibility:visible"):$("#fPub").attr("style","visibility:hidden");
 	$("#lastPublication").empty().append(latest_work);
diff --git a/webapp/src/main/webapp/js/visualization/dataTables.helper.js b/webapp/src/main/webapp/js/visualization/dataTables.helper.js
index 668cda19d7..585b04c8bd 100644
--- a/webapp/src/main/webapp/js/visualization/dataTables.helper.js
+++ b/webapp/src/main/webapp/js/visualization/dataTables.helper.js
@@ -5,9 +5,9 @@ var disciplineOrSubdisciplineDataTableFilter = function(oSettings, aData, iDataI
 
 	/*
 	 * We are not showing the first column which holds the info on whether that row contains info on
-	 * discipline OR subdiscipline. 
+	 * discipline OR subdiscipline.
 	 * */
-	
+
 	if (rawData[0] === ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER) {
         return true;
     } else if (aData[0] === ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER) {
@@ -15,10 +15,10 @@ var disciplineOrSubdisciplineDataTableFilter = function(oSettings, aData, iDataI
     } else {
 		return false;
 	}
-}	
-	
+}
+
 $.fn.dataTableExt.oPagination.gmail_style = {
-    		
+
         "fnInit": function (oSettings, nPaging, fnCallbackDraw) {
             //var nInfo = document.createElement( 'div' );
             var nFirst = document.createElement('span');
@@ -26,13 +26,13 @@ $.fn.dataTableExt.oPagination.gmail_style = {
             var nNext = document.createElement('span');
             var nLast = document.createElement('span');
 
-            nFirst.innerHTML = "<span class='small-arrows'>&laquo;</span> <span class='paginate-nav-text'>" 
+            nFirst.innerHTML = "<span class='small-arrows'>&laquo;</span> <span class='paginate-nav-text'>"
                                 + i18nStrings.firstString + "</span>";
-            nPrevious.innerHTML = "<span class='small-arrows'>&lsaquo;</span> <span class='paginate-nav-text'>" 
+            nPrevious.innerHTML = "<span class='small-arrows'>&lsaquo;</span> <span class='paginate-nav-text'>"
                                 + i18nStrings.previousString + "</span>";
-            nNext.innerHTML = "<span class='paginate-nav-text'>" 
+            nNext.innerHTML = "<span class='paginate-nav-text'>"
                                 + i18nStrings.nextString + "</span><span class='small-arrows'>&rsaquo;</span>";
-            nLast.innerHTML = "<span class='paginate-nav-text'>" 
+            nLast.innerHTML = "<span class='paginate-nav-text'>"
                                 + i18nStrings.lastString + "</span><span class='small-arrows'>&raquo;</span>";
 
             var oClasses = oSettings.oClasses;
@@ -107,7 +107,7 @@ $.fn.dataTableExt.oPagination.gmail_style = {
             var iCurrentPage = Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength) + 1;
             var iStartButton, iEndButton, i, iLen;
             var oClasses = oSettings.oClasses;
-            
+
             /* Pages calculation */
             if (iPages < iPageCount) {
                 iStartButton = 1;
@@ -166,11 +166,11 @@ $.fn.dataTableExt.oPagination.gmail_style = {
                     anStatic[3].className += " " + oClasses.sPageButton;
                 }
             }
-            
+
             if (typeof GMAIL_STYLE_PAGINATION_CONTAINER_CLASS === 'undefined') {
             	GMAIL_STYLE_PAGINATION_CONTAINER_CLASS = 'paginatedtabs';
             }
-            
+
             if (iPages <= 1) {
             	$("." + GMAIL_STYLE_PAGINATION_CONTAINER_CLASS).hide();
             } else {
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js b/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js
index ee5071c19f..31d12d54a5 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js
@@ -25,9 +25,9 @@ var	PINK_PURPLE = "#CC00CC";
 var	HOT_PINK = "#FF00B4";
 var MEHENDI_GREEN = "#7A7900";
 
-var colorConstantQueue = [ LIGHT_BLUE, DARK_ORANGE, VIBRANT_GREEN, 
-                           NAVY_BLUE, RED, PINK_PURPLE, 
-                           DARK_TURQUOISE, MEHENDI_GREEN, HOT_PINK, 
+var colorConstantQueue = [ LIGHT_BLUE, DARK_ORANGE, VIBRANT_GREEN,
+                           NAVY_BLUE, RED, PINK_PURPLE,
+                           DARK_TURQUOISE, MEHENDI_GREEN, HOT_PINK,
                            DARK_RED ];
 
 var freeColors;
@@ -36,7 +36,7 @@ var globalDateObject;
 
 var year;
 
-var colors, prevColor, colorToAssign, 
+var colors, prevColor, colorToAssign,
 	colorToRemove, renderedObjects, URIToEntityRecord,
 	setOfLabels, URIToCheckedEntities, STOP_WORDS_FOR_TABLE;
 
@@ -50,18 +50,18 @@ var lastCachedAtDateTimes;
 var FlotOptions;
 
 function initConstants() {
-	
+
 	freeColors = colorConstantQueue.slice();
-	
+
 	globalDateObject = new Date();
-	
+
 	year = {
 			min: globalDateObject.getFullYear() - 9,
 			max: globalDateObject.getFullYear(),
 			globalMin: globalDateObject.getFullYear() - 9,
 			globalMax: globalDateObject.getFullYear()
 	};
-	
+
 	colors = {};
 	prevColor = {};
 	colorToAssign, colorToRemove;
@@ -69,11 +69,11 @@ function initConstants() {
 	URIToEntityRecord = {};
 	setOfLabels = [];
 	URIToCheckedEntities = {};
-	
+
 	STOP_WORDS_FOR_TABLE = ["Person", "Organization", "Agent"];
-	
+
 	lastCachedAtDateTimes = [];
-	
+
 	//options for Flot
 	FlotOptions = {
 			legend : {
@@ -87,9 +87,9 @@ function initConstants() {
 			},
 			xaxis : {
 				/*
-				 * This is done to guarantee no-downward-trend on account of no content added for the 
+				 * This is done to guarantee no-downward-trend on account of no content added for the
 				 * current year.
-				 * */  
+				 * */
 				max : globalDateObject.getFullYear() - 1,
 				tickDecimals : 0,
 				tickSize : 10
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js b/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js
index e49b3c8220..88d99b8482 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js
@@ -3,101 +3,101 @@
 $(document).ready(function() {
 
     $.extend(this, i18nStringsGuiEvents);
-	
+
 	/*
 	 * This will set initial values of the constants present in constants.js
 	 * */
 	initConstants();
-	
-	/* This is used to cache the current state whether the user is allowed to select more entities from 
-    the datatable or not. Once Max number of entity selection is reached the user can no longer select 
+
+	/* This is used to cache the current state whether the user is allowed to select more entities from
+    the datatable or not. Once Max number of entity selection is reached the user can no longer select
     more & this variable will be set to false. */
     $("#datatable").data("isEntitySelectionAllowed", true);
-    
+
     $notificationContainer = $("#notification-container").notify();
-    
+
     graphContainer = $("#graphContainer");
     tableDiv = $('#paginatedTable');
-    
+
     /*
      * When the intra-entity parameters are clicked,
-     * update the status accordingly.   
-     */         
+     * update the status accordingly.
+     */
 
     $("select.comparisonValues").change(function() {
 
         var selectedValue = $("select.comparisonValues option:selected").val();
-        
+
         var selectedDataURL;
-        
+
         var oldParameter = currentParameter;
-        
+
         $.each(COMPARISON_PARAMETERS_INFO, function(index, parameter) {
-        	
+
             if (parameter.value === selectedValue) {
-            	
+
             	currentParameter = parameter.name;
             	selectedDataURL = parameter.dataLink;
             	temporalGraphCommonURL = parameter.viewBaseLink;
             	csvDownloadURL = parameter.csvLink;
             }
-        	
+
         });
-        
+
         options = {
     			responseContainer: $("div#temporal-graph-response"),
     			bodyContainer: $("#body"),
     			errorContainer: $("#error-container"),
-    			dataURL: selectedDataURL	
+    			dataURL: selectedDataURL
     		};
-    	
+
     	setupLoadingScreen(options.responseContainer);
-    	
+
     	$.ajax({
             url: options.dataURL,
             dataType: "json",
             timeout: 5 * 60 * 1000,
             success: function (data) {
-    		
+
                 if (data.error) {
                 	options.bodyContainer.hide();
-                	
+
                 	/*
-                	 * When we reload data we would be reusing the already generated "error container" div. 
+                	 * When we reload data we would be reusing the already generated "error container" div.
                 	 * So below is used to replace text taht is specific to the errors that would have caused
                 	 * due to the original parameters.
                 	 * */
-                	var alternateVisInfo = COMPARISON_PARAMETERS_INFO[currentParameter].value + " " 
+                	var alternateVisInfo = COMPARISON_PARAMETERS_INFO[currentParameter].value + " "
                 							+ i18nStringsGuiEvents.temporalGraphCapped + "&nbsp;"
                 							+ '<span id="noPubsOrGrants-span">|&nbsp;'
                 							+ '<a  href="' + COMPARISON_PARAMETERS_INFO[oldParameter].viewLink + '">'
-                							+ i18nStringsGuiEvents.viewString + ' ' 
-                							+ COMPARISON_PARAMETERS_INFO[oldParameter].pluralName 
+                							+ i18nStringsGuiEvents.viewString + ' '
+                							+ COMPARISON_PARAMETERS_INFO[oldParameter].pluralName
                 							+ i18nStringsGuiEvents.temporalGraphLower + '</a></span>'
-                	
+
                 	options.errorContainer.find("#alternative-vis-info").html(alternateVisInfo);
 
                 	options.errorContainer
                 			.find("#comparison-parameter-unavailable-label")
                 			.text(COMPARISON_PARAMETERS_INFO[currentParameter].pluralName);
-                	
+
                 	options.errorContainer.show();
                 	options.responseContainer.unblock();
                 } else {
-                	
+
                 	options.bodyContainer.show();
                 	options.errorContainer.hide();
                     temporalGraphProcessor.redoTemporalGraphRenderProcess(graphContainer, data);
                     options.responseContainer.unblock();
-                    
+
                 }
             }
         });
-    	
+
     });
-    
+
 });
-        
+
 //click event handler for clear button
 $( document ).on('click', "a.clear-selected-entities", function(){
     clearRenderedObjects();
@@ -108,19 +108,19 @@ $( document ).on('click', "input[type=checkbox].easyDeselectCheckbox", function(
     var checkbox = $(this);
     var checkboxValue = $(this).attr("value");
     var linkedCheckbox = URIToCheckedEntities[checkboxValue];
-    
+
     var entityToBeRemoved = URIToEntityRecord[checkboxValue];
 
     if(!checkbox.is(':checked')){
         updateRowHighlighter(linkedCheckbox);
         removeUsedColor(entityToBeRemoved);
-        removeEntityUnChecked(renderedObjects, entityToBeRemoved);                          
+        removeEntityUnChecked(renderedObjects, entityToBeRemoved);
         removeLegendRow(linkedCheckbox);
         removeCheckBoxFromGlobalSet(linkedCheckbox);
         $(linkedCheckbox).prop('checked', false);
         checkIfColorLimitIsReached();
         displayLineGraphs();
-        updateCounter();                
+        updateCounter();
     }
 });
 
@@ -141,47 +141,47 @@ $( document ).on("click", ".disabled-checkbox-event-receiver", function () {
 $( document ).on('click', "#copy-vis-viewlink-icon", function() {
 
 	if ($("#copy-vis-viewlink").is(':visible')) {
-		
+
 		$("#copy-vis-viewlink").hide();
-		
+
 	} else {
-		
+
 		$("#copy-vis-viewlink").show();
-		
+
 		var linkTextBox = $("#copy-vis-viewlink input[type='text']");
-		
+
 		linkTextBox.val(getCurrentParameterVisViewLink());
-		
+
 		linkTextBox.select();
 	}
-	
+
 });
 
 $( document ).on('click', ".filter-option", function() {
 
 	if (!$(this).hasClass('active-filter')) {
-		
+
 		if ($(this).attr('id') === 'people-filter') {
-			
+
 			$("#organizations-filter").removeClass('active-filter');
       $("#no-filter").removeClass('active-filter');
 			temporalGraphProcessor.currentSelectedFilter = "PEOPLE";
-			
+
 		} else if ($(this).attr('id') === 'organizations-filter') {
-			
+
 			$("#people-filter").removeClass('active-filter');
       $("#no-filter").removeClass('active-filter');
 			temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
-		} 
+		}
     else if ($(this).attr('id') === 'no-filter') {
-			
+
 			$("#people-filter").removeClass('active-filter');
       $("#organizations-filter").removeClass('active-filter');
 			temporalGraphProcessor.currentSelectedFilter = "NONE";
-		} 
-		
+		}
+
 		$(this).addClass('active-filter');
-		
+
 		temporalGraphProcessor.dataTable.fnDraw();
 	}
 });
@@ -191,34 +191,34 @@ function getCurrentParameterVisViewLink() {
 }
 
 function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) {
-    
+
     removeUsedColor(entity);
     removeEntityUnChecked(renderedObjects, entity);
     removeLegendRow(checkbox);
     removeCheckBoxFromGlobalSet(checkbox);
-    
+
     checkbox.closest("tr").removeClass('datatablerowhighlight');
 
 }
 
 function performEntityCheckboxSelectedActions(entity, checkboxValue, checkbox) {
-            
+
     getNextFreeColor(entity);
 
     //Generate the bar, checkbox and label for the legend.
     createLegendRow(entity, $("#bottom"));
 
     renderLineGraph(renderedObjects, entity);
-    
+
     URIToCheckedEntities[checkboxValue] = checkbox;
     URIToCheckedEntities[checkboxValue].entity = entity;
-    
-    
+
+
     /*
-     * To highlight the rows belonging to selected entities. 
+     * To highlight the rows belonging to selected entities.
      * */
     checkbox.closest("tr").addClass('datatablerowhighlight');
-            
+
 }
 
 function performEntityCheckboxClickedRedrawActions() {
@@ -231,11 +231,11 @@ function performEntityCheckboxClickedRedrawActions() {
 }
 
 var processJSONData = {
-		
-	isParentEntityAvailable: false,	
-	
+
+	isParentEntityAvailable: false,
+
 	currentEntityLevel: i18nStringsGuiEvents.organizationsCappedString,
-	
+
 
 	/**
 	 * This is used to find out the sum of all the counts of a particular entity. This is
@@ -250,17 +250,17 @@ var processJSONData = {
 		var currentYear = 0;
 
 		$.each(allActivities, function(index, data){
-			
+
 			if (this[0] === -1) {
 				unknown += this[1];
 			} else {
 				known += this[1];
-				
+
 				if (this[0] === globalDateObject.getFullYear()) {
 					currentYear += this[1];
 				}
 			}
-			
+
 		});
 
 		sum = {
@@ -268,44 +268,44 @@ var processJSONData = {
 			unknownYearCount: unknown,
 			currentYearCount: currentYear
 		};
-		
+
 		return sum;
 	},
-	
+
 	setupGlobals: function(jsonContent, resetFilter) {
-		
+
 		var entityLevels = new Array();
 		var entityActivityCount = {
 			PERSON: 0,
 			ORGANIZATION: 0
 		};
-		
+
 		$.each(jsonContent, function (index, val) {
-	        
+
 	    	/*
-	    	 * We are checking if the "label" attribute is present, because that pertains to 
+	    	 * We are checking if the "label" attribute is present, because that pertains to
 	    	 * data used for linegraph visualization.
 	    	 * */
 	    	if (val.label) {
-	    		
+
 		    	setOfLabels.push(val.label);
 		        URIToEntityRecord[val.entityURI] = val;
 		        if (val.lastCachedAtDateTime) {
 		        	lastCachedAtDateTimes[lastCachedAtDateTimes.length] = val.lastCachedAtDateTime;
 		        }
-		        
+
 		        /*
 		         * Setup value to be used to determine whether to show people or organizations filter,
 		         * by default.
 		         * */
 		        var activityCountInfoForEntity = processJSONData.aggregateActivityCounts(val.data);
-		        
+
 		        URIToEntityRecord[val.entityURI].activityCount = activityCountInfoForEntity;
-		    	
-		    	entityActivityCount[val.visMode] += 
-		    		activityCountInfoForEntity.knownYearCount 
+
+		    	entityActivityCount[val.visMode] +=
+		    		activityCountInfoForEntity.knownYearCount
 	    				+ activityCountInfoForEntity.unknownYearCount;
-		    	
+
 		    	/*
 		    	 * Setup the entity level
 		    	 * */
@@ -314,61 +314,61 @@ var processJSONData = {
 				} else if (val.visMode ===  "ORGANIZATION"){
 					entityLevels.push(i18nStringsGuiEvents.organizationsCappedString);
 				}
-		    	
-		        
+
+
 	    	} else if (val.subjectEntityLabel) {
-	
+
 	    		/*
 	    		 * This is to set the drill-up visualization URLs.
 	    		 * */
 	    		$.each(val.parentURIToLabel, function(index, value) {
-	    			
+
 	    			$("a#subject-parent-entity-temporal-url").attr("href", getTemporalVisURL(index));
-	    			
+
 	    			$("a#subject-parent-entity-profile-url").attr("href", getVIVOURL(index));
 	    			$("a#subject-parent-entity-profile-url").text(value);
-	    			
+
 	    			processJSONData.isParentEntityAvailable = true;
 	    		});
 	    	}
-	    	
+
 	    });
-		
+
 		/*
 		 * We do not want to change the current filter setting if the user has changed the parameter
-		 * from the dropdown box. Only when the temporal vis is loaded directly we want to make sure 
+		 * from the dropdown box. Only when the temporal vis is loaded directly we want to make sure
 		 * that the group of entites that has the most activity is shown.
 		 * */
 		if (resetFilter) {
 			if (entityActivityCount.ORGANIZATION >= entityActivityCount.PERSON) {
-				
+
 				temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
-				
+
 				$("#organizations-filter").addClass("active-filter");
 				$("#people-filter").removeClass("active-filter");
-				
-				
+
+
 			} else {
-				
+
 				temporalGraphProcessor.currentSelectedFilter = "PEOPLE";
-				
+
 				$("#people-filter").addClass("active-filter");
 				$("#organizations-filter").removeClass("active-filter");
-				
+
 			}
 		}
-		
+
 		if (processJSONData.isParentEntityAvailable) {
 			$("#subject-parent-entity").show();
 		} else {
 			$("#subject-parent-entity").hide();
 		}
-		
+
 		var uniqueEntityLevels = $.unique(entityLevels);
-		
+
 		/*
 		 * This case is when organizations & people are mixed because both are directly attached
-		 * to the parent organization. 
+		 * to the parent organization.
 		 * */
 		if (uniqueEntityLevels.length > 1) {
 			processJSONData.currentEntityLevel = i18nStringsGuiEvents.organizationsAndPeople;
@@ -380,44 +380,44 @@ var processJSONData = {
 			/* To provide graceful degradation set entity level to a default error message.*/
 			processJSONData.currentEntityLevel = i18nStringsGuiEvents.levelUndefinedError;
 		}
-	},	
-	
-	/* 
+	},
+
+	/*
 	 *  function to populate the labelToEntityRecord object with the
 	 *  values from the json file and
 	 *  dynamically generate checkboxes
 	 */
 	loadData: function(jsonData, dataTableParams) {
-		
+
 		processJSONData.setupGlobals(jsonData, true);
-		
+
 		temporalGraphProcessor.dataTable = prepareTableForDataTablePagination(jsonData, dataTableParams);
-	    
+
 	    setEntityLevel(processJSONData.currentEntityLevel);
-	    
+
 	    entityCheckboxOperatedOnEventListener();
 	},
-	
-	/* 
+
+	/*
 	 *  function to populate the labelToEntityRecord object with the
 	 *  values from the json file and
 	 *  dynamically generate checkboxes
 	 */
 	reloadData: function(preselectedEntityURIs, jsonData) {
-		
+
 		processJSONData.setupGlobals(jsonData);
-		
+
 		temporalGraphProcessor.dataTable = reloadDataTablePagination(preselectedEntityURIs, jsonData);
-	    
+
 	    setEntityLevel(processJSONData.currentEntityLevel);
-	    
+
 	    $("a#csv").attr("href", csvDownloadURL);
 	}
-		
+
 };
 
 function entityCheckboxOperatedOnEventListener() {
-	
+
     /*
      * When the elements in the paginated div
      * are clicked this event handler is called
@@ -427,26 +427,26 @@ function entityCheckboxOperatedOnEventListener() {
         var checkbox = $(this);
         var checkboxValue = $(this).attr("value");
         var entity = URIToEntityRecord[checkboxValue];
-        
+
         temporalGraphProcessor.isDefaultSelectionsMaintained = false;
-        
+
         if (checkbox.is(':checked')) {
-        
+
             performEntityCheckboxSelectedActions(entity, checkboxValue, checkbox);
-        
+
         } else {
-        
-            performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox);        
+
+            performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox);
         }
-        
+
         performEntityCheckboxClickedRedrawActions();
     });
 }
 
 function renderTemporalGraphVisualization(parameters) {
-	
+
     setupLoadingScreen(parameters.responseContainer);
-    
+
     getTemporalGraphData(parameters.dataURL,
     					 parameters.bodyContainer,
                          parameters.errorContainer,
@@ -454,38 +454,38 @@ function renderTemporalGraphVisualization(parameters) {
 }
 
 /*
- * This method will setup the options for loading screen & then activate the 
+ * This method will setup the options for loading screen & then activate the
  * loading screen.
  * */
 function setupLoadingScreen(visContainerDIV) {
-	
-    $.blockUI.defaults.overlayCSS = { 
-            backgroundColor: '#fff', 
-            opacity:         1.0 
+
+    $.blockUI.defaults.overlayCSS = {
+            backgroundColor: '#fff',
+            opacity:         1.0
         };
-        
+
     $.blockUI.defaults.css.width = '500px';
     $.blockUI.defaults.css.border = '0px';
     $.blockUI.defaults.css.top = '10px';
-    
+
     visContainerDIV.block({
-        message: '<div id="loading-data-container"><h3><img id="data-loading-icon" src="' + loadingImageLink 
-        			+ '" />&nbsp;' + i18nStringsGuiEvents.loadingDataFor + ' <i>' 
+        message: '<div id="loading-data-container"><h3><img id="data-loading-icon" src="' + loadingImageLink
+        			+ '" />&nbsp;' + i18nStringsGuiEvents.loadingDataFor + ' <i>'
         			+ organizationLabel
         			+ '</i></h3></div>'
     });
-    
+
     clearTimeout(temporalGraphProcessor.loadingScreenTimeout);
-    
+
     temporalGraphProcessor.loadingScreenTimeout = setTimeout(function() {
     	$("#loading-data-container")
-    		.html('<h3><img id="refresh-page-icon" src="' 
-    				+ refreshPageImageLink 
+    		.html('<h3><img id="refresh-page-icon" src="'
+    				+ refreshPageImageLink
 	    			+ '" />&nbsp;' + i18nStringsGuiEvents.dataForString + ' <i>' + organizationLabel
-	    			+ '</i> ' + i18nStringsGuiEvents.refreshingDataMsg 
+	    			+ '</i> ' + i18nStringsGuiEvents.refreshingDataMsg
 	    			+ '</h3>')
 	    	.css({'cursor': 'pointer'});
-    	
+
     }, 10 * 1000);
 }
 
@@ -493,174 +493,174 @@ function setupLoadingScreen(visContainerDIV) {
  * This function gets json data for temporal graph & after rendering removes the
  * loading message. It will also display the error container in case of any error.
  * */
-function getTemporalGraphData(temporalGraphDataURL, 
-										graphBodyDIV, 
-										errorBodyDIV, 
+function getTemporalGraphData(temporalGraphDataURL,
+										graphBodyDIV,
+										errorBodyDIV,
 										visContainerDIV) {
-	
+
 	if (!isDataRequestSentViaAJAX) {
-		
+
 		isDataRequestSentViaAJAX = true;
-		
+
 		$.ajax({
 	        url: temporalGraphDataURL,
 	        dataType: "json",
 	        timeout: 5 * 60 * 1000,
 	        success: function (data) {
-	
+
 	            if (data.error) {
 	            	graphBodyDIV.hide();
 	            	errorBodyDIV.show();
 	            	visContainerDIV.unblock();
 	            } else {
-	            	
+
 	            	graphBodyDIV.show();
 	            	errorBodyDIV.hide();
 	                temporalGraphProcessor.initiateTemporalGraphRenderProcess(graphContainer, data);
 	                visContainerDIV.unblock();
-	                
+
 	            }
 	        },
 	       complete: function() {
 	        	isDataRequestSentViaAJAX = false;
 	        }
 	    });
-	
+
 	}
-	
+
 }
 
 var lastCachedAtDateTimeParser = {
-		
+
 	getDateObjectFromRawXSDateTimeString: function(rawDateTimeString) {
-	
+
 		var dateTime = rawDateTimeString.split("T", 2);
 		var date = dateTime[0].split("-");
 		var time = dateTime[1].split(":");
-		
+
 		return new Date(date[0], parseInt(date[1], 10) -1, date[2], time[0], time[1], 0);
 	},
-	
+
 	getReadableDateString: function(dateObject) {
-		
+
 		if (typeof dateObject === "string") {
 			dateObject = this.getDateObjectFromRawXSDateTimeString(dateObject);
 		}
-		
+
 		var day = [i18nStringsGuiEvents.sundayString, i18nStringsGuiEvents.mondayString, i18nStringsGuiEvents.tuesdayString, i18nStringsGuiEvents.wednesdayString, i18nStringsGuiEvents.thursdayString, i18nStringsGuiEvents.fridayString, i18nStringsGuiEvents.saturdayString];
 		var month = [i18nStringsGuiEvents.januaryString, i18nStringsGuiEvents.februaryString, i18nStringsGuiEvents.marchString, i18nStringsGuiEvents.aprilString, i18nStringsGuiEvents.mayString, i18nStringsGuiEvents.juneString, i18nStringsGuiEvents.julyString, i18nStringsGuiEvents.augustString, i18nStringsGuiEvents.septemberString, i18nStringsGuiEvents.octoberString, i18nStringsGuiEvents.novemberString];
-		
+
 		return month[dateObject.getMonth()] + " " + dateObject.getDate() + ", " + dateObject.getFullYear() + ".";
 	},
-	
+
 	ascendingDateSorter: function(rawDateStringA, rawDateStringB) {
-		
-		var dateA = lastCachedAtDateTimeParser.getDateObjectFromRawXSDateTimeString(rawDateStringA); 
+
+		var dateA = lastCachedAtDateTimeParser.getDateObjectFromRawXSDateTimeString(rawDateStringA);
 		var dateB = lastCachedAtDateTimeParser.getDateObjectFromRawXSDateTimeString(rawDateStringB);
 		return dateA-dateB; //sort by date ascending
    }
-		
+
 };
 
 var entitySelector = {
-		
+
 	manuallyTriggerSelectOnDataTableCheckbox: function(checkbox) {
-	
+
 		checkbox.prop('checked', true);
-	    
+
 	    var checkboxValue = checkbox.attr("value");
 	    var entity = URIToEntityRecord[checkboxValue];
-	    
+
 	    performEntityCheckboxSelectedActions(entity, checkboxValue, checkbox);
 	    performEntityCheckboxClickedRedrawActions();
-	
+
 	}
 }
 
 temporalGraphProcessor = {
-		
+
 	isDefaultSelectionsMaintained: true,
-		
+
 	loadingScreenTimeout: '',
-	
+
 	currentSelectedFilter: 'ORGANIZATIONS',
-	
+
 	dataTable: '',
-		
+
 	initiateTemporalGraphRenderProcess: function(givenGraphContainer, jsonData) {
-		
+
 		this.dataTableParams = {
 			searchBarParentContainerDIVClass : "searchbar",
 			paginationContainerDIVClass : "paginatedtabs"
 		};
-		
-		
+
+
 		/*
-         * initial display of the grid when the page loads 
-         * */ 
+         * initial display of the grid when the page loads
+         * */
         init(givenGraphContainer);
 
         /*
-         * render the temporal graph per the sent content. 
+         * render the temporal graph per the sent content.
          * */
         processJSONData.loadData(jsonData, this.dataTableParams);
-        
+
         lastCachedAtDateTimes.sort(lastCachedAtDateTimeParser.ascendingDateSorter);
-        
+
         /*
          * This will make sure that top 3 entities are selected by default when the page loads.
-        */      
+        */
         $.each($("input." + entityCheckboxSelectorDOMClass), function(index, checkbox) {
-                
+
             if (index > 2) {
                 return false;
             }
-        
+
             entitySelector.manuallyTriggerSelectOnDataTableCheckbox($(this));
-                    
+
         });
 
         if ($("#incomplete-data-disclaimer").length > 0 && lastCachedAtDateTimes.length > 0) {
-        	
-        	var disclaimerText = i18nStringsGuiEvents.disclaimerTextOne + " " 
+
+        	var disclaimerText = i18nStringsGuiEvents.disclaimerTextOne + " "
 				+ COMPARISON_PARAMETERS_INFO[currentParameter].value
 				+ " " + i18nStringsGuiEvents.disclaimerTextTwo + " "
 				+ lastCachedAtDateTimeParser.getReadableDateString(lastCachedAtDateTimes[0]);
-        	
+
         	$("#incomplete-data-disclaimer").attr(
-        			"title", 
-        			disclaimerText); 
+        			"title",
+        			disclaimerText);
         }
 	},
-	
+
 	redoTemporalGraphRenderProcess: function(givenGraphContainer, jsonData) {
-		
+
 		var currentSelectedEntityURIs = [];
-		
+
 		/*
-		 * We want to make sure that the currently selected entities are preserved only if they 
+		 * We want to make sure that the currently selected entities are preserved only if they
 		 * were somehow manipulated by the users.
 		 * */
 		if (!temporalGraphProcessor.isDefaultSelectionsMaintained) {
 			$.each(URIToCheckedEntities, function(index, entity){
 				currentSelectedEntityURIs.push(index);
-			});	
+			});
 		}
-		
+
 		clearRenderedObjects();
-		
+
 		initConstants();
-		
+
 		/*
-         * initial display of the grid when the page loads 
-         * */ 
+         * initial display of the grid when the page loads
+         * */
         init(givenGraphContainer);
 
         /*
-         * render the temporal graph per the sent content. 
+         * render the temporal graph per the sent content.
          * */
         processJSONData.reloadData(currentSelectedEntityURIs, jsonData);
-        
+
         lastCachedAtDateTimes.sort(lastCachedAtDateTimeParser.ascendingDateSorter);
 
         if (currentSelectedEntityURIs.length > 0) {
@@ -668,48 +668,48 @@ temporalGraphProcessor = {
         	$.each(currentSelectedEntityURIs, function(index, uri) {
 
         		var targetPrevSelectedCheckbox = $('input.' + entityCheckboxSelectorDOMClass + '[value="' + uri + '"]');
-        		
+
         		if (targetPrevSelectedCheckbox.length > 0) {
 
         			entitySelector.manuallyTriggerSelectOnDataTableCheckbox(targetPrevSelectedCheckbox);
         		}
         	});
         } else {
-        	
+
         	/*
-        	 * We have to redraw the table so that top 3 entities are selected. fnDraw() triggers sorting of the 
-        	 * table and other filters. 
+        	 * We have to redraw the table so that top 3 entities are selected. fnDraw() triggers sorting of the
+        	 * table and other filters.
         	 * */
         	temporalGraphProcessor.dataTable.fnDraw();
-        	
+
 	        /*
 	         * This will make sure that top 3 entities are selected by default when the page loads.
-	        */      
+	        */
 	        $.each($("input." + entityCheckboxSelectorDOMClass), function(index, checkbox) {
-	                
+
                 if (index > 2) {
                     return false;
                 }
                 entitySelector.manuallyTriggerSelectOnDataTableCheckbox($(this));
 	        });
         }
-        
+
         /*
          * Table has to be redrawn now & not later to avoid checkboxes not being selected, which is
-         * caused if they are not visible at that point of time. 
+         * caused if they are not visible at that point of time.
          * */
         temporalGraphProcessor.dataTable.fnDraw();
-        
+
         if ($("#incomplete-data-disclaimer").length > 0 && lastCachedAtDateTimes.length > 0) {
-        	
-        	var disclaimerText = i18nStringsGuiEvents.disclaimerTextOne + " " 
+
+        	var disclaimerText = i18nStringsGuiEvents.disclaimerTextOne + " "
         							+ COMPARISON_PARAMETERS_INFO[currentParameter].value
         							+ i18nStringsGuiEvents.disclaimerTextTwo + " "
         							+ lastCachedAtDateTimeParser.getReadableDateString(lastCachedAtDateTimes[0]);
-        	
+
         	$("#incomplete-data-disclaimer").attr(
-        			"title", disclaimerText); 
+        			"title", disclaimerText);
         }
         $("#copy-vis-viewlink input[type='text']").val(getCurrentParameterVisViewLink());
-	}	
+	}
 }
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
index 5cf068b29d..487a054918 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
@@ -15,7 +15,7 @@
 }
 
 .paginatedtabs {
-/*  border-top: 1px #3D454E solid; 
+/*  border-top: 1px #3D454E solid;
     text-align: center;*/
     margin-bottom: 10px;
     font-size: 0.9em;
@@ -25,7 +25,7 @@
 }
 
 .paginatedtabs span {
-    padding-right: 5px; 
+    padding-right: 5px;
     cursor: pointer;
     color: #2485AE;
 }
@@ -58,9 +58,9 @@
 }
 
 .datatablewrapper th {
-    border-top: 1px #3D454E solid;  
-    background:#F1F2ee; 
-    font-weight:bold; 
+    border-top: 1px #3D454E solid;
+    background:#F1F2ee;
+    font-weight:bold;
     font-size:12px;
     padding-bottom: 3px;
     padding-top: 3px;
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js
index c40d6f7014..2a97fd178e 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js
@@ -935,11 +935,11 @@ if (!document.createElement('canvas').getContext) {
                          mr(p.xEnd), ',', mr(p.yEnd));
             break;
         }
-  
-  
+
+
         // TODO: Following is broken for curves due to
         //       move to proper paths.
-  
+
         // Figure out dimensions so we can do gradient fills
         // properly
         if (p) {
@@ -958,15 +958,15 @@ if (!document.createElement('canvas').getContext) {
         }
       }
       lineStr.push(' ">');
-  
+
       if (!aFill) {
         appendStroke(this, lineStr);
       } else {
         appendFill(this, lineStr, min, max);
       }
-  
+
       lineStr.push('</g_vml_:shape>');
-  
+
       this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
     }
   };
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js
index fa44961217..4d8aa5778a 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js
@@ -1,7 +1,7 @@
 /* Plugin for jQuery for working with colors.
- * 
+ *
  * Version 1.0.
- * 
+ *
  * Inspiration from jQuery color animation plugin by John Resig.
  *
  * Released under the MIT license by Ole Laursen, October 2009.
@@ -15,7 +15,7 @@
  *
  * Note that .scale() and .add() work in-place instead of returning
  * new objects.
- */ 
+ */
 
 (function() {
     jQuery.color = {};
@@ -33,13 +33,13 @@
                 o[c.charAt(i)] += d;
             return o.normalize();
         };
-        
+
         o.scale = function (c, f) {
             for (var i = 0; i < c.length; ++i)
                 o[c.charAt(i)] *= f;
             return o.normalize();
         };
-        
+
         o.toString = function () {
             if (o.a >= 1.0) {
                 return "rgb("+[o.r, o.g, o.b].join(",")+")";
@@ -52,7 +52,7 @@
             function clamp(min, value, max) {
                 return value < min ? min: (value > max ? max: value);
             }
-            
+
             o.r = clamp(0, parseInt(o.r), 255);
             o.g = clamp(0, parseInt(o.g), 255);
             o.b = clamp(0, parseInt(o.b), 255);
@@ -83,10 +83,10 @@
         // catch Safari's way of signalling transparent
         if (c == "rgba(0, 0, 0, 0)")
             c = "transparent";
-        
+
         return jQuery.color.parse(c);
     }
-    
+
     // parse CSS color string (like "rgb(10, 32, 43)" or "#fff"),
     // returns color object
     jQuery.color.parse = function (str) {
@@ -95,11 +95,11 @@
         // Look for rgb(num,num,num)
         if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))
             return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10));
-        
+
         // Look for rgba(num,num,num,num)
         if (res = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
             return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10), parseFloat(res[4]));
-            
+
         // Look for rgb(num%,num%,num%)
         if (res = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))
             return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55);
@@ -107,7 +107,7 @@
         // Look for rgba(num%,num%,num%,num)
         if (res = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
             return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55, parseFloat(res[4]));
-        
+
         // Look for #a0b1c2
         if (res = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))
             return m(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16));
@@ -125,7 +125,7 @@
             return m(res[0], res[1], res[2]);
         }
     }
-    
+
     var lookupColors = {
         aqua:[0,255,255],
         azure:[240,255,255],
@@ -170,5 +170,5 @@
         silver:[192,192,192],
         white:[255,255,255],
         yellow:[255,255,0]
-    };    
+    };
 })();
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js
index 11be113fd2..5ba7246c4a 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js
@@ -60,7 +60,7 @@ The plugin also adds four public methods:
             lineWidth: 1
         }
     };
-    
+
     function init(plot) {
         // position of crosshair in pixels
         var crosshair = { x: -1, y: -1, locked: false };
@@ -70,16 +70,16 @@ The plugin also adds four public methods:
                 crosshair.x = -1;
             else {
                 var axes = plot.getAxes();
-                
+
                 crosshair.x = Math.max(0, Math.min(pos.x != null ? axes.xaxis.p2c(pos.x) : axes.x2axis.p2c(pos.x2), plot.width()));
                 crosshair.y = Math.max(0, Math.min(pos.y != null ? axes.yaxis.p2c(pos.y) : axes.y2axis.p2c(pos.y2), plot.height()));
             }
-            
+
             plot.triggerRedrawOverlay();
         };
-        
+
         plot.clearCrosshair = plot.setCrosshair; // passes null for pos
-        
+
         plot.lockCrosshair = function lockCrosshair(pos) {
             if (pos)
                 plot.setCrosshair(pos);
@@ -100,16 +100,16 @@ The plugin also adds four public methods:
                     plot.triggerRedrawOverlay();
                 }
             });
-            
+
             eventHolder.mousemove(function (e) {
                 if (plot.getSelection && plot.getSelection()) {
                     crosshair.x = -1; // hide the crosshair while selecting
                     return;
                 }
-                
+
                 if (crosshair.locked)
                     return;
-                
+
                 var offset = plot.offset();
                 crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
                 crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
@@ -123,7 +123,7 @@ The plugin also adds four public methods:
                 return;
 
             var plotOffset = plot.getPlotOffset();
-            
+
             ctx.save();
             ctx.translate(plotOffset.left, plotOffset.top);
 
@@ -146,7 +146,7 @@ The plugin also adds four public methods:
             ctx.restore();
         });
     }
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js
index b879a964dd..11c4436b6c 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js
@@ -66,11 +66,11 @@ images (like Google Maps).
         var urls = [], points = [];
 
         var defaultShow = options.series.images.show;
-        
+
         $.each(series, function (i, s) {
             if (!(defaultShow || s.images.show))
                 return;
-            
+
             if (s.data)
                 s = s.data;
 
@@ -92,7 +92,7 @@ images (like Google Maps).
             callback();
         });
     }
-    
+
     $.plot.image.load = function (urls, callback) {
         var missing = urls.length, loaded = {};
         if (missing == 0)
@@ -101,9 +101,9 @@ images (like Google Maps).
         $.each(urls, function (i, url) {
             var handler = function () {
                 --missing;
-                
+
                 loaded[url] = this;
-                
+
                 if (missing == 0)
                     callback(loaded);
             };
@@ -111,14 +111,14 @@ images (like Google Maps).
             $('<img />').on("load", handler).error(handler).attr('src', url);
         });
     }
-    
+
     function draw(plot, ctx) {
         var plotOffset = plot.getPlotOffset();
-        
+
         $.each(plot.getData(), function (i, series) {
             var points = series.datapoints.points,
                 ps = series.datapoints.pointsize;
-            
+
             for (var i = 0; i < points.length; i += ps) {
                 var img = points[i],
                     x1 = points[i + 1], y1 = points[i + 2],
@@ -142,8 +142,8 @@ images (like Google Maps).
                     y2 = y1;
                     y1 = tmp;
                 }
-                
-                // if the anchor is at the center of the pixel, expand the 
+
+                // if the anchor is at the center of the pixel, expand the
                 // image by 1/2 pixel in each direction
                 if (series.images.anchor == "center") {
                     tmp = 0.5 * (x2-x1) / (img.width - 1);
@@ -153,7 +153,7 @@ images (like Google Maps).
                     y1 -= tmp;
                     y2 += tmp;
                 }
-                
+
                 // clip
                 if (x1 == x2 || y1 == y2 ||
                     x1 >= xaxis.max || x2 <= xaxis.min ||
@@ -180,12 +180,12 @@ images (like Google Maps).
                     sy1 += (sy1 - sy2) * (yaxis.max - y2) / (y2 - y1);
                     y2 = yaxis.max;
                 }
-                
+
                 x1 = xaxis.p2c(x1);
                 x2 = xaxis.p2c(x2);
                 y1 = yaxis.p2c(y1);
                 y2 = yaxis.p2c(y2);
-                
+
                 // the transformation may have swapped us
                 if (x1 > x2) {
                     tmp = x2;
@@ -222,12 +222,12 @@ images (like Google Maps).
             { y: true, number: true, required: true }
         ];
     }
-    
+
     function init(plot) {
         plot.hooks.processRawData.push(processRawData);
         plot.hooks.draw.push(draw);
     }
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js
index 2e808deac9..4b5a5663dc 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js
@@ -7,9 +7,9 @@
 // first an inline dependency, jquery.colorhelpers.js, we inline it here
 // for convenience
 /* Plugin for jQuery for working with colors.
- * 
+ *
  * Version 1.0.
- * 
+ *
  * Inspiration from jQuery color animation plugin by John Resig.
  *
  * Released under the MIT license by Ole Laursen, October 2009.
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js
index e6f8834108..9fb0d3cbc7 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js
@@ -10,8 +10,8 @@ something happens, useful for synchronizing plots.
 Example usage:
 
   plot = $.plot(...);
-  
-  // zoom default amount in on the pixel (100, 200) 
+
+  // zoom default amount in on the pixel (100, 200)
   plot.zoom({ center: { left: 10, top: 20 } });
 
   // zoom out again
@@ -28,7 +28,7 @@ Options:
     trigger: "dblclick" // or "click" for single click
     amount: 1.5         // 2 = 200% (zoom in), 0.5 = 50% (zoom out)
   }
-  
+
   pan: {
     interactive: false
   }
@@ -37,7 +37,7 @@ Options:
     zoomRange: null  // or [number, number] (min range, max range)
     panRange: null   // or [number, number] (min, max)
   }
-  
+
 "interactive" enables the built-in drag/click behaviour. "amount" is
 the amount to zoom the viewport relative to the current range, so 1 is
 100% (i.e. no change), 1.5 is 150% (zoom in), 0.7 is 70% (zoom out).
@@ -58,7 +58,7 @@ other. Either can be null.
 // effort of downloading them.
 
 /*
-jquery.event.drag.js ~ v1.5 ~ Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)  
+jquery.event.drag.js ~ v1.5 ~ Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)
 Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-LICENSE.txt
 */
 (function(E){E.fn.drag=function(L,K,J){if(K){this.bind("dragstart",L)}if(J){this.bind("dragend",J)}return !L?this.trigger("drag"):this.bind("drag",K?K:L)};var A=E.event,B=A.special,F=B.drag={not:":input",distance:0,which:1,dragging:false,setup:function(J){J=E.extend({distance:F.distance,which:F.which,not:F.not},J||{});J.distance=I(J.distance);A.add(this,"mousedown",H,J);if(this.attachEvent){this.attachEvent("ondragstart",D)}},teardown:function(){A.remove(this,"mousedown",H);if(this===F.dragging){F.dragging=F.proxy=false}G(this,true);if(this.detachEvent){this.detachEvent("ondragstart",D)}}};B.dragstart=B.dragend={setup:function(){},teardown:function(){}};function H(L){var K=this,J,M=L.data||{};if(M.elem){K=L.dragTarget=M.elem;L.dragProxy=F.proxy||K;L.cursorOffsetX=M.pageX-M.left;L.cursorOffsetY=M.pageY-M.top;L.offsetX=L.pageX-L.cursorOffsetX;L.offsetY=L.pageY-L.cursorOffsetY}else{if(F.dragging||(M.which>0&&L.which!=M.which)||E(L.target).is(M.not)){return }}switch(L.type){case"mousedown":E.extend(M,E(K).offset(),{elem:K,target:L.target,pageX:L.pageX,pageY:L.pageY});A.add(document,"mousemove mouseup",H,M);G(K,false);F.dragging=null;return false;case !F.dragging&&"mousemove":if(I(L.pageX-M.pageX)+I(L.pageY-M.pageY)<M.distance){break}L.target=M.target;J=C(L,"dragstart",K);if(J!==false){F.dragging=K;F.proxy=L.dragProxy=E(J||K)[0]}case"mousemove":if(F.dragging){J=C(L,"drag",K);if(B.drop){B.drop.allowed=(J!==false);B.drop.handler(L)}if(J!==false){break}L.type="mouseup"}case"mouseup":A.remove(document,"mousemove mouseup",H);if(F.dragging){if(B.drop){B.drop.handler(L)}C(L,"dragend",K)}G(K,true);F.dragging=F.proxy=M.elem=false;break}return true}function C(M,K,L){M.type=K;var J=E.event.handle.call(L,M);return J===false?false:J||M.result}function I(J){return Math.pow(J,2)}function D(){return(F.dragging===false)}function G(K,J){if(!K){return }K.unselectable=J?"off":"on";K.onselectstart=function(){return J};if(K.style){K.style.MozUserSelect=J?"":"none"}}})(jQuery);
@@ -72,7 +72,7 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
  * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
  *
  * Version: 3.0.2
- * 
+ *
  * Requires: 1.2.2+
  */
 (function(c){var a=["DOMMouseScroll","mousewheel"];c.event.special.mousewheel={setup:function(){if(this.addEventListener){for(var d=a.length;d;){this.addEventListener(a[--d],b,false)}}else{this.onmousewheel=b}},teardown:function(){if(this.removeEventListener){for(var d=a.length;d;){this.removeEventListener(a[--d],b,false)}}else{this.onmousewheel=null}}};c.fn.extend({mousewheel:function(d){return d?this.bind("mousewheel",d):this.trigger("mousewheel")},unmousewheel:function(d){return this.unbind("mousewheel",d)}});function b(f){var d=[].slice.call(arguments,1),g=0,e=true;f=c.event.fix(f||window.event);f.type="mousewheel";if(f.wheelDelta){g=f.wheelDelta/120}if(f.detail){g=-f.detail/3}d.unshift(f,g);return c.event.handle.apply(this,d)}})(jQuery);
@@ -109,7 +109,7 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
                     else
                         plot.zoom({ center: c });
                 }
-                
+
                 eventHolder[o.zoom.trigger](clickHandler);
 
                 eventHolder.mousewheel(function (e, delta) {
@@ -119,7 +119,7 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
             }
             if (o.pan.interactive) {
                 var prevCursor = 'default', pageX = 0, pageY = 0;
-                
+
                 eventHolder.bind("dragstart", { distance: 10 }, function (e) {
                     if (e.which != 1)  // only accept left-click
                         return false;
@@ -143,18 +143,18 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
         plot.zoomOut = function (args) {
             if (!args)
                 args = {};
-            
+
             if (!args.amount)
                 args.amount = plot.getOptions().zoom.amount
 
             args.amount = 1 / args.amount;
             plot.zoom(args);
         }
-        
+
         plot.zoom = function (args) {
             if (!args)
                 args = {};
-            
+
             var axes = plot.getAxes(),
                 options = plot.getOptions(),
                 c = args.center,
@@ -163,7 +163,7 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
 
             if (!c)
                 c = { left: w / 2, top: h / 2 };
-                
+
             var xf = c.left / w,
                 x1 = c.left - xf * w / amount,
                 x2 = c.left + (1 - xf) * w / amount,
@@ -174,10 +174,10 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
             function scaleAxis(min, max, name) {
                 var axis = axes[name],
                     axisOptions = options[name];
-                
+
                 if (!axis.used)
                     return;
-                    
+
                 min = axis.c2p(min);
                 max = axis.c2p(max);
                 if (max < min) { // make sure min < max
@@ -191,7 +191,7 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
                     ((zr[0] != null && range < zr[0]) ||
                      (zr[1] != null && range > zr[1])))
                     return;
-            
+
                 axisOptions.min = min;
                 axisOptions.max = max;
             }
@@ -200,10 +200,10 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
             scaleAxis(x1, x2, 'x2axis');
             scaleAxis(y1, y2, 'yaxis');
             scaleAxis(y1, y2, 'y2axis');
-            
+
             plot.setupGrid();
             plot.draw();
-            
+
             if (!args.preventEvent)
                 plot.getPlaceholder().trigger("plotzoom", [ plot ]);
         }
@@ -221,7 +221,7 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
                 var axis = axes[name],
                     axisOptions = options[name],
                     min, max;
-                
+
                 if (!axis.used)
                     return;
 
@@ -236,14 +236,14 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
                         min += delta;
                         max += delta;
                     }
-                    
+
                     if (pr[1] != null && pr[1] < max) {
                         delta = pr[1] - max;
                         min += delta;
                         max += delta;
                     }
                 }
-                
+
                 axisOptions.min = min;
                 axisOptions.max = max;
             }
@@ -252,17 +252,17 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
             panAxis(l, 'x2axis');
             panAxis(t, 'yaxis');
             panAxis(t, 'y2axis');
-            
+
             plot.setupGrid();
             plot.draw();
-            
+
             if (!args.preventEvent)
                 plot.getPlaceholder().trigger("plotpan", [ plot ]);
         }
-        
+
         plot.hooks.bindEvents.push(bindEvents);
     }
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js
index da81c92363..9abbeeb4db 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js
@@ -48,7 +48,7 @@ The plugin allso adds the following methods to the plot object:
   setSelection will trigger the "plotselected" event when called. If
   you don't want that to happen, e.g. if you're inside a
   "plotselected" handler, pass true as the second parameter.
-  
+
 - clearSelection(preventEvent)
 
   Clear the selection rectangle. Pass in true to avoid getting a
@@ -88,7 +88,7 @@ The plugin allso adds the following methods to the plot object:
         function onMouseDown(e) {
             if (e.which != 1)  // only accept left-click
                 return;
-            
+
             // cancel out any text selections
             document.body.focus();
 
@@ -105,7 +105,7 @@ The plugin allso adds the following methods to the plot object:
             setSelectionPos(selection.first, e);
 
             selection.active = true;
-            
+
             $(document).one("mouseup", onMouseUp);
         }
 
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js
index 4dbd29f198..0762aeb1e8 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js
@@ -15,7 +15,7 @@ specify the default stack, you can set
 or specify it for a specific series
 
   $.plot($("#placeholder"), [{ data: [ ... ], stack: true ])
-  
+
 The stacking order is determined by the order of the data series in
 the array (later series end up on top of the previous).
 
@@ -29,21 +29,21 @@ also adjusted.
     var options = {
         series: { stack: null } // or number/string
     };
-    
+
     function init(plot) {
         function findMatchingSeries(s, allseries) {
             var res = null
             for (var i = 0; i < allseries.length; ++i) {
                 if (s == allseries[i])
                     break;
-                
+
                 if (allseries[i].stack == s.stack)
                     res = allseries[i];
             }
-            
+
             return res;
         }
-        
+
         function stackData(plot, s, datapoints) {
             if (s.stack == null)
                 return;
@@ -51,7 +51,7 @@ also adjusted.
             var other = findMatchingSeries(s, plot.getData());
             if (!other)
                 return;
-            
+
             var ps = datapoints.pointsize,
                 points = datapoints.points,
                 otherps = other.datapoints.pointsize,
@@ -90,7 +90,7 @@ also adjusted.
 
                         newpoints[l + 1] += qy;
                         bottom = qy;
-                        
+
                         i += ps;
                         j += otherps;
                     }
@@ -103,7 +103,7 @@ also adjusted.
                             newpoints.push(intery + qy)
                             for (m = 2; m < ps; ++m)
                                 newpoints.push(points[i + m]);
-                            bottom = qy; 
+                            bottom = qy;
                         }
 
                         j += otherps;
@@ -111,17 +111,17 @@ also adjusted.
                     else {
                         for (m = 0; m < ps; ++m)
                             newpoints.push(points[i + m]);
-                        
+
                         // we might be able to interpolate a point below,
                         // this can give us a better y
                         if (withlines && j > 0 && otherpoints[j - ps] != null)
                             bottom = qy + (otherpoints[j - ps + 1] - qy) * (px - qx) / (otherpoints[j - ps] - qx);
 
                         newpoints[l + 1] += bottom;
-                        
+
                         i += ps;
                     }
-                    
+
                     if (l != newpoints.length && withbars)
                         newpoints[l + 2] += bottom;
                 }
@@ -136,13 +136,13 @@ also adjusted.
                     newpoints[l + 1] = newpoints[l - ps + 1];
                 }
             }
-            
+
             datapoints.points = newpoints;
         }
-        
+
         plot.hooks.processDatapoints.push(stackData);
     }
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js
index 0b2e7ac82a..28a08b085a 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js
@@ -27,12 +27,12 @@ events.
     var options = {
         series: { threshold: null } // or { below: number, color: color spec}
     };
-    
+
     function init(plot) {
         function thresholdData(plot, s, datapoints) {
             if (!s.threshold)
                 return;
-            
+
             var ps = datapoints.pointsize, i, x, y, p, prevp,
                 thresholded = $.extend({}, s); // note: shallow copy
 
@@ -67,7 +67,7 @@ events.
                     prevp.push(below);
                     for (m = 2; m < ps; ++m)
                         prevp.push(origpoints[i + m]);
-                    
+
                     p.push(null); // start new segment
                     p.push(null);
                     for (m = 2; m < ps; ++m)
@@ -84,16 +84,16 @@ events.
 
             datapoints.points = newpoints;
             thresholded.datapoints.points = threspoints;
-            
+
             if (thresholded.datapoints.points.length > 0)
                 plot.getData().push(thresholded);
-                
+
             // FIXME: there are probably some edge cases left in bars
         }
-        
+
         plot.hooks.processDatapoints.push(thresholdData);
     }
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
index c40d6f7014..2a97fd178e 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
@@ -935,11 +935,11 @@ if (!document.createElement('canvas').getContext) {
                          mr(p.xEnd), ',', mr(p.yEnd));
             break;
         }
-  
-  
+
+
         // TODO: Following is broken for curves due to
         //       move to proper paths.
-  
+
         // Figure out dimensions so we can do gradient fills
         // properly
         if (p) {
@@ -958,15 +958,15 @@ if (!document.createElement('canvas').getContext) {
         }
       }
       lineStr.push(' ">');
-  
+
       if (!aFill) {
         appendStroke(this, lineStr);
       } else {
         appendFill(this, lineStr, min, max);
       }
-  
+
       lineStr.push('</g_vml_:shape>');
-  
+
       this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
     }
   };
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js
index 52cbe82aa3..bf51135b64 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js
@@ -8,9 +8,9 @@
 // for convenience
 
 /* Plugin for jQuery for working with colors.
- * 
+ *
  * Version 1.0.
- * 
+ *
  * Inspiration from jQuery color animation plugin by John Resig.
  *
  * Released under the MIT license by Ole Laursen, October 2009.
@@ -24,7 +24,7 @@
  *
  * Note that .scale() and .add() work in-place instead of returning
  * new objects.
- */ 
+ */
 (function($){$.color={};$.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]+=H}return F.normalize()};F.scale=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]*=H}return F.normalize()};F.toString=function(){if(F.a>=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return J<I?I:(J>H?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return $.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};$.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!$.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return $.color.parse(D)};$.color.parse=function(E){var D,B=$.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=$.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
 
 // the actual Flot code
@@ -34,7 +34,7 @@
         //   [ series1, series2 ... ]
         // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
         // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
-        
+
         var series = [],
             options = {
                 // the color theme used for graphs
@@ -66,7 +66,7 @@
                     labelHeight: null,
                     tickLength: null, // size in pixels of ticks, or "full" for whole line
                     alignTicksWithAxis: null, // axis number or null for no sync
-                    
+
                     // mode specific options
                     tickDecimals: null, // no. of decimals, null means auto
                     tickSize: null, // number or [number, "unit"]
@@ -92,7 +92,7 @@
                     },
                     lines: {
                         // we don't put in show: false so we can see
-                        // whether lines were actively disabled 
+                        // whether lines were actively disabled
                         lineWidth: 2, // in pixels
                         fill: false,
                         fillColor: null,
@@ -104,7 +104,7 @@
                         barWidth: 1, // in units of the x axis
                         fill: true,
                         fillColor: null,
-                        align: "left", // or "center" 
+                        align: "left", // or "center"
                         horizontal: false
                     },
                     shadowSize: 3
@@ -183,7 +183,7 @@
                 res.x2axis = { n: 2 };
             if (!res.y2axis)
                 res.y2axis = { n: 2 };
-            
+
             return res;
         };
         plot.getXAxes = function () { return xaxes; };
@@ -204,7 +204,7 @@
 
         // public attributes
         plot.hooks = hooks;
-        
+
         // initialize
         initPlugins(plot);
         parseOptions(options_);
@@ -229,17 +229,17 @@
                     $.extend(true, options, p.options);
             }
         }
-        
+
         function parseOptions(opts) {
             var i;
-            
+
             $.extend(true, options, opts);
-            
+
             if (options.xaxis.color == null)
                 options.xaxis.color = options.grid.color;
             if (options.yaxis.color == null)
                 options.yaxis.color = options.grid.color;
-            
+
             if (options.xaxis.tickColor == null) // backwards-compatibility
                 options.xaxis.tickColor = options.grid.tickColor;
             if (options.yaxis.tickColor == null) // backwards-compatibility
@@ -249,7 +249,7 @@
                 options.grid.borderColor = options.grid.color;
             if (options.grid.tickColor == null)
                 options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString();
-            
+
             // fill in defaults in axes, copy at least always the
             // first as the rest of the code assumes it'll be there
             for (i = 0; i < Math.max(1, options.xaxes.length); ++i)
@@ -302,7 +302,7 @@
             fillInSeriesOptions();
             processData();
         }
-        
+
         function parseData(d) {
             var res = [];
             for (var i = 0; i < d.length; ++i) {
@@ -323,7 +323,7 @@
 
             return res;
         }
-        
+
         function axisNumber(obj, coord) {
             var a = obj[coord + "axis"];
             if (typeof a == "object") // if we got a real axis, extract number
@@ -334,7 +334,7 @@
         }
 
         function canvasToAxisCoords(pos) {
-            // return an object with x/y corresponding to all used axes 
+            // return an object with x/y corresponding to all used axes
             var res = {}, i, axis;
             for (i = 0; i < xaxes.length; ++i) {
                 axis = xaxes[i];
@@ -347,7 +347,7 @@
                 if (axis && axis.used)
                     res["y" + axis.n] = axis.c2p(pos.top);
             }
-            
+
             if (res.x1 !== undefined)
                 res.x = res.x1;
             if (res.y1 !== undefined)
@@ -355,7 +355,7 @@
 
             return res;
         }
-        
+
         function axisToCanvasCoords(pos) {
             // get canvas coords from the first pair of x/y found in pos
             var res = {}, i, axis, key;
@@ -373,7 +373,7 @@
                     }
                 }
             }
-            
+
             for (i = 0; i < yaxes.length; ++i) {
                 axis = yaxes[i];
                 if (axis && axis.used) {
@@ -387,10 +387,10 @@
                     }
                 }
             }
-            
+
             return res;
         }
-        
+
         function getUsedAxes() {
             var res = [], i, axis;
             for (i = 0; i < xaxes.length; ++i) {
@@ -413,13 +413,13 @@
                     direction: axes == xaxes ? "x" : "y",
                     options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis)
                 };
-                
+
             return axes[number - 1];
         }
 
         function fillInSeriesOptions() {
             var i;
-            
+
             // collect what we already got of colors
             var neededColors = series.length,
                 usedColors = [],
@@ -434,7 +434,7 @@
                         usedColors.push($.color.parse(series[i].color));
                 }
             }
-            
+
             // we might need to generate more colors if higher indices
             // are assigned
             for (i = 0; i < assignedColors.length; ++i) {
@@ -458,7 +458,7 @@
                 // FIXME: if we're getting to close to something else,
                 // we should probably skip this one
                 colors.push(c);
-                
+
                 ++i;
                 if (i >= options.colors.length) {
                     i = 0;
@@ -470,7 +470,7 @@
             var colori = 0, s;
             for (i = 0; i < series.length; ++i) {
                 s = series[i];
-                
+
                 // assign colors
                 if (s.color == null) {
                     s.color = colors[colori].toString();
@@ -496,7 +496,7 @@
                 s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y"));
             }
         }
-        
+
         function processData() {
             var topSentry = Number.POSITIVE_INFINITY,
                 bottomSentry = Number.NEGATIVE_INFINITY,
@@ -506,7 +506,7 @@
             function initAxis(axis, number) {
                 if (!axis)
                     return;
-                
+
                 axis.datamin = topSentry;
                 axis.datamax = bottomSentry;
                 axis.used = false;
@@ -523,14 +523,14 @@
                 initAxis(xaxes[i]);
             for (i = 0; i < yaxes.length; ++i)
                 initAxis(yaxes[i]);
-            
+
             for (i = 0; i < series.length; ++i) {
                 s = series[i];
                 s.datapoints = { points: [] };
-                
+
                 executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
             }
-            
+
             // first pass: clean and copy data
             for (i = 0; i < series.length; ++i) {
                 s = series[i];
@@ -550,7 +550,7 @@
                             format[format.length - 1].x = true;
                         }
                     }
-                    
+
                     s.datapoints.format = format;
                 }
 
@@ -558,13 +558,13 @@
                     continue; // already filled in
 
                 s.datapoints.pointsize = format.length;
-                
+
                 ps = s.datapoints.pointsize;
                 points = s.datapoints.points;
 
                 insertSteps = s.lines.show && s.lines.steps;
                 s.xaxis.used = s.yaxis.used = true;
-                
+
                 for (j = k = 0; j < data.length; ++j, k += ps) {
                     p = data[j];
 
@@ -584,16 +584,16 @@
                                 if (val == null) {
                                     if (f.required)
                                         nullify = true;
-                                    
+
                                     if (f.defaultValue != null)
                                         val = f.defaultValue;
                                 }
                             }
-                            
+
                             points[k + m] = val;
                         }
                     }
-                    
+
                     if (nullify) {
                         for (m = 0; m < ps; ++m) {
                             val = points[k + m];
@@ -633,7 +633,7 @@
             // give the hooks a chance to run
             for (i = 0; i < series.length; ++i) {
                 s = series[i];
-                
+
                 executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
             }
 
@@ -645,7 +645,7 @@
 
                 var xmin = topSentry, ymin = topSentry,
                     xmax = bottomSentry, ymax = bottomSentry;
-                
+
                 for (j = 0; j < points.length; j += ps) {
                     if (points[j] == null)
                         continue;
@@ -655,7 +655,7 @@
                         f = format[m];
                         if (!f)
                             continue;
-                        
+
                         if (f.x) {
                             if (val < xmin)
                                 xmin = val;
@@ -670,7 +670,7 @@
                         }
                     }
                 }
-                
+
                 if (s.bars.show) {
                     // make sure we got room for the bar on the dancing floor
                     var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2;
@@ -683,7 +683,7 @@
                         xmax += delta + s.bars.barWidth;
                     }
                 }
-                
+
                 updateAxis(s.xaxis, xmin, xmax);
                 updateAxis(s.yaxis, ymin, ymax);
             }
@@ -706,9 +706,9 @@
                 placeholder.find("canvas").each(function () {
                     this.context_ = null;
                 });
-            
+
             placeholder.html(""); // clear placeholder
-            
+
             if (placeholder.css("position") == 'static')
                 placeholder.css("position", "relative"); // for positioning labels and overlay
 
@@ -719,18 +719,18 @@
                 var c = document.createElement('canvas');
                 c.width = canvasWidth;
                 c.height = canvasHeight;
-                
+
                 if (!skipPositioning)
                     $(c).css({ position: 'absolute', left: 0, top: 0 });
-                
+
                 $(c).appendTo(placeholder);
-                
+
                 if (!c.getContext) // excanvas hack
                     c = window.G_vmlCanvasManager.initElement(c);
 
                 return c;
             }
-            
+
             // the canvas
             canvas = makeCanvas(true);
             ctx = canvas.getContext("2d");
@@ -760,12 +760,12 @@
         function setTransformationHelpers(axis) {
             // set helper functions on the axis, assumes plot area
             // has been computed already
-            
+
             function identity(x) { return x; }
-            
+
             var s, m, t = axis.options.transform || identity,
                 it = axis.options.inverseTransform;
-            
+
             if (axis.direction == "x") {
                 // precompute how much the axis is scaling a point
                 // in canvas space
@@ -786,7 +786,7 @@
             else {
                 s = axis.scale = plotHeight / (t(axis.max) - t(axis.min));
                 m = t(axis.max);
-                
+
                 if (t == identity)
                     axis.p2c = function (p) { return (m - p) * s; };
                 else
@@ -801,7 +801,7 @@
         function measureTickLabels(axis) {
             if (!axis)
                 return;
-            
+
             var opts = axis.options, i, ticks = axis.ticks || [], labels = [],
                 l, w = opts.labelWidth, h = opts.labelHeight, dummyDiv;
 
@@ -811,7 +811,7 @@
                          + labels.join("") + '</div></div>')
                     .appendTo(placeholder);
             }
-            
+
             if (axis.direction == "x") {
                 // to avoid measuring the widths of the labels (it's slow), we
                 // construct fixed-size boxes and put the labels inside
@@ -846,7 +846,7 @@
                     if (l)
                         labels.push('<div class="tickLabel">' + l + '</div>');
                 }
-                
+
                 if (labels.length > 0) {
                     dummyDiv = makeDummyDiv(labels, "");
                     if (w == null)
@@ -901,14 +901,14 @@
             var innermost = $.inArray(axis, sameDirection) == 0;
             if (!innermost && tickLength == "full")
                 tickLength = 5;
-                
+
             if (!isNaN(+tickLength))
                 padding += +tickLength;
 
             // compute box
             if (axis.direction == "x") {
                 lh += padding;
-                
+
                 if (pos == "bottom") {
                     plotOffset.bottom += lh + axismargin;
                     axis.box = { top: canvasHeight - plotOffset.bottom, height: lh };
@@ -920,7 +920,7 @@
             }
             else {
                 lw += padding;
-                
+
                 if (pos == "left") {
                     axis.box = { left: plotOffset.left + axismargin, width: lw };
                     plotOffset.left += lw + axismargin;
@@ -941,7 +941,7 @@
         function fixupAxisBox(axis) {
             if (!axis || !axis.labelWidth || !axis.labelHeight)
                 return;
-            
+
             // set remaining bounding box coordinates
             if (axis.direction == "x") {
                 axis.box.left = plotOffset.left;
@@ -952,7 +952,7 @@
                 axis.box.height = plotHeight;
             }
         }
-        
+
         function setupGrid() {
             var axes = getUsedAxes(), j, k;
 
@@ -960,7 +960,7 @@
             for (k = 0; k < axes.length; ++k)
                 setRange(axes[k]);
 
-            
+
             plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0;
             if (options.grid.show) {
                 // make the ticks
@@ -977,7 +977,7 @@
                     measureTickLabels(xaxes[j]);
                 for (j = 0; j < yaxes.length; ++j)
                     measureTickLabels(yaxes[j]);
-                    
+
                 // compute the axis boxes, start from the outside (reverse order)
                 for (j = xaxes.length - 1; j >= 0; --j)
                     computeAxisBox(xaxes[j]);
@@ -995,7 +995,7 @@
                     plotOffset[a] = Math.max(maxOutset, plotOffset[a]);
                 }
             }
-            
+
             plotWidth = canvasWidth - plotOffset.left - plotOffset.right;
             plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top;
 
@@ -1006,13 +1006,13 @@
             if (options.grid.show) {
                 for (k = 0; k < axes.length; ++k)
                     fixupAxisBox(axes[k]);
-                
+
                 insertAxisLabels();
             }
-            
+
             insertLegend();
         }
-        
+
         function setRange(axis) {
             var opts = axis.options,
                 min = +(opts.min != null ? opts.min : axis.datamin),
@@ -1054,7 +1054,7 @@
 
         function setupTickGeneration(axis) {
             var opts = axis.options;
-                
+
             // estimate number of ticks
             var noTicks;
             if (typeof opts.ticks == "number" && opts.ticks > 0)
@@ -1071,7 +1071,7 @@
 
             if (opts.mode == "time") {
                 // pretty handling of time
-                
+
                 // map of app. size of time units in milliseconds
                 var timeUnitSize = {
                     "second": 1000,
@@ -1087,9 +1087,9 @@
                 // an integer algorithm
                 var spec = [
                     [1, "second"], [2, "second"], [5, "second"], [10, "second"],
-                    [30, "second"], 
+                    [30, "second"],
                     [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
-                    [30, "minute"], 
+                    [30, "minute"],
                     [1, "hour"], [2, "hour"], [4, "hour"],
                     [8, "hour"], [12, "hour"],
                     [1, "day"], [2, "day"], [3, "day"],
@@ -1113,7 +1113,7 @@
                         break;
                 size = spec[i][0];
                 unit = spec[i][1];
-                
+
                 // special-case the possibility of several years
                 if (unit == "year") {
                     magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10));
@@ -1131,12 +1131,12 @@
                 }
 
                 axis.tickSize = opts.tickSize || [size, unit];
-                
+
                 generator = function(axis) {
                     var ticks = [],
                         tickSize = axis.tickSize[0], unit = axis.tickSize[1],
                         d = new Date(axis.min);
-                    
+
                     var step = tickSize * timeUnitSize[unit];
 
                     if (unit == "second")
@@ -1149,7 +1149,7 @@
                         d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize));
                     if (unit == "year")
                         d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize));
-                    
+
                     // reset smaller components
                     d.setUTCMilliseconds(0);
                     if (step >= timeUnitSize.minute)
@@ -1201,11 +1201,11 @@
                     // first check global format
                     if (opts.timeformat != null)
                         return $.plot.formatDate(d, opts.timeformat, opts.monthNames);
-                    
+
                     var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
                     var span = axis.max - axis.min;
                     var suffix = (opts.twelveHourClock) ? " %p" : "";
-                    
+
                     if (t < timeUnitSize.minute)
                         fmt = "%h:%M:%S" + suffix;
                     else if (t < timeUnitSize.day) {
@@ -1224,7 +1224,7 @@
                     }
                     else
                         fmt = "%y";
-                    
+
                     return $.plot.formatDate(d, fmt, opts.monthNames);
                 };
             }
@@ -1237,7 +1237,7 @@
 
                 magn = Math.pow(10, -dec);
                 norm = delta / magn; // norm is between 1.0 and 10.0
-                
+
                 if (norm < 1.5)
                     size = 1;
                 else if (norm < 3) {
@@ -1254,7 +1254,7 @@
                     size = 10;
 
                 size *= magn;
-                
+
                 if (opts.minTickSize != null && size < opts.minTickSize)
                     size = opts.minTickSize;
 
@@ -1292,7 +1292,7 @@
                         if (opts.max == null && niceTicks.length > 1)
                             axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]);
                     }
-                    
+
                     generator = function (axis) {
                         // copy ticks, scaled to this axis
                         var ticks = [], v, i;
@@ -1303,7 +1303,7 @@
                         }
                         return ticks;
                     };
-                    
+
                     // we might need an extra decimal since forced
                     // ticks don't necessarily fit naturally
                     if (axis.mode != "time" && opts.tickDecimals == null) {
@@ -1325,7 +1325,7 @@
             else
                 axis.tickFormatter = formatter;
         }
-        
+
         function setTicks(axis) {
             axis.ticks = [];
 
@@ -1367,7 +1367,7 @@
                     axis.max = Math.max(axis.max, ticks[ticks.length - 1].v);
             }
         }
-      
+
         function draw() {
             ctx.clearRect(0, 0, canvasWidth, canvasHeight);
 
@@ -1376,7 +1376,7 @@
             // draw background, if any
             if (grid.show && grid.backgroundColor)
                 drawBackground();
-            
+
             if (grid.show && !grid.aboveData)
                 drawGrid();
 
@@ -1386,7 +1386,7 @@
             }
 
             executeHooks(hooks.draw, [ctx]);
-            
+
             if (grid.show && grid.aboveData)
                 drawGrid();
         }
@@ -1422,10 +1422,10 @@
                 from = to;
                 to = tmp;
             }
-            
+
             return { from: from, to: to, axis: axis };
         }
-        
+
         function drawBackground() {
             ctx.save();
             ctx.translate(plotOffset.left, plotOffset.top);
@@ -1437,7 +1437,7 @@
 
         function drawGrid() {
             var i;
-            
+
             ctx.save();
             ctx.translate(plotOffset.left, plotOffset.top);
 
@@ -1452,7 +1452,7 @@
                     axes.xmax = axes.xaxis.max;
                     axes.ymin = axes.yaxis.min;
                     axes.ymax = axes.yaxis.max;
-                    
+
                     markings = markings(axes);
                 }
 
@@ -1489,7 +1489,7 @@
                     xrange.to = xrange.axis.p2c(xrange.to);
                     yrange.from = yrange.axis.p2c(yrange.from);
                     yrange.to = yrange.axis.p2c(yrange.to);
-                    
+
                     if (xrange.from == xrange.to || yrange.from == yrange.to) {
                         // draw line
                         ctx.beginPath();
@@ -1508,7 +1508,7 @@
                     }
                 }
             }
-            
+
             // draw the ticks
             var axes = getUsedAxes(), bw = options.grid.borderWidth;
 
@@ -1518,7 +1518,7 @@
 
                 if (axis.ticks.length == 0)
                     continue;
-                
+
                 ctx.strokeStyle = axis.options.tickColor || $.color.parse(axis.options.color).scale('a', 0.22).toString();
                 ctx.lineWidth = 1;
 
@@ -1537,7 +1537,7 @@
                     else
                         x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0);
                 }
-                
+
                 // draw tick bar
                 if (!axis.innermost) {
                     ctx.beginPath();
@@ -1546,7 +1546,7 @@
                         xoff = plotWidth;
                     else
                         yoff = plotHeight;
-                    
+
                     if (ctx.lineWidth == 1) {
                         x = Math.floor(x) + 0.5;
                         y = Math.floor(y) + 0.5;
@@ -1561,7 +1561,7 @@
                 ctx.beginPath();
                 for (i = 0; i < axis.ticks.length; ++i) {
                     var v = axis.ticks[i].v;
-                    
+
                     xoff = yoff = 0;
 
                     if (v < axis.min || v > axis.max
@@ -1573,14 +1573,14 @@
                     if (axis.direction == "x") {
                         x = axis.p2c(v);
                         yoff = t == "full" ? -plotHeight : t;
-                        
+
                         if (axis.position == "top")
                             yoff = -yoff;
                     }
                     else {
                         y = axis.p2c(v);
                         xoff = t == "full" ? -plotWidth : t;
-                        
+
                         if (axis.position == "left")
                             xoff = -xoff;
                     }
@@ -1595,11 +1595,11 @@
                     ctx.moveTo(x, y);
                     ctx.lineTo(x + xoff, y + yoff);
                 }
-                
+
                 ctx.stroke();
             }
-            
-            
+
+
             // draw border
             if (bw) {
                 ctx.lineWidth = bw;
@@ -1612,7 +1612,7 @@
 
         function insertAxisLabels() {
             placeholder.find(".tickLabels").remove();
-            
+
             var html = ['<div class="tickLabels" style="font-size:smaller">'];
 
             var axes = getUsedAxes();
@@ -1626,7 +1626,7 @@
                         continue;
 
                     var pos = {}, align;
-                    
+
                     if (axis.direction == "x") {
                         align = "center";
                         pos.left = Math.round(plotOffset.left + axis.p2c(tick.v) - axis.labelWidth/2);
@@ -1652,7 +1652,7 @@
                     var style = ["position:absolute", "text-align:" + align ];
                     for (var a in pos)
                         style.push(a + ":" + pos[a] + "px")
-                    
+
                     html.push('<div class="tickLabel" style="' + style.join(';') + '">' + tick.label + '</div>');
                 }
                 html.push('</div>');
@@ -1671,18 +1671,18 @@
             if (series.points.show)
                 drawSeriesPoints(series);
         }
-        
+
         function drawSeriesLines(series) {
             function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
                 var points = datapoints.points,
                     ps = datapoints.pointsize,
                     prevx = null, prevy = null;
-                
+
                 ctx.beginPath();
                 for (var i = ps; i < points.length; i += ps) {
                     var x1 = points[i - ps], y1 = points[i - ps + 1],
                         x2 = points[i], y2 = points[i + 1];
-                    
+
                     if (x1 == null || x2 == null)
                         continue;
 
@@ -1745,7 +1745,7 @@
 
                     if (x1 != prevx || y1 != prevy)
                         ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
-                    
+
                     prevx = x2;
                     prevy = y2;
                     ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
@@ -1797,7 +1797,7 @@
                         continue;
 
                     // clip x values
-                    
+
                     // clip with xmin
                     if (x1 <= x2 && x1 < axisx.min) {
                         if (x2 < axisx.min)
@@ -1832,7 +1832,7 @@
                         ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
                         areaOpen = true;
                     }
-                    
+
                     // now first check the case where both is outside
                     if (y1 >= axisy.max && y2 >= axisy.max) {
                         ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
@@ -1844,7 +1844,7 @@
                         ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
                         continue;
                     }
-                    
+
                     // else it's a bit more complicated, there might
                     // be a flat maxed out rectangle first, then a
                     // triangular cutout or reverse; to find these
@@ -1853,7 +1853,7 @@
 
                     // clip the y values, without shortcutting, we
                     // go through all cases in turn
-                    
+
                     // clip with ymin
                     if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
                         x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
@@ -1880,7 +1880,7 @@
                         ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1));
                         // it goes to (x1, y1), but we fill that below
                     }
-                    
+
                     // fill triangular section, this sometimes result
                     // in redundant points if (x1, y1) hasn't changed
                     // from previous line to, but we just ignore that
@@ -1934,7 +1934,7 @@
                     var x = points[i], y = points[i + 1];
                     if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
                         continue;
-                    
+
                     ctx.beginPath();
                     x = axisx.p2c(x);
                     y = axisy.p2c(y) + offset;
@@ -1943,7 +1943,7 @@
                     else
                         symbol(ctx, x, y, radius, shadow);
                     ctx.closePath();
-                    
+
                     if (fillStyle) {
                         ctx.fillStyle = fillStyle;
                         ctx.fill();
@@ -1951,7 +1951,7 @@
                     ctx.stroke();
                 }
             }
-            
+
             ctx.save();
             ctx.translate(plotOffset.left, plotOffset.top);
 
@@ -2022,12 +2022,12 @@
                     drawTop = false;
                 }
             }
-           
+
             // clip
             if (right < axisx.min || left > axisx.max ||
                 top < axisy.min || bottom > axisy.max)
                 return;
-            
+
             if (left < axisx.min) {
                 left = axisx.min;
                 drawLeft = false;
@@ -2042,7 +2042,7 @@
                 bottom = axisy.min;
                 drawBottom = false;
             }
-            
+
             if (top > axisy.max) {
                 top = axisy.max;
                 drawTop = false;
@@ -2052,7 +2052,7 @@
             bottom = axisy.p2c(bottom);
             right = axisx.p2c(right);
             top = axisy.p2c(top);
-            
+
             // fill the bar
             if (fillStyleCallback) {
                 c.beginPath();
@@ -2089,11 +2089,11 @@
                 c.stroke();
             }
         }
-        
+
         function drawSeriesBars(series) {
             function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) {
                 var points = datapoints.points, ps = datapoints.pointsize;
-                
+
                 for (var i = 0; i < points.length; i += ps) {
                     if (points[i] == null)
                         continue;
@@ -2120,19 +2120,19 @@
 
             if (filloptions.fillColor)
                 return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor);
-            
+
             var c = $.color.parse(seriesColor);
             c.a = typeof fill == "number" ? fill : 0.4;
             c.normalize();
             return c.toString();
         }
-        
+
         function insertLegend() {
             placeholder.find(".legend").remove();
 
             if (!options.legend.show)
                 return;
-            
+
             var fragments = [], rowStarted = false,
                 lf = options.legend.labelFormatter, s, label;
             for (var i = 0; i < series.length; ++i) {
@@ -2140,7 +2140,7 @@
                 label = s.label;
                 if (!label)
                     continue;
-                
+
                 if (i % options.legend.noColumns == 0) {
                     if (rowStarted)
                         fragments.push('</tr>');
@@ -2150,14 +2150,14 @@
 
                 if (lf)
                     label = lf(label, s);
-                
+
                 fragments.push(
                     '<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + s.color + ';overflow:hidden"></div></div></td>' +
                     '<td class="legendLabel">' + label + '</td>');
             }
             if (rowStarted)
                 fragments.push('</tr>');
-            
+
             if (fragments.length == 0)
                 return;
 
@@ -2201,10 +2201,10 @@
 
 
         // interactive features
-        
+
         var highlights = [],
             redrawTimeout = null;
-        
+
         // returns the data item the mouse is over, or null if none is found
         function findNearbyItem(mouseX, mouseY, seriesFilter) {
             var maxDistance = options.grid.mouseActiveRadius,
@@ -2214,7 +2214,7 @@
             for (i = series.length - 1; i >= 0; --i) {
                 if (!seriesFilter(series[i]))
                     continue;
-                
+
                 var s = series[i],
                     axisx = s.xaxis,
                     axisy = s.yaxis,
@@ -2230,7 +2230,7 @@
                         var x = points[j], y = points[j + 1];
                         if (x == null)
                             continue;
-                        
+
                         // For points and lines, the cursor must be within a
                         // certain distance to the data point
                         if (x - mx > maxx || x - mx < -maxx ||
@@ -2251,19 +2251,19 @@
                         }
                     }
                 }
-                    
+
                 if (s.bars.show && !item) { // no other point can be nearby
                     var barLeft = s.bars.align == "left" ? 0 : -s.bars.barWidth/2,
                         barRight = barLeft + s.bars.barWidth;
-                    
+
                     for (j = 0; j < points.length; j += ps) {
                         var x = points[j], y = points[j + 1], b = points[j + 2];
                         if (x == null)
                             continue;
-  
+
                         // for a bar graph, the cursor must be inside the bar
-                        if (series[i].bars.horizontal ? 
-                            (mx <= Math.max(b, x) && mx >= Math.min(b, x) && 
+                        if (series[i].bars.horizontal ?
+                            (mx <= Math.max(b, x) && mx >= Math.min(b, x) &&
                              my >= y + barLeft && my <= y + barRight) :
                             (mx >= x + barLeft && mx <= x + barRight &&
                              my >= Math.min(b, y) && my <= Math.max(b, y)))
@@ -2276,13 +2276,13 @@
                 i = item[0];
                 j = item[1];
                 ps = series[i].datapoints.pointsize;
-                
+
                 return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
                          dataIndex: j,
                          series: series[i],
                          seriesIndex: i };
             }
-            
+
             return null;
         }
 
@@ -2332,11 +2332,11 @@
                           h.point[1] == item.datapoint[1]))
                         unhighlight(h.series, h.point);
                 }
-                
+
                 if (item)
                     highlight(item.series, item.datapoint, eventname);
             }
-            
+
             placeholder.trigger(eventname, [ pos, item ]);
         }
 
@@ -2352,7 +2352,7 @@
             octx.save();
             octx.clearRect(0, 0, canvasWidth, canvasHeight);
             octx.translate(plotOffset.left, plotOffset.top);
-            
+
             var i, hi;
             for (i = 0; i < highlights.length; ++i) {
                 hi = highlights[i];
@@ -2363,10 +2363,10 @@
                     drawPointHighlight(hi.series, hi.point);
             }
             octx.restore();
-            
+
             executeHooks(hooks.drawOverlay, [octx]);
         }
-        
+
         function highlight(s, point, auto) {
             if (typeof s == "number")
                 s = series[s];
@@ -2385,13 +2385,13 @@
             else if (!auto)
                 highlights[i].auto = false;
         }
-            
+
         function unhighlight(s, point) {
             if (s == null && point == null) {
                 highlights = [];
                 triggerRedrawOverlay();
             }
-            
+
             if (typeof s == "number")
                 s = series[s];
 
@@ -2405,7 +2405,7 @@
                 triggerRedrawOverlay();
             }
         }
-        
+
         function indexOfHighlight(s, p) {
             for (var i = 0; i < highlights.length; ++i) {
                 var h = highlights[i];
@@ -2415,21 +2415,21 @@
             }
             return -1;
         }
-        
+
         function drawPointHighlight(series, point) {
             var x = point[0], y = point[1],
                 axisx = series.xaxis, axisy = series.yaxis;
-            
+
             if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
                 return;
-            
+
             var pointRadius = series.points.radius + series.points.lineWidth / 2;
             octx.lineWidth = pointRadius;
             octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString();
             var radius = 1.5 * pointRadius,
                 x = axisx.p2c(x),
                 y = axisy.p2c(y);
-            
+
             octx.beginPath();
             if (series.points.symbol == "circle")
                 octx.arc(x, y, radius, 0, 2 * Math.PI, false);
@@ -2456,7 +2456,7 @@
                 // supports a simple vertical gradient properly, so that's
                 // what we support too
                 var gradient = ctx.createLinearGradient(0, top, 0, bottom);
-                
+
                 for (var i = 0, l = spec.colors.length; i < l; ++i) {
                     var c = spec.colors[i];
                     if (typeof c != "string") {
@@ -2469,7 +2469,7 @@
                     }
                     gradient.addColorStop(i / (l - 1), c);
                 }
-                
+
                 return gradient;
             }
         }
@@ -2490,7 +2490,7 @@
             n = "" + n;
             return n.length == 1 ? "0" + n : n;
         };
-        
+
         var r = [];
         var escape = false, padNext = false;
         var hours = d.getUTCHours();
@@ -2507,7 +2507,7 @@
         }
         for (var i = 0; i < fmt.length; ++i) {
             var c = fmt.charAt(i);
-            
+
             if (escape) {
                 switch (c) {
                 case 'h': c = "" + hours; break;
@@ -2539,10 +2539,10 @@
         }
         return r.join("");
     };
-    
+
     // round to nearby lower multiple of base
     function floorInBase(n, base) {
         return base * Math.floor(n / base);
     }
-    
+
 })(jQuery);
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css
index 3aeecc78ef..d5e632198d 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css
@@ -79,8 +79,8 @@ div.center div.jGrowl-notification, div.center div.jGrowl-closer {
 div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer {
 	background-color: 		#000;
 	opacity: 				.85;
-    -ms-filter: 			"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)"; 
-    filter: 				progid:DXImageTransform.Microsoft.Alpha(Opacity=85); 
+    -ms-filter: 			"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";
+    filter: 				progid:DXImageTransform.Microsoft.Alpha(Opacity=85);
 	zoom: 					1;
 	width: 					235px;
 	padding: 				10px;
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js
index b901df8de0..003aab4751 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js
@@ -7,7 +7,7 @@
  * Written by Stan Lemon <stosh1985@gmail.com>
  * Last updated: 2009.12.13
  *
- * jGrowl is a jQuery plugin implementing unobtrusive userland notifications.  These 
+ * jGrowl is a jQuery plugin implementing unobtrusive userland notifications.  These
  * notifications function similarly to the Growl Framework available for
  * Mac OS X (http://growl.info).
  *
@@ -97,7 +97,7 @@
 	/** jGrowl Wrapper - Establish a base jGrowl Container for compatibility with older releases. **/
 	$.jGrowl = function( m , o ) {
 		// To maintain compatibility with older version that only supported one instance we'll create the base container.
-		if ( $('#jGrowl').size() == 0 ) 
+		if ( $('#jGrowl').size() == 0 )
 			$('<div id="jGrowl"></div>').addClass($.jGrowl.defaults.position).appendTo('body');
 
 		// Create a notification on the container.
@@ -160,31 +160,31 @@
 				opacity: 	'hide'
 			}
 		},
-		
+
 		notifications: [],
-		
+
 		/** jGrowl Container Node **/
 		element: 	null,
-	
+
 		/** Interval Function **/
 		interval:   null,
-		
+
 		/** Create a Notification **/
 		create: 	function( message , o ) {
 			var o = $.extend({}, this.defaults, o);
 
 			this.notifications.push({ message: message , options: o });
-			
+
 			o.log.apply( this.element , [this.element,message,o] );
 		},
-		
+
 		render: 		function( notification ) {
 			var self = this;
 			var message = notification.message;
 			var o = notification.options;
 
 			var notification = $(
-				'<div class="jGrowl-notification ui-state-highlight ui-corner-all' + 
+				'<div class="jGrowl-notification ui-state-highlight ui-corner-all' +
 				((o.group != undefined && o.group != '') ? ' ' + o.group : '') + '">' +
 				'<div class="close">' + o.closeTemplate + '</div>' +
 				'<div class="header">' + o.header + '</div>' +
@@ -210,7 +210,7 @@
 					} else {
 						$('div.jGrowl-notification:first', self.element).before(notification);
 					}
-					
+
 					$(this).animate(o.animateOpen, o.speed, o.easing, function() {
 						// Fixes some anti-aliasing issues with IE filters.
 						if ($.browser.msie && (parseInt($(this).css('opacity'), 10) === 1 || parseInt($(this).css('opacity'), 10) === 0))
@@ -233,12 +233,12 @@
 						close.apply( notification , [notification,message,o,self.element] );
 				});
 			}).trigger('jGrowl.beforeOpen');
-		
+
 			/** Optional Corners Plugin **/
 			if ( $.fn.corner != undefined ) $(notification).corner( o.corners );
 
 			/** Add a Global Closer if more than one notification exists **/
-			if ( $('div.jGrowl-notification:parent', self.element).size() > 1 && 
+			if ( $('div.jGrowl-notification:parent', self.element).size() > 1 &&
 				 $('div.jGrowl-closer', self.element).size() == 0 && this.defaults.closer != false ) {
 				$(this.defaults.closerTemplate).addClass('jGrowl-closer ui-state-highlight ui-corner-all').addClass(this.defaults.theme)
 					.appendTo(self.element).animate(this.defaults.animateOpen, this.defaults.speed, this.defaults.easing)
@@ -255,9 +255,9 @@
 		/** Update the jGrowl Container, removing old jGrowl notifications **/
 		update:	 function() {
 			$(this.element).find('div.jGrowl-notification:parent').each( function() {
-				if ( $(this).data("jGrowl") != undefined && $(this).data("jGrowl").created != undefined && 
-					 ($(this).data("jGrowl").created.getTime() + $(this).data("jGrowl").life)  < (new Date()).getTime() && 
-					 $(this).data("jGrowl").sticky != true && 
+				if ( $(this).data("jGrowl") != undefined && $(this).data("jGrowl").created != undefined &&
+					 ($(this).data("jGrowl").created.getTime() + $(this).data("jGrowl").life)  < (new Date()).getTime() &&
+					 $(this).data("jGrowl").sticky != true &&
 					 ($(this).data("jGrowl.pause") == undefined || $(this).data("jGrowl.pause") != true) ) {
 
 					// Pause the notification, lest during the course of animation another close event gets called.
@@ -265,7 +265,7 @@
 				}
 			});
 
-			if ( this.notifications.length > 0 && 
+			if ( this.notifications.length > 0 &&
 				 (this.defaults.pool == 0 || $(this.element).find('div.jGrowl-notification:parent').size() < this.defaults.pool) )
 				this.render( this.notifications.shift() );
 
@@ -279,10 +279,10 @@
 		/** Setup the jGrowl Notification Container **/
 		startup:	function(e) {
 			this.element = $(e).addClass('jGrowl').append('<div class="jGrowl-notification"></div>');
-			this.interval = setInterval( function() { 
-				$(e).data('jGrowl.instance').update(); 
+			this.interval = setInterval( function() {
+				$(e).data('jGrowl.instance').update();
 			}, this.defaults.check);
-			
+
 			if ($.browser.msie && parseInt($.browser.version) < 7 && !window["XMLHttpRequest"]) {
 				$(this.element).addClass('ie6');
 			}
@@ -293,14 +293,14 @@
 			$(this.element).removeClass('jGrowl').find('div.jGrowl-notification').remove();
 			clearInterval( this.interval );
 		},
-		
+
 		close: 	function() {
 			$(this.element).find('div.jGrowl-notification').each(function(){
 				$(this).trigger('jGrowl.beforeClose');
 			});
 		}
 	});
-	
+
 	/** Reference the Defaults Object for compatibility with older versions of jGrowl **/
 	$.jGrowl.defaults = $.fn.jGrowl.prototype.defaults;
 
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery-jangle.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery-jangle.js
index be8db91a4d..bf65d14c22 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery-jangle.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery-jangle.js
@@ -145,4 +145,4 @@
         // don't be the weakest link (preserve chainability)
         return this;
     };
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js
index 729f65acb1..2e8880e380 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js
@@ -1,98 +1,98 @@
-/// <reference path="jquery-1.3.2-vsdoc.js"/>
-/*
-	by Homam Hosseini
-	http://abstractform.wordpress.com
-	bluesnowball@gmail.com
-
-*/
-
-
-jQuery.fn.autoEllipsis = function(options) {
-    var get_AutoEllipsisScroller = function(id) {
-        var aeScrollerId = "WingooliAutoEllipsisScroller_" + id
-        if (!document.getElementById(aeScrollerId)) {
-            var div = document.createElement("div");
-            div.id = aeScrollerId + "_Container";
-            div.innerHTML = "<span id=\"" + aeScrollerId + "\" style=\"overflow: visible; position: absolute; top: -2000px; color: orange\"></span>";
-            document.body.appendChild(div);
-        }
-        return document.getElementById(aeScrollerId);
-    };
-
-    var StringEllipsesByMaxLetters = function(element, originalText, maxLettersAllowed) {
-        element.title = "";
-        var text = originalText;
-        if (text == null || text == "") text = element.innerHTML;
-        var maxAllowedLatterIndex = text.length - maxLettersAllowed;
-        if (maxAllowedLatterIndex > 0) {
-            element.title = text;
-            if (originalText == null)
-                originalText = text;
-            element.innerHTML = text.substr(0, maxLettersAllowed - 2) + "&hellip;";
-        } else {
-            element.innerHTML = text;
-        }
-    };
-
-    var _this = this;
-
-    var settings = jQuery.extend({}, options);
-    this.each(function(i) {
-        var aeScroller = get_AutoEllipsisScroller(i);
-        saeScroller = $(aeScroller);
-        sthis = $(this);
-        saeScroller.text(sthis.text());
-
-        var origText = sthis.html();
-
-        var element = this;
-        var elementBounds = { width: element.offsetWidth, height: element.offsetHeight };
-
-        var jAeScroller = $(aeScroller);
-        var jElement = $(element);
-
-        var props = ["font-size", "font-weight", "font-family", "font-style", "padding"];
-
-        for (var i = 0; i < props.length; i++) {
-            try {
-                jAeScroller.css(props[i], jElement.css(props[i]));
-            } catch (ex) { }
-        }
-        jElement.css("overflow", "visible");
-
-
-        jAeScroller.width(jElement.width());
-
-        var isIe = (document.all != undefined);
-        var scrollerWidth = jAeScroller.width();
-        var scrollerHeight = jAeScroller.height();
-        var fitText = saeScroller.text();
-
-        while (scrollerHeight > elementBounds.height && fitText != "") {
-            fitText = fitText.substr(0, fitText.length - 2);
-            var autoScrollerInnerHTML = fitText + "&hellip;";
-            saeScroller.html(autoScrollerInnerHTML);
-            scrollerHeight = jAeScroller.height();
-        }
-        if (fitText == "") {
-            fitText = origText;
-            saeScroller.html(fitText);
-            jElement.css("whiteSpace", "nowrap");
-            jAeScroller.width("");
-            var scrollerWidth = jAeScroller.width();
-        }
-
-        while (scrollerWidth > elementBounds.width && fitText != "") {
-            fitText = fitText.substr(0, fitText.length - 2);
-            var autoScrollerInnerHTML = fitText + "&hellip;";
-            saeScroller.html(autoScrollerInnerHTML);
-            scrollerWidth = jAeScroller.width();
-        }
-        var scrollerHeight = aeScroller.offsetHeight;
-        var r = (Math.ceil(elementBounds.height / scrollerHeight) - 1);
-        r += (r == 0) ? 1 : 0;
-        var maxLettersAllowed = fitText.length * r;
-
-        StringEllipsesByMaxLetters(element, origText, maxLettersAllowed + (r + 1));
-    });
+/// <reference path="jquery-1.3.2-vsdoc.js"/>
+/*
+	by Homam Hosseini
+	http://abstractform.wordpress.com
+	bluesnowball@gmail.com
+
+*/
+
+
+jQuery.fn.autoEllipsis = function(options) {
+    var get_AutoEllipsisScroller = function(id) {
+        var aeScrollerId = "WingooliAutoEllipsisScroller_" + id
+        if (!document.getElementById(aeScrollerId)) {
+            var div = document.createElement("div");
+            div.id = aeScrollerId + "_Container";
+            div.innerHTML = "<span id=\"" + aeScrollerId + "\" style=\"overflow: visible; position: absolute; top: -2000px; color: orange\"></span>";
+            document.body.appendChild(div);
+        }
+        return document.getElementById(aeScrollerId);
+    };
+
+    var StringEllipsesByMaxLetters = function(element, originalText, maxLettersAllowed) {
+        element.title = "";
+        var text = originalText;
+        if (text == null || text == "") text = element.innerHTML;
+        var maxAllowedLatterIndex = text.length - maxLettersAllowed;
+        if (maxAllowedLatterIndex > 0) {
+            element.title = text;
+            if (originalText == null)
+                originalText = text;
+            element.innerHTML = text.substr(0, maxLettersAllowed - 2) + "&hellip;";
+        } else {
+            element.innerHTML = text;
+        }
+    };
+
+    var _this = this;
+
+    var settings = jQuery.extend({}, options);
+    this.each(function(i) {
+        var aeScroller = get_AutoEllipsisScroller(i);
+        saeScroller = $(aeScroller);
+        sthis = $(this);
+        saeScroller.text(sthis.text());
+
+        var origText = sthis.html();
+
+        var element = this;
+        var elementBounds = { width: element.offsetWidth, height: element.offsetHeight };
+
+        var jAeScroller = $(aeScroller);
+        var jElement = $(element);
+
+        var props = ["font-size", "font-weight", "font-family", "font-style", "padding"];
+
+        for (var i = 0; i < props.length; i++) {
+            try {
+                jAeScroller.css(props[i], jElement.css(props[i]));
+            } catch (ex) { }
+        }
+        jElement.css("overflow", "visible");
+
+
+        jAeScroller.width(jElement.width());
+
+        var isIe = (document.all != undefined);
+        var scrollerWidth = jAeScroller.width();
+        var scrollerHeight = jAeScroller.height();
+        var fitText = saeScroller.text();
+
+        while (scrollerHeight > elementBounds.height && fitText != "") {
+            fitText = fitText.substr(0, fitText.length - 2);
+            var autoScrollerInnerHTML = fitText + "&hellip;";
+            saeScroller.html(autoScrollerInnerHTML);
+            scrollerHeight = jAeScroller.height();
+        }
+        if (fitText == "") {
+            fitText = origText;
+            saeScroller.html(fitText);
+            jElement.css("whiteSpace", "nowrap");
+            jAeScroller.width("");
+            var scrollerWidth = jAeScroller.width();
+        }
+
+        while (scrollerWidth > elementBounds.width && fitText != "") {
+            fitText = fitText.substr(0, fitText.length - 2);
+            var autoScrollerInnerHTML = fitText + "&hellip;";
+            saeScroller.html(autoScrollerInnerHTML);
+            scrollerWidth = jAeScroller.width();
+        }
+        var scrollerHeight = aeScroller.offsetHeight;
+        var r = (Math.ceil(elementBounds.height / scrollerHeight) - 1);
+        r += (r == 0) ? 1 : 0;
+        var maxLettersAllowed = fitText.length * r;
+
+        StringEllipsesByMaxLetters(element, origText, maxLettersAllowed + (r + 1));
+    });
 }
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js
index 9825e15966..1e081393ca 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js
@@ -6,7 +6,7 @@ $.extend(this, i18nStringsUtil);
 
     $.fn.dataTableExt.oPagination.gmail_style = {
 
-    		
+
         "fnInit": function (oSettings, nPaging, fnCallbackDraw) {
             //var nInfo = document.createElement( 'div' );
             var nFirst = document.createElement('span');
@@ -21,13 +21,13 @@ $.extend(this, i18nStringsUtil);
 			nLast.innerHTML = oSettings.oLanguage.oPaginate.sLast;
 			*/
 
-            nFirst.innerHTML = "<span class='small-arrows'>&laquo;</span> <span class='paginate-nav-text'>" 
+            nFirst.innerHTML = "<span class='small-arrows'>&laquo;</span> <span class='paginate-nav-text'>"
                                 + i18nStringsUtil.firstString + "</span>";
             nPrevious.innerHTML = "<span class='small-arrows'>&lsaquo;</span> <span class='paginate-nav-text'>"
                                 + i18nStringsUtil.previousString + "</span>";
-            nNext.innerHTML = "<span class='paginate-nav-text'>" + i18nStringsUtil.nextString 
+            nNext.innerHTML = "<span class='paginate-nav-text'>" + i18nStringsUtil.nextString
                                 + "</span><span class='small-arrows'>&rsaquo;</span>";
-            nLast.innerHTML = "<span class='paginate-nav-text'>" + i18nStringsUtil.lastString 
+            nLast.innerHTML = "<span class='paginate-nav-text'>" + i18nStringsUtil.lastString
                                 + "</span><span class='small-arrows'>&raquo;</span>";
 
             var oClasses = oSettings.oClasses;
@@ -102,7 +102,7 @@ $.extend(this, i18nStringsUtil);
             var iCurrentPage = Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength) + 1;
             var iStartButton, iEndButton, i, iLen;
             var oClasses = oSettings.oClasses;
-            
+
             /* Pages calculation */
             if (iPages < iPageCount) {
                 iStartButton = 1;
@@ -161,8 +161,8 @@ $.extend(this, i18nStringsUtil);
                     anStatic[3].className += " " + oClasses.sPageButton;
                 }
             }
-            
-            
+
+
             if (iPages <= 1) {
             	$("." + temporalGraphProcessor.dataTableParams.paginationContainerDIVClass).hide();
             } else {
@@ -170,7 +170,7 @@ $.extend(this, i18nStringsUtil);
             }
         }
     };
-    
+
     $.fn.ellipsis = function () {
         return this.each(function () {
             var el = $(this);
@@ -209,7 +209,7 @@ $.extend(this, i18nStringsUtil);
 
 
 var DatatableCustomFilters = {
-	
+
 	peopleOrOrganizations: function(oSettings, aData, iDataIndex, rawData) {
 
 		if (temporalGraphProcessor.currentSelectedFilter === "NONE") {
@@ -237,8 +237,8 @@ var DatatableCustomFilters = {
 		}
 
 		return true;
-	}	
-		
+	}
+
 };
 
 /**
@@ -246,12 +246,12 @@ var DatatableCustomFilters = {
  * init sets some initial options for the default graph. i.e for when the page
  * is initially loaded or when its refreshed or when all the checkboxes on the
  * page are unchecked.
- * 
+ *
  * @param graphContainer
  *            is the div that contains the main graph.
  */
 function init(graphContainer) {
-	
+
 	var optionSelected = $("select.comparisonValues option:selected").val();
 	// TODO: make use of the id on the select field instead of a generic one.
 	$("#comparisonParameter").text(i18nStringsUtil.totalNumberOf + " " + optionSelected);
@@ -260,7 +260,7 @@ function init(graphContainer) {
 	$('#legend-unknown-bar-text').text(toTitleCase(COMPARISON_PARAMETERS_INFO[currentParameter].name) + " " + i18nStringsUtil.withUnknownYear);
 	$('#legend-known-bar-text').text(toTitleCase(COMPARISON_PARAMETERS_INFO[currentParameter].name) + " " + i18nStringsUtil.withKnownYear);
 	$('#legend-current-year-bar-text').text(toTitleCase(COMPARISON_PARAMETERS_INFO[currentParameter].name) + " " + i18nStringsUtil.fromIncompleteYear);
-	
+
 	var defaultFlotOptions = {
 			xaxis : {
 				min : globalDateObject.getFullYear() - 10,
@@ -276,7 +276,7 @@ function init(graphContainer) {
 			grid: {
 				borderColor : "#D9D9D9"
 			}
-			
+
 	};
 
 	/*
@@ -294,7 +294,7 @@ function init(graphContainer) {
  * the current data object. s is the current min and max {year} values. All the
  * datapoints < curr_min{year} && > > curr_max{year} are removed, so that they
  * don't show up on the graph
- * 
+ *
  * @param {Object}
  *            jsonObject
  * @param {Object}
@@ -307,7 +307,7 @@ function unStuffZerosFromLineGraphs(jsonObject, year) {
 
 	calcZeroLessMinAndMax(jsonObject, year);
 	var currentMinYear = year.globalMin, currentMaxYear = year.globalMax;
-	
+
 	var normalizedYearRange = getNormalizedYearRange();
 
 	$.each(jsonObject,
@@ -330,7 +330,7 @@ function unStuffZerosFromLineGraphs(jsonObject, year) {
  * while unStuffZerosFromLineGraphs is for a group of data objects,
  * unStuffZerosFromLineGraph is for a single data object. It removes zeroes from
  * the single object passed as parameter.
- * 
+ *
  * @param {Object}
  *            jsonObject
  */
@@ -346,38 +346,38 @@ function unStuffZerosFromLineGraph(jsonObject) {
 
 
 /**
- * This is used to normalize the year range for the currently selected entities to always 
- * display the last 10 years worth of data points. 
- * 
+ * This is used to normalize the year range for the currently selected entities to always
+ * display the last 10 years worth of data points.
+ *
  */
 function getNormalizedYearRange() {
-	
+
 	/*
-	 * This is done to make sure that at least last 10 years worth of data points 
+	 * This is done to make sure that at least last 10 years worth of data points
 	 * can be displayed.
 	 * */
 	if (globalDateObject.getFullYear() < year.globalMax) {
-		
+
 		inferredMaxYear = year.globalMax;
-		
+
 	} else {
-		
+
 		inferredMaxYear = globalDateObject.getFullYear();
 	}
-	
+
 	if (globalDateObject.getFullYear() - 9 > year.globalMin) {
-		
+
 		inferredMinYear = year.globalMin;
-		
+
 	} else {
-		
+
 		inferredMinYear = globalDateObject.getFullYear() - 9;
 	}
-	
+
 	return {
 		normalizedMinYear: inferredMinYear,
 		normalizedMaxYear: inferredMaxYear,
-		normalizedRange: inferredMaxYear - inferredMinYear 
+		normalizedRange: inferredMaxYear - inferredMinYear
 	};
 }
 
@@ -388,7 +388,7 @@ function getNormalizedYearRange() {
  * inserts [1991,0],[1993,0],1995,0]..and so on. It also inserts zeroes at the
  * beginning and the end if the max and min{year} of the current linegraph fall
  * in between the global max and min{year}
- * 
+ *
  * @param {Object}
  *            jsonObject
  * @param {Object}
@@ -396,11 +396,11 @@ function getNormalizedYearRange() {
  * @returns jsonObject with stuffed data points.
  */
 function stuffZerosIntoLineGraphs(jsonObject, year) {
-	
+
 	calcZeroLessMinAndMax(jsonObject, year);
 
 	var normalizedYearRange = getNormalizedYearRange();
-	
+
 	$.each(jsonObject,
 			function(key, val) {
 		var position = normalizedYearRange.normalizedMinYear, i = 0;
@@ -426,7 +426,7 @@ function stuffZerosIntoLineGraphs(jsonObject, year) {
  * be inserted and removed dynamically. This function calculates the max{year}
  * and min{year} among all the linegraphs present on the graph at a particular
  * instance in time .
- * 
+ *
  * @param {Object}
  *            jsonObject
  * @returns an array of current min and max years.
@@ -438,69 +438,69 @@ function calcZeroLessMinAndMax(jsonObject, year) {
 	$.each(jsonObject, function(key, val) {
 
 		for (i = 0; i < val.data.length; i++) {
-			
+
 			/*
 			 * TO make sure that,
 			 * 		1. Not to consider years that dont have any counts attached to it.
-			 * 		2. Not to consider unknown years indicated by "-1". 
+			 * 		2. Not to consider unknown years indicated by "-1".
 			 * */
 			if (val.data[i][1] != 0 && val.data[i][0] != -1) {
 				validYearsInData.push(val.data[i][0]);
 			}
 		}
-		
+
 	});
 
 	year.globalMin = Math.min.apply(Math, validYearsInData);
 	year.globalMax = Math.max.apply(Math, validYearsInData);
-	
+
 }
 
 /**
  * z is an an object with two properties label and data. data is of the form
  * [year,value] This function returns the min and max values of all such years.
- * 
+ *
  * @param {Object}
  *            jsonObject
  * @returns [minYear, maxYear]
  */
 function calcMinandMaxYears(jsonObject, year) {
-	
+
 	var validYearsInData = new Array();
 
 	$.each(jsonObject, function(key, val) {
 
 		for (i = 0; i < val.data.length; i++) {
-			
+
 			/*
 			 * TO make sure that,
 			 * 		1. Not to consider years that dont have any counts attached to it.
-			 * 		2. Not to consider unknown years indicated by "-1". 
+			 * 		2. Not to consider unknown years indicated by "-1".
 			 * */
 			if (val.data[i][1] != 0 && val.data[i][0] != -1) {
 				validYearsInData.push(val.data[i][0]);
 			}
 		}
-		
+
 	});
 	year.min = Math.min.apply(Math, validYearsInData);
 	year.max = Math.max.apply(Math, validYearsInData);
 }
 
 /**
- * This function returns the max from the counts of all the entities. Mainly used to 
+ * This function returns the max from the counts of all the entities. Mainly used to
  * normalize the width of bar below the line graph, also known as legend row.
 
  * @returns maxCount
  */
 function calcMaxOfComparisonParameter(allEntities) {
-	
+
 	var validCountsInData = new Array();
-	
+
 	$.each(allEntities, function(key, currentEntity) {
-		
+
 		combinedCount = currentEntity.activityCount;
-		
+
 		validCountsInData.push(combinedCount.knownYearCount + combinedCount.unknownYearCount);
 	});
 
@@ -508,31 +508,31 @@ function calcMaxOfComparisonParameter(allEntities) {
 }
 
 function calcMaxWithinComparisonParameter(jsonObject){
-	
+
 	var validCountsInData = new Array();
 
 	$.each(jsonObject, function(key, val) {
 
 		for (i = 0; i < val.data.length; i++) {
-			
+
 			/*
 			 * TO make sure that,
 			 * 		1. Not to consider years that dont have any counts attached to it.
-			 * 		2. Not to consider unknown years indicated by "-1". 
+			 * 		2. Not to consider unknown years indicated by "-1".
 			 * */
 			if (val.data[i][1] != 0 && val.data[i][0] != -1) {
 				validCountsInData.push(val.data[i][1]);
 			}
 		}
-		
+
 	});
-	
+
 	return Math.max.apply(Math, validCountsInData);
 }
 
 /**
  * A simple function to see if the passed
- * 
+ *
  * @param {array}
  *            objectArray
  * @param {Object}
@@ -545,7 +545,7 @@ function contains(objectArray, object) {
 		if (objectArray[i] == object) {
 			flag = i;
 		}
-			
+
 	}
 	return flag;
 }
@@ -561,32 +561,32 @@ var LineWidth = {
 			return 1;
 		}
 	}
-		
+
 };
 
 var TickSize = {
-		
-	maxValue: 0.0,	
-	
+
+	maxValue: 0.0,
+
 	maxTicks: {
 		yAxis: 12.0,
 		xAxis: 12.0
 	},
-	
+
 	tickSizeUnits: {
 		yAxis: [1.0, 2.5, 5.0],
 		xAxis: [1.0, 2, 5.0]
 	},
-	
+
 	getApproximateTickSize: function(allowedMaxTicks) {
 		return Math.max(Math.ceil(parseFloat(this.maxValue) / allowedMaxTicks), 1.0);
 	},
-	
+
 	getFinalTickSize: function(unitTickSizeGenerator) {
 		tickSizeMultiplier = 1.0;
 		finalTickSize = 1.0;
 		approximateTickSize = this.getApproximateTickSize(this.maxTicks.yAxis);
-		
+
 		while (true) {
 			if (approximateTickSize <= (unitTickSizeGenerator[0] * tickSizeMultiplier)) {
 				finalTickSize = unitTickSizeGenerator[0] * tickSizeMultiplier;
@@ -604,7 +604,7 @@ var TickSize = {
 		}
 		return finalTickSize;
 	},
-	
+
 	getTickSize: function(value, onAxis) {
 		this.maxValue = value;
 		if (onAxis.trim().toLowerCase() === 'y') {
@@ -612,13 +612,13 @@ var TickSize = {
 		} else if (onAxis.trim().toLowerCase() === 'x') {
 			return this.getFinalTickSize(this.tickSizeUnits.xAxis);
 		}
-	} 
+	}
 };
 
 /**
  * Create a div that represents the rectangular bar A hidden input class that is
  * used to pass the value and a label beside the checkbox.
- * 
+ *
  * @param {Object}
  *            entityLabel
  */
@@ -631,15 +631,15 @@ function createLegendRow(entity, bottomDiv) {
     var labelDiv = $('<div>');
     labelDiv.attr('class', 'easy-deselect-label');
     labelDiv.html('<div class="entity-label-url ellipsis"></div>');
-    
+
     /*
      * We should display a further drill-down option only when available. In case of people
      * there is no drill-down possible, so don't diaply the temporal graph icon.
      * */
     if (entity.visMode !== "PERSON") {
-    	labelDiv.append('<a class="temporal-vis-url" href="' + getTemporalVisURL(entity.entityURI) + '"><img src = "' + temporalGraphDrillDownIcon + '"/></a>');	
+    	labelDiv.append('<a class="temporal-vis-url" href="' + getTemporalVisURL(entity.entityURI) + '"><img src = "' + temporalGraphDrillDownIcon + '"/></a>');
     }
-    
+
 
     var checkbox = $('<input>');
     checkbox.attr('type', 'checkbox');
@@ -654,27 +654,27 @@ function createLegendRow(entity, bottomDiv) {
 
     var barDiv = $('<div>');
     barDiv.attr('id', 'bar');
-    
+
     var knownBar = $('<span>');
     knownBar.attr('class', 'known-bar');
-    
+
     var currentYearBar = $('<span>');
     currentYearBar.attr('class', 'current-year-bar');
 
     var unknownBar = $('<span>');
     unknownBar.attr('class', 'unknown-bar');
-    
+
     var unknownBarInnerSpan = $('<span>');
     unknownBarInnerSpan.attr('class', 'unknown-inner-bar');
     unknownBarInnerSpan.html('&nbsp;');
-    
+
     unknownBar.append(unknownBarInnerSpan);
-    
+
     barDiv.append(unknownBar);
     barDiv.append(knownBar);
     barDiv.append(currentYearBar);
-    
-    
+
+
     var numAttributeText = $('<span>');
     numAttributeText.attr('class', 'bar-count-text');
 
@@ -683,14 +683,14 @@ function createLegendRow(entity, bottomDiv) {
     parentP.append(hiddenLabel);
     parentP.append(barDiv);
     parentP.append(numAttributeText);
-    
+
     if (bottomDiv.children('p.displayCounter').nextAll().last().length > 0) {
     	bottomDiv.children('p.displayCounter').nextAll().last().after(parentP);
     } else {
     	bottomDiv.children('p.displayCounter').after(parentP);
     }
-    
-    
+
+
 
     renderBarAndLabel(entity, barDiv, labelDiv, numAttributeText);
 }
@@ -703,67 +703,67 @@ function createLegendRow(entity, bottomDiv) {
 function renderBarAndLabel(entity, divBar, divLabel, spanElement) {
 
 	var combinedCount = entity.activityCount;
-	
+
 	var sum = combinedCount.knownYearCount + combinedCount.unknownYearCount;
-	
+
     var normalizedWidth = getNormalizedWidth(entity, sum);
-    
+
     divBar.css("width", normalizedWidth + 5);
-    
+
     if (combinedCount.knownYearCount - combinedCount.currentYearCount) {
-    
+
     	var knownNormalizedWidth = getNormalizedWidth(entity, combinedCount.knownYearCount - combinedCount.currentYearCount);
-        
-        var countExplanation = (combinedCount.knownYearCount - combinedCount.currentYearCount) 
-                                + ' ' + i18nStringsUtil.ofString + ' ' + sum 
-    	                        + ' ' + i18nStringsUtil.wereString + ' ' 
-    	                        + COMPARISON_PARAMETERS_INFO[currentParameter].verbName 
+
+        var countExplanation = (combinedCount.knownYearCount - combinedCount.currentYearCount)
+                                + ' ' + i18nStringsUtil.ofString + ' ' + sum
+    	                        + ' ' + i18nStringsUtil.wereString + ' '
+    	                        + COMPARISON_PARAMETERS_INFO[currentParameter].verbName
     	                        + ' ' + i18nStringsUtil.inCompletedYear;
 
         divBar.children(".known-bar").attr("title", countExplanation);
-        
+
         divBar.children(".known-bar").html("&nbsp;").css("background-color", colorToAssign).css("width", knownNormalizedWidth);
-    
+
     } else {
-    
+
     	divBar.children(".known-bar").hide();
     }
-    
-    
+
+
     if (combinedCount.unknownYearCount) {
     	var unknownNormalizedWidth = getNormalizedWidth(entity, combinedCount.unknownYearCount);
-    	
-        var countExplanation = combinedCount.unknownYearCount + ' ' + i18nStringsUtil.ofString + ' ' 
+
+        var countExplanation = combinedCount.unknownYearCount + ' ' + i18nStringsUtil.ofString + ' '
                                 + sum + ' ' + i18nStringsUtil.haveAnUnknown + ' '
-                                + COMPARISON_PARAMETERS_INFO[currentParameter].name 
+                                + COMPARISON_PARAMETERS_INFO[currentParameter].name
                                 + ' ' + i18nStringsUtil.yearNotChartered;
-        
+
         divBar.children(".unknown-bar").attr("title", countExplanation);
-        
+
         divBar.children(".unknown-bar").children(".unknown-inner-bar").html("&nbsp;").css("background-color", colorToAssign).css("width", unknownNormalizedWidth);
-        
+
     } else {
-    	
+
     	divBar.children(".unknown-bar").hide();
     }
-    
+
     if (combinedCount.currentYearCount) {
     	var currentNormalizedWidth = getNormalizedWidth(entity, combinedCount.currentYearCount);
-    	
-        var countExplanation = combinedCount.currentYearCount + ' ' + i18nStringsUtil.ofString + ' ' + sum 
-                                + ' ' + i18nStringsUtil.wereString + ' ' 
-                                + COMPARISON_PARAMETERS_INFO[currentParameter].verbName + ' ' 
+
+        var countExplanation = combinedCount.currentYearCount + ' ' + i18nStringsUtil.ofString + ' ' + sum
+                                + ' ' + i18nStringsUtil.wereString + ' '
+                                + COMPARISON_PARAMETERS_INFO[currentParameter].verbName + ' '
                                 + i18nStringsUtil.inIncompleteYear;
-        
+
         divBar.children(".current-year-bar").attr("title", countExplanation);
-        
+
         divBar.children(".current-year-bar").html("&nbsp;").css("background-color", colorToAssign).css("width", currentNormalizedWidth);
-    	
+
     } else {
-    	
+
     	divBar.children(".current-year-bar").hide();
     }
-    
+
     var entityLabelForLegend = divLabel.find(".entity-label-url");
     entityLabelForLegend.html(entity.label);
     entityLabelForLegend.ellipsis();
@@ -773,32 +773,32 @@ function renderBarAndLabel(entity, divBar, divLabel, spanElement) {
 }
 
 function getVIVOURL(entityURI){
-	
+
 	return subOrganizationVivoProfileURL + "uri=" + entityURI;
-	
+
 }
 
 function getTemporalVisURL(entityURI) {
 	if (vivoDefaultNamespace) {
-		
+
 		/*
-		 * This means that the URI of the entity is made up of default namespace so lets make the 
+		 * This means that the URI of the entity is made up of default namespace so lets make the
 		 * short url, shorter!
 		 * */
 		if (entityURI.search(vivoDefaultNamespace) === 0) {
-			return temporalGraphCommonURL + entityURI.substring(vivoDefaultNamespace.length);			
+			return temporalGraphCommonURL + entityURI.substring(vivoDefaultNamespace.length);
 		}
-	} 
-	
+	}
+
 	/*
-	 * Default short url template involves using long uri, this in case the entity is not based off 
+	 * Default short url template involves using long uri, this in case the entity is not based off
 	 * of default namespace.
 	 * */
 	return temporalGraphCommonURL + "?uri=" + entityURI ;
 }
 
 function getVIVOProfileURL(given_uri) {
-	
+
 	finalURL = $.ajax({
 		url: contextPath + "/visualization",
 		data: ({vis: "utilities", vis_mode: "PROFILE_URL", uri: given_uri}),
@@ -809,7 +809,7 @@ function getVIVOProfileURL(given_uri) {
 	}).responseText;
 
 	return finalURL;
-	
+
 }
 
 function slugify(textToBeSlugified) {
@@ -818,7 +818,7 @@ function slugify(textToBeSlugified) {
 
 /**
  * remove the bar, label and checkbox during runtime.
- * 
+ *
  * @param {Object}
  *            label
  * @param {Object}
@@ -829,11 +829,11 @@ function slugify(textToBeSlugified) {
  *            span
  */
 function removeLegendRow(checkbox) {
-	
+
 	//console.log("removeLegendRow is called for "+$(checkbox).attr("value"));
 	var pToBeRemovedIdentifier = $(checkbox).attr("value");
 	$('p#' + slugify(pToBeRemovedIdentifier)).remove();
-	
+
     $(checkbox).next('a').css("font-weight", "normal");
 }
 
@@ -841,7 +841,7 @@ function removeLegendRow(checkbox) {
  * These are the options passed to by $.pagination(). Basically they define the
  * items visible per page, number of navigation tabs, and number of edge
  * navigation tabs.
- * 
+ *
  * @param object
  * @param itemsPerPage
  * @param numberOfDisplayEntries
@@ -861,12 +861,12 @@ function setOptionsForPagination(object, itemsPerPage, numberOfDisplayEntries,
 
 /**
  * function for removing "unknown" values (-1) just before data plotting.
- * 
+ *
  * @jsonRecords the set of entities from which the unknowns have to be removed.
  */
 
 function removeUnknowns(jsonRecords) {
-	
+
 	var i = 0, j = 0;
 
 	while (j < jsonRecords.length) {
@@ -882,11 +882,11 @@ function removeUnknowns(jsonRecords) {
 		}
 		j++;
 	}
-	
+
 }
 
 function insertBackUnknowns(jsonRecords) {
-	
+
 	var i = 0, j = 0;
 
 	while (j < jsonRecords.length) {
@@ -902,7 +902,7 @@ function insertBackUnknowns(jsonRecords) {
  * side-effecting entity here.
  */
 function getNextFreeColor(entity){
-   
+
 	/* check freeColors is not empty and
      * Remove the first element out of freeColors
      */
@@ -913,7 +913,7 @@ function getNextFreeColor(entity){
         freeColors.splice(index, 1);
     } else {
         colorToAssign = freeColors.shift();
-    }    
+    }
     /*
      * use colorToAssign to plot the current linegraph
      * also store it in colors
@@ -923,10 +923,10 @@ function getNextFreeColor(entity){
 }
 
 function getNormalizedWidth(entity, sum){
-	
+
 	 var maxValueOfComparisonParameter = calcMaxOfComparisonParameter(URIToEntityRecord);
 	 var normalizedWidth = 0;
-	 
+
 	 normalizedWidth = Math.floor(225 * (sum / maxValueOfComparisonParameter));
 
 	 /*
@@ -938,49 +938,49 @@ function getNormalizedWidth(entity, sum){
 }
 
 function renderLineGraph(renderedObjects, entity){
-	
+
     renderedObjects.push(entity);
     stuffZerosIntoLineGraphs(renderedObjects, year);
-    
+
 }
 
 
 function removeUsedColor(entity){
-	
+
     if (colors[entity.label]) {
         colorToRemove = colors[entity.label];
         prevColor[entity.label] = colorToRemove;
         entity.color = "";
     }
-    
+
 	//Insert it at the end of freeColors
     freeColors.push(colorToRemove);
 }
 
 function removeEntityUnChecked(renderedObjects, entity){
-	
+
 	//remove the entity that is unchecked
     var ii = 0;
     while (ii < renderedObjects.length) {
-    	
+
         if (renderedObjects[ii].label == entity.label) {
             unStuffZerosFromLineGraph(renderedObjects[ii]);
             renderedObjects.splice(ii, 1);
         } else {
         	ii++;
-        }             
+        }
     }
     unStuffZerosFromLineGraphs(renderedObjects, year);
-    
+
 }
 
 
 function generateCheckBoxes(label, checkedFlag, fontFlag){
-	
+
 	var parentP = $('<p>');
-	
+
 	var li = $('<li>');
-	
+
 	var checkbox = $('<input>');
 	checkbox.attr('type','checkbox');
 	checkbox.attr('class', entityCheckboxSelectorDOMClass);
@@ -988,22 +988,22 @@ function generateCheckBoxes(label, checkedFlag, fontFlag){
 	if(checkedFlag == 1){
 		checkbox.prop('checked');
 	}
-	
+
 	var a = $('<a/>');
 	if(fontFlag == 1){
 		a.css("font-weight", "bold");
 	}
 	a.html(label);
-	
+
 	parentP.append(li);
 	parentP.append(checkbox);
 	parentP.append(a);
-	
+
     return parentP;
 }
 
 function clearRenderedObjects(){
-	
+
 	$.each(URIToCheckedEntities, function(index, val){
 		if($(val).is(':checked')){
 			$(val).prop("checked", false);
@@ -1014,9 +1014,9 @@ function clearRenderedObjects(){
 			displayLineGraphs();
 		}
 	});
-	
+
 	URIToCheckedEntities = {};
-	
+
 	checkIfColorLimitIsReached();
 	updateCounter();
 
@@ -1032,14 +1032,14 @@ function updateCounter(){
 }
 
 function displayLineGraphs(){
-	
+
 	//plot all we got
     if (renderedObjects.length == 0) {
-    	
+
     	init(graphContainer);
-    	
+
     } else {
-    	
+
     	removeUnknowns(renderedObjects);
         $.plot(graphContainer, renderedObjects, FlotOptions);
         insertBackUnknowns(renderedObjects);
@@ -1053,27 +1053,27 @@ function removeCheckBoxFromGlobalSet(checkbox){
 	/*if (labelToCheckedEntities[value]) {
 		delete labelToCheckedEntities[value];
 	}*/
-	
+
 	if (URIToCheckedEntities[value]) {
 		delete URIToCheckedEntities[value];
 	}
-	
+
 }
 
 /*
- * function to create a table to be 
- * used by jquery.dataTables. The JsonObject 
+ * function to create a table to be
+ * used by jquery.dataTables. The JsonObject
  * returned is used to populate the pagination table.
- */	
+ */
 function prepareTableForDataTablePagination(jsonData, dataTableParams){
-	
+
 //	console.log(processJSONData.currentEntityLevel);
-	
+
 	if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") {
 		$.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations);
 	}
-		
-	
+
+
 	var table = $('<table>');
 	table.attr('cellpadding', '0');
 	table.attr('cellspacing', '0');
@@ -1081,21 +1081,21 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
 	table.attr('id', 'datatable');
 	table.css('font-size', '0.9em');
 	table.css('width', '100%');
-	
+
 	var thead = $('<thead>');
 	var tr = $('<tr>');
-	
+
 	var checkboxTH = $('<th>');
 	checkboxTH.html(' ');
-	
+
 	var entityLabelTH = $('<th>');
 	entityLabelTH.html(i18nStringsUtil.entityLabel);
-	
+
 	var activityCountTH = $('<th>');
 	if ($("select.comparisonValues option:selected").text() === i18nStringsUtil.byPublications) {
 		activityCountTH.html(i18nStringsUtil.publicationCount);
 	} else {
-		activityCountTH.html(i18nStringsUtil.grantCount);		
+		activityCountTH.html(i18nStringsUtil.grantCount);
 	}
 	activityCountTH.attr("id", "activity-count-column");
 
@@ -1106,48 +1106,48 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
 	tr.append(entityLabelTH);
 	tr.append(activityCountTH);
 	tr.append(entityTypeTH);
-	
+
 	thead.append(tr);
-	
+
 	table.append(thead);
-	
+
 	var tbody = $('<tbody>');
 	var checkboxCount = 0;
-	
+
 	$.each(URIToEntityRecord, function(index, val) {
 		var entityTypesWithoutStopWords = removeStopWords(val);
-		var row = $('<tr>'); 
-		
+		var row = $('<tr>');
+
 		var checkboxTD = $('<td>');
-		checkboxTD.html('<div class="disabled-checkbox-event-receiver">&nbsp;</div><input type="checkbox" class="' 
-								+ entityCheckboxSelectorDOMClass + '" value="' 
+		checkboxTD.html('<div class="disabled-checkbox-event-receiver">&nbsp;</div><input type="checkbox" class="'
+								+ entityCheckboxSelectorDOMClass + '" value="'
 								+ val.entityURI + '"'+'/>');
-		
+
 		var labelTD =  $('<td>');
 		labelTD.css("width", "100px");
 		labelTD.html(val.label);
-		
+
 		var publicationCountTD =  $('<td>');
-		
+
 		var combinedCount = val.activityCount;
-		
+
 		publicationCountTD.html(combinedCount.knownYearCount + combinedCount.unknownYearCount);
-		
+
 		var entityTypeTD =  $('<td>');
 		entityTypeTD.html(entityTypesWithoutStopWords);
-		
+
 		row.append(checkboxTD);
 		row.append(labelTD);
 		row.append(publicationCountTD);
 		row.append(entityTypeTD);
-		
+
 		tbody.append(row);
 		checkboxCount++;
 	});
-	
+
 	table.append(tbody);
 	tableDiv.append(table);
-	
+
 	var entityListTable = $('#datatable').dataTable({
 	    "sDom": '<"' + dataTableParams.searchBarParentContainerDIVClass + '"f><"filterInfo"i><"' + dataTableParams.paginationContainerDIVClass + '"p><"table-separator"><"datatablewrapper"t>',
 	    "aaSorting": [
@@ -1163,38 +1163,38 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
 		},
 	    "sPaginationType": "gmail_style",
 	    "fnDrawCallback": function () {
-	    	
+
 	        /* We check whether max number of allowed comparisions (currently 10) is reached
-	         * here as well becasue the only function that is guaranteed to be called during 
+	         * here as well becasue the only function that is guaranteed to be called during
 	         * page navigation is this. No need to bind it to the nav-buttons becuase 1. It is over-ridden
 	         * by built-in navigation events & this is much cleaner.
 	         * */
 	        checkIfColorLimitIsReached();
 	    }
 	});
-	
-	
+
+
 	var searchInputBox = $("." + dataTableParams.searchBarParentContainerDIVClass).find("input[type=text]");
-	
+
 	searchInputBox.after("<span id='reset-search' title='" + i18nStringsUtil.clerSearchQuery + "'>X</span>");
 
 	$( document ).on('click', "#reset-search", function() {
 		entityListTable.fnFilter("");
 	});
-	
+
 	return entityListTable;
 }
 
 
 /*
- * function to create a table to be 
- * used by jquery.dataTables. The JsonObject 
+ * function to create a table to be
+ * used by jquery.dataTables. The JsonObject
  * returned is used to populate the pagination table.
- */	
+ */
 function reloadDataTablePagination(preselectedEntityURIs, jsonData){
-	
+
 	if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") {
-		
+
 		/*
 		 * This will make sure that duplicate filters are not added.
 		 * */
@@ -1202,77 +1202,77 @@ function reloadDataTablePagination(preselectedEntityURIs, jsonData){
 			$.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations);
 		}
 	} else {
-		
+
 		var indexOfPeopleOrOrganizationFilter = $.inArray(DatatableCustomFilters.peopleOrOrganizations, $.fn.dataTableExt.afnFiltering);
-		
+
 		if (indexOfPeopleOrOrganizationFilter >= 0) {
 			$.fn.dataTableExt.afnFiltering.splice(indexOfPeopleOrOrganizationFilter, 1);
 		}
 	}
-	
+
 	var currentDataTable = $('#datatable').dataTable();
-	
+
 	currentDataTable.fnClearTable();
-	
+
 	if ($("select.comparisonValues option:selected").text() === "i18nStringsUtil.byPublications") {
 		$("#activity-count-column").html(i18nStringsUtil.publicationCount);
 	} else {
-		$("#activity-count-column").html(i18nStringsUtil.grantCount);		
+		$("#activity-count-column").html(i18nStringsUtil.grantCount);
 	}
-	
+
 	function addNewRowAfterReload(entity) {
-		
-		var checkboxTD = '<div class="disabled-checkbox-event-receiver">&nbsp;</div><input type="checkbox" class="' 
-			+ entityCheckboxSelectorDOMClass 
-			+ '" value="' 
+
+		var checkboxTD = '<div class="disabled-checkbox-event-receiver">&nbsp;</div><input type="checkbox" class="'
+			+ entityCheckboxSelectorDOMClass
+			+ '" value="'
 			+ entity.entityURI + '"' +'/>';
 
 		var labelTD =  entity.label;
-		
+
 		var combinedCount = entity.activityCount;
-		
+
 		var publicationCountTD = combinedCount.knownYearCount + combinedCount.unknownYearCount;
-		
+
 		var entityTypeTD =  removeStopWords(entity);
-		
+
 		var newRow = [checkboxTD,
 		  labelTD,
 		  publicationCountTD,
 		  entityTypeTD];
-		
+
 		/*
 		 * Dont redraw the table, so no sorting, no filtering.
 		 * */
 		currentDataTable.fnAddData(newRow, false);
 	}
-	
+
 	/*
 	 * This will ensure that currently selected entities are added first in the table,
 	 * to make sure that they are "visible" in the DOM. This so that our manual trigger
-	 * for selecting this checkboxes on page load, actually works.  
+	 * for selecting this checkboxes on page load, actually works.
 	 * */
 	$.each(preselectedEntityURIs, function(index, uri) {
 		if (URIToEntityRecord[uri]) {
 			addNewRowAfterReload(URIToEntityRecord[uri]);
 		}
 	});
-	
-	
+
+
 	$.each(URIToEntityRecord, function(index, val) {
-		
+
 		/*
-		 * Don't consider already added pre-selected entities. 
+		 * Don't consider already added pre-selected entities.
 		 * */
 		if ($.inArray(index, preselectedEntityURIs) < 0) {
 			addNewRowAfterReload(val);
 		}
 	});
-	
+
 	/*
 	 * We should change to the first page so that checkboxes are selectable.
 	 * */
 	currentDataTable.fnPageChange('first');
-	
+
 	return currentDataTable;
 }
 
@@ -1281,7 +1281,7 @@ function updateRowHighlighter(linkedCheckBox){
 }
 
 function removeStopWords(val) {
-	
+
 	return $.map(val.organizationType, function(type, i){
 
 		if ($.inArray(type, STOP_WORDS_FOR_TABLE) < 0) {
@@ -1302,11 +1302,11 @@ function toCamelCase(string){
 
 function getSize(map){
 	var size = 0;
-	
+
 	$.each(map, function(){
 		size++;
 	});
-	
+
 	return size;
 }
 
@@ -1316,43 +1316,43 @@ function disableUncheckedEntities(){
 		$(val).attr('disabled', true);
 		$(val).prev().show();
 	});
-	
+
 	/*
 	 * This indicates the first time this function is called presumably after the 10th checkbox is selected.
 	 * We want to display a warning message only in Internet Explorer because in IE the div that handles
 	 * disabled-checkbox-clicks is colored white & we cant see the actual checkbox.
-	 * 
-	 * Note that the usual Error message will still display if the user tries to click on the white box 
-	 * (or a disabled checkbox in case of non-IE browsers).   
+	 *
+	 * Note that the usual Error message will still display if the user tries to click on the white box
+	 * (or a disabled checkbox in case of non-IE browsers).
 	 * */
 	if ($("#datatable").data("isEntitySelectionAllowed")) {
 		if ($.browser.msie) {
-			createNotification("warning-notification", { title: i18nStringsUtil.informationString, 
+			createNotification("warning-notification", { title: i18nStringsUtil.informationString,
 				text: i18nStringsUtil.shortMaxEntityNote },{
 				custom: false,
 				expires: false
-				});	
+				});
 		}
-	} 
-		
-	
+	}
+
+
 	$("#datatable").data("isEntitySelectionAllowed", false);
 }
 
 function enableUncheckedEntities(){
-	
+
 	$.each($("input[type=checkbox]." + entityCheckboxSelectorDOMClass + ":not(:checked)"), function(index, val){
 		$(val).attr('disabled', false);
 		$(val).prev().hide();
 	});
-	
-	
-	
+
+
+
 	$("#datatable").data("isEntitySelectionAllowed", true);
 }
 
 function checkIfColorLimitIsReached(){
-	
+
 	if (getSize(URIToCheckedEntities) >= 10) {
 		disableUncheckedEntities();
 	} else {
@@ -1361,21 +1361,21 @@ function checkIfColorLimitIsReached(){
 }
 
 function setTickSizeOfAxes(){
-	
+
 	var checkedLabelToEntityRecord = {};
 	var yearRange;
-	
+
 	$.each(URIToCheckedEntities, function(index, val){
 		checkedLabelToEntityRecord[index] = URIToEntityRecord[index];
 	});
-	
+
 	var normalizedYearRange = getNormalizedYearRange();
-	
-    FlotOptions.xaxis.tickSize = 
+
+    FlotOptions.xaxis.tickSize =
 		TickSize.getTickSize(normalizedYearRange.normalizedRange, 'x');
 
     FlotOptions.series.lines.lineWidth = LineWidth.getLineWidth(FlotOptions.xaxis.tickSize);
-    
-	FlotOptions.yaxis.tickSize = 
+
+	FlotOptions.yaxis.tickSize =
 			TickSize.getTickSize(calcMaxWithinComparisonParameter(checkedLabelToEntityRecord), 'y');
 }
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js b/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js
index 1f6ec8e352..422c5f612c 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js
@@ -1,65 +1,65 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-/* 
- * Simple JavaScript Inheritance
- * By John Resig http://ejohn.org/
- * MIT Licensed.
- */
-// Inspired by base2 and Prototype
-(function(){
-  var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
-  // The base Class implementation (does nothing)
-  this.Class = function(){};
-  
-  // Create a new Class that inherits from this class
-  Class.extend = function(prop) {
-    var _super = this.prototype;
-    
-    // Instantiate a base class (but only create the instance,
-    // don't run the init constructor)
-    initializing = true;
-    var prototype = new this();
-    initializing = false;
-    
-    // Copy the properties over onto the new prototype
-    for (var name in prop) {
-      // Check if we're overwriting an existing function
-      prototype[name] = typeof prop[name] == "function" && 
-        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
-        (function(name, fn){
-          return function() {
-            var tmp = this._super;
-            
-            // Add a new ._super() method that is the same method
-            // but on the super-class
-            this._super = _super[name];
-            
-            // The method only need to be bound temporarily, so we
-            // remove it when we're done executing
-            var ret = fn.apply(this, arguments);        
-            this._super = tmp;
-            
-            return ret;
-          };
-        })(name, prop[name]) :
-        prop[name];
-    }
-    
-    // The dummy class constructor
-    function Class() {
-      // All construction is actually done in the init method
-      if ( !initializing && this.init )
-        this.init.apply(this, arguments);
-    }
-    
-    // Populate our constructed prototype object
-    Class.prototype = prototype;
-    
-    // Enforce the constructor to be what we expect
-    Class.constructor = Class;
-
-    // And make this class extendable
-    Class.extend = arguments.callee;
-    
-    return Class;
-  };
+/* $This file is distributed under the terms of the license in LICENSE$ */
+/*
+ * Simple JavaScript Inheritance
+ * By John Resig http://ejohn.org/
+ * MIT Licensed.
+ */
+// Inspired by base2 and Prototype
+(function(){
+  var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+  // The base Class implementation (does nothing)
+  this.Class = function(){};
+
+  // Create a new Class that inherits from this class
+  Class.extend = function(prop) {
+    var _super = this.prototype;
+
+    // Instantiate a base class (but only create the instance,
+    // don't run the init constructor)
+    initializing = true;
+    var prototype = new this();
+    initializing = false;
+
+    // Copy the properties over onto the new prototype
+    for (var name in prop) {
+      // Check if we're overwriting an existing function
+      prototype[name] = typeof prop[name] == "function" &&
+        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+        (function(name, fn){
+          return function() {
+            var tmp = this._super;
+
+            // Add a new ._super() method that is the same method
+            // but on the super-class
+            this._super = _super[name];
+
+            // The method only need to be bound temporarily, so we
+            // remove it when we're done executing
+            var ret = fn.apply(this, arguments);
+            this._super = tmp;
+
+            return ret;
+          };
+        })(name, prop[name]) :
+        prop[name];
+    }
+
+    // The dummy class constructor
+    function Class() {
+      // All construction is actually done in the init method
+      if ( !initializing && this.init )
+        this.init.apply(this, arguments);
+    }
+
+    // Populate our constructed prototype object
+    Class.prototype = prototype;
+
+    // Enforce the constructor to be what we expect
+    Class.constructor = Class;
+
+    // And make this class extendable
+    Class.extend = arguments.callee;
+
+    return Class;
+  };
 })();
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js b/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js
index 6a8b2ad79b..42128437c6 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js
@@ -1,51 +1,51 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-var ColorStrategy = Class.extend ({
-	getColor: function(key) {
-	}
-});
-
-var SingleColorStrategy = ColorStrategy.extend ({
-	init: function(defaultColor) {
-		this.defaultColor = '#000000';
-		if (defaultColor) {
-			this.defaultColor = defaultColor;
-		}
-	},
-	getColor: function(key) {
-		return this.defaultColor;
-	}
-});
-
-var DisciplineColorStrategy = SingleColorStrategy.extend ({
-	init: function(defaultColor) {
-		this._super(defaultColor);
-	},
-	getColor: function(key) {
-		var color = DISCIPLINES[key].color;
-		if (color) {
-			return color;
-		} else {
-			return this._super(key);
-		}
-	}
-});
-
-var SubdisciplineColorStrategy = ColorStrategy.extend ({
-	init: function(defaultColor) {
-		this.colorStrategy = new DisciplineColorStrategy(defaultColor);
-	},
-	getColor: function(key) {
-		var mapKey = SUBDISCIPLINES[key].discipline;
-		return this.colorStrategy.getColor(mapKey);
-	}
-});
-
-// Todo: Stop coding until comparison view, might need to use Temporal Line Graph solution
-var AutoAssignColorStrategy = SingleColorStrategy.extend ({
-	init: function(defaultColor, ColorList) {
-		this._super(defaultColor);
-	},
-	getColor: function(key) {
-	}
-});
-
+/* $This file is distributed under the terms of the license in LICENSE$ */
+var ColorStrategy = Class.extend ({
+	getColor: function(key) {
+	}
+});
+
+var SingleColorStrategy = ColorStrategy.extend ({
+	init: function(defaultColor) {
+		this.defaultColor = '#000000';
+		if (defaultColor) {
+			this.defaultColor = defaultColor;
+		}
+	},
+	getColor: function(key) {
+		return this.defaultColor;
+	}
+});
+
+var DisciplineColorStrategy = SingleColorStrategy.extend ({
+	init: function(defaultColor) {
+		this._super(defaultColor);
+	},
+	getColor: function(key) {
+		var color = DISCIPLINES[key].color;
+		if (color) {
+			return color;
+		} else {
+			return this._super(key);
+		}
+	}
+});
+
+var SubdisciplineColorStrategy = ColorStrategy.extend ({
+	init: function(defaultColor) {
+		this.colorStrategy = new DisciplineColorStrategy(defaultColor);
+	},
+	getColor: function(key) {
+		var mapKey = SUBDISCIPLINES[key].discipline;
+		return this.colorStrategy.getColor(mapKey);
+	}
+});
+
+// Todo: Stop coding until comparison view, might need to use Temporal Line Graph solution
+var AutoAssignColorStrategy = SingleColorStrategy.extend ({
+	init: function(defaultColor, ColorList) {
+		this._super(defaultColor);
+	},
+	getColor: function(key) {
+	}
+});
+
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js
index 2c51e415cd..da59b24d5a 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js
@@ -1,268 +1,268 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-$.extend(this, i18nStrings);
-
-var ComparisonDataTableWidget = Class.extend({
-	
-	dom: {
-		firstFilterLabel: i18nStrings.organizationsString,
-		secondFilterLabel: i18nStrings.peopleString,
-		
-		searchBarParentContainerClass : "comparisonSearchbar",
-		paginationContainerClass : "paginatedtabs",
-		containerID: "main-science-areas-table-container",
-		footerID: "main-science-areas-table-footer",
-		firstFilterID: "comparison-first-filter",
-		secondFilterID: "comparison-second-filter",
-		filterOptionClass: "comparison-filter-option",
-		activeFilterClass: "comparison-active-filter",
-		filterInfoIconClass: "comparisonFilterInfoIcon"
-	},
-	init: function(sciMapWidget, entityTablesWidget) {
-		var me = this;
-		me.sciMapWidget = sciMapWidget;
-		me.entityTablesWidget = entityTablesWidget;
-		me.widgetType = "COMPARISON_SCIENCE_AREAS";
-		me.currentSelectedFilter = COMPARISON_TYPE.ORGANIZATION;
-		me.widget = '';
-		me.tableDiv = $('<div />');
-		$("#" + me.dom.containerID).append(this.tableDiv);
-	},
-	loadJsonData: function(data) {
-		
-		var me = this;
-		me.uri = data.uri;
-		me.label = data.label;
-		me.pubsWithNoJournals = data.pubsWithNoJournals;
-		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
-		me.pubsMapped = data.pubsMapped;
-		me.type = data.type;
-		me.subEntities = data.subEntities;
-		
-		me.setupView();
-	},
-	hasKey: function(key) {
-		return (this.keyToMarkerManagers.hasOwnProperty(key));
-	},
-	show: function(key) {
-		this.tableDiv.show();
-	},
-	hide: function(key) {
-		this.tableDiv.hide();
-	},
-	cleanView: function() {
-		this.hide();
-	},
-	initView: function() {
-		this.show();
-		this.changeFilter(this.currentSelectedFilter);
-	},
-	setupView: function() {
-		
-		var me = this;
-		
-		/* Create filter */
-		var dom = me.dom;
-		var filter = $('<div class="science-areas-filter">' +
-	    	'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">' + dom.firstFilterLabel + '</span>'+
-	    	/* This is temporary removed due to the person's publications mapping rate is too low to be displayed.
-		    	' | ' +
-		    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">' + dom.secondFilterLabel + '</span>' +
-	    	*/
-	    	'<img class="' + dom.filterInfoIconClass + '" id="comparisonImageIconTwo" src="'+ infoIconUrl +'" alt="' + i18nStrings.infoIconString + '" title="" /></div>');
-		me.tableDiv.append(filter);
-		createToolTip($("#comparisonImageIconTwo"), $("#comparisonToolTipTwo").html(), "top left");
-		initFilter(dom);
-		
-		/* Create table */
-		var table = $('<table>');
-		table.attr('id', 'comparisonDatatable');
-		table.addClass('datatable-table');
-		
-		var thead = $('<thead>');
-		var tr = $('<tr>');
-		
-		var levelOfScienceAreaTH = $('<th>');
-		levelOfScienceAreaTH.html(i18nStrings.entityTypeString);
-		
-		var checkBoxTH = $('<th>');
-		checkBoxTH.html('');
-		
-		var scienceAreasTH = $('<th>');
-		scienceAreasTH.attr("id", "comparison-science-areas-th");
-		if (this.currentSelectedFilter === COMPARISON_TYPE.ORGANIZATION ) {
-			scienceAreasTH.html(i18nStrings.organizationString);
-		} else {
-			scienceAreasTH.html(i18nStrings.personString);
-		}
-		
-		var activityCountTH = $('<th width="53">');
-		activityCountTH.html('# ' + i18nStrings.numberOfPubs);
-		activityCountTH.attr("id", "activity-count-column");
-
-		tr.append(levelOfScienceAreaTH);
-		tr.append(checkBoxTH);
-		tr.append(scienceAreasTH);
-		tr.append(activityCountTH);
-		
-		thead.append(tr);
-		
-		table.append(thead);
-		
-		var tbody = $('<tbody id="comparisonTbody">');
-		
-		var rowsToInsert = [];
-		var i = 0;
-		
-		$.each(me.subEntities, function(index, item) {
-			rowsToInsert[i++] = '<tr id="' + index + '" style="color: grey;"><td>' + item.type + '</td>';
-			rowsToInsert[i++] = '<td><input class="chk" type="checkbox" value="' + index + '"/></td>';
-			rowsToInsert[i++] = '<td>' + item.label + '</td>';
-			rowsToInsert[i++] = '<td>' + item.pubs + '</td></tr>';
-		});
-		
-		tbody.append(rowsToInsert.join(''));
-
-		table.append(tbody);
-		me.tableDiv.append(table);
-		
-		table.children("tbody").children("tr").mouseenter(function() {
-			
-			var item = me.subEntities[$(this).attr("id")];
-			me.sciMapWidget.mouseIn(item.type, item.label);
-		});
-		
-		table.children("tbody").children("tr").mouseleave(function() {
-
-			var item = me.subEntities[$(this).attr("id")];
-			me.sciMapWidget.mouseOut(item.type, item.label);
-		});
-		
-		$('.chk').click(function() {
-			var element = $(this);
-			var index = element.attr("value");
-			var item = me.subEntities[index];
-			var color = "grey";
-			if (element.prop('checked')) {
-				if ($("input:checkbox[class=chk]:checked").length > 3) {
-					element.prop('checked', false);
-					alert(i18nStrings.maxNbrForComp);
-				} else {
-					me.loadEntity(item.uri, index);
-				}
-			} else {
-				me.unloadEntity(item.type, item.label, index);
-			}
-		});
-		
-		/*
-		 * GMAIL_STYLE_PAGINATION_CONTAINER_CLASS, ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER has to be declared 
-		 * for the filter & pagination to work properly.
-		 * */
-		GMAIL_STYLE_PAGINATION_CONTAINER_CLASS = me.dom.paginationContainerClass;
-		ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER = me.currentSelectedFilter;
-		
-		if($.inArray(disciplineOrSubdisciplineDataTableFilter, $.fn.dataTableExt.afnFiltering) < 0) {
-			$.fn.dataTableExt.afnFiltering.push(disciplineOrSubdisciplineDataTableFilter);
-		}
-		
-		me.widget = table.dataTable({
-		    "sDom": '<"' + me.dom.searchBarParentContainerClass 
-		    			+ '"f><"filterInfo"i><"' 
-		    			+ me.dom.paginationContainerClass + '"p><"table-separator"><"datatablewrapper"t>',
-		    "aaSorting": [
-		        [3, "desc"], [2,'asc']
-		    ],
-		    "asStripClasses": [],
-		    "aoColumns": [{ "bVisible": false, "bSearchable": false },
-		                  null,
-		                  null,
-		                  null], 
-		    "iDisplayLength": 10,
-		    "bInfo": true,
-		    "oLanguage": {
-				"sInfo": "_START_ - _END_ of _TOTAL_",
-				"sInfoEmpty": i18nStrings.noMatchingScienceAreas,
-				"sInfoFiltered": ""
-			},
-		    "sPaginationType": "gmail_style",
-		    "fnDrawCallback": function () {
-		    	
-		        /* We check whether max number of allowed comparisions (currently 10) is reached
-		         * here as well becasue the only function that is guaranteed to be called during 
-		         * page navigation is this. No need to bind it to the nav-buttons becuase 1. It is over-ridden
-		         * by built-in navigation events & this is much cleaner.
-		         * */
-//		        checkIfColorLimitIsReached();
-		    }
-		});
-		
-		/* Create search box */
-		var searchInputBox = $("." + me.dom.searchBarParentContainerClass).find("input[type=text]");
-		searchInputBox.css("width", "140px");
-		searchInputBox.after("<span id='comparison-reset-search' title='" + i18nStrings.clearSearchQuery + "'>X</span>" 
-								+ "<img class='comparisonFilterInfoIcon' id='comparisonSearchInfoIcon' src='" + infoIconUrl + "' alt='" + i18nStrings.infoIconString + "' title='' />");
-		$( document ).on('click', "#comparison-reset-search", function() {
-			me.widget.fnFilter("");
-		});
-		createToolTip($("#comparisonSearchInfoIcon"), $("#comparisonSearchInfoTooltipText").html(), "top left");
-		
-		/* Create csv download button */
-		var csvButton = '<hr class="subtle-hr"/><div id="main-science-areas-table-footer"><a href="' +
-						comparisonScienceMapCsvDataUrlPrefix + me.uri +
-						'" class="map-of-science-links">' + i18nStrings.saveAllAsCSV + '</a></div>';
-		me.tableDiv.append(csvButton);
-	},
-	changeFilter: function(filterType) {
-		var me = this;
-		if (filterType === COMPARISON_TYPE.ORGANIZATION) {
-			
-			$("#comparison-science-areas-th").html(i18nStrings.organizationString);
-			me.currentSelectedFilter = COMPARISON_TYPE.ORGANIZATION;
-		} else {
-			
-			$("#comparison-science-areas-th").html(i18nStrings.personString);
-			me.currentSelectedFilter = COMPARISON_TYPE.PERSON;
-			
-		}
-		
-		ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER = me.currentSelectedFilter;
-
-		if (me.widget) {
-			me.widget.fnDraw();
-			// load one item if no item is selected. Need to be improved
-			if ($("input:checkbox[class=chk]:checked").length == 0) {
-				$("input:checkbox[class=chk]").each(function(){
-					var item = me.subEntities[$(this).attr("value")];
-					if (item.type == me.currentSelectedFilter) {
-						// click event didn't work at this point???
-						$(this).click();
-						me.loadEntity(item.uri, $(this).attr("value"));
-						return false;
-					}
-				});
-			}
-		}
-	},
-	loadEntity: function(uri, index) {
-		
-		// Download data from server and add to markerManager if not gotten already
-		var me = this;
-		var url = scienceMapDataPrefix + uri;
-		downloader.downloadAndWait(url, function(data) {
-			me.sciMapWidget.loadEntity(data[0]);
-			
-			// This is ugly, need fix!!!
-			var color = me.sciMapWidget.getColor(me.currentSelectedFilter, me.subEntities[index].label);
-			$("#comparisonTbody > tr[id=" + index + "]").css("color", color);
-			me.entityTablesWidget.loadEntity(data[0], color);
-		});
-	},
-	unloadEntity: function(key, childKey, index) {
-		this.sciMapWidget.unloadEntity(key, childKey);
-		this.entityTablesWidget.unloadEntity(childKey);
-		
-		// This is ugly, need fix!!!
-		$("#comparisonTbody > tr[id=" + index + "]").css("color", "grey");
-	}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+$.extend(this, i18nStrings);
+
+var ComparisonDataTableWidget = Class.extend({
+
+	dom: {
+		firstFilterLabel: i18nStrings.organizationsString,
+		secondFilterLabel: i18nStrings.peopleString,
+
+		searchBarParentContainerClass : "comparisonSearchbar",
+		paginationContainerClass : "paginatedtabs",
+		containerID: "main-science-areas-table-container",
+		footerID: "main-science-areas-table-footer",
+		firstFilterID: "comparison-first-filter",
+		secondFilterID: "comparison-second-filter",
+		filterOptionClass: "comparison-filter-option",
+		activeFilterClass: "comparison-active-filter",
+		filterInfoIconClass: "comparisonFilterInfoIcon"
+	},
+	init: function(sciMapWidget, entityTablesWidget) {
+		var me = this;
+		me.sciMapWidget = sciMapWidget;
+		me.entityTablesWidget = entityTablesWidget;
+		me.widgetType = "COMPARISON_SCIENCE_AREAS";
+		me.currentSelectedFilter = COMPARISON_TYPE.ORGANIZATION;
+		me.widget = '';
+		me.tableDiv = $('<div />');
+		$("#" + me.dom.containerID).append(this.tableDiv);
+	},
+	loadJsonData: function(data) {
+
+		var me = this;
+		me.uri = data.uri;
+		me.label = data.label;
+		me.pubsWithNoJournals = data.pubsWithNoJournals;
+		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
+		me.pubsMapped = data.pubsMapped;
+		me.type = data.type;
+		me.subEntities = data.subEntities;
+
+		me.setupView();
+	},
+	hasKey: function(key) {
+		return (this.keyToMarkerManagers.hasOwnProperty(key));
+	},
+	show: function(key) {
+		this.tableDiv.show();
+	},
+	hide: function(key) {
+		this.tableDiv.hide();
+	},
+	cleanView: function() {
+		this.hide();
+	},
+	initView: function() {
+		this.show();
+		this.changeFilter(this.currentSelectedFilter);
+	},
+	setupView: function() {
+
+		var me = this;
+
+		/* Create filter */
+		var dom = me.dom;
+		var filter = $('<div class="science-areas-filter">' +
+	    	'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">' + dom.firstFilterLabel + '</span>'+
+	    	/* This is temporary removed due to the person's publications mapping rate is too low to be displayed.
+		    	' | ' +
+		    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">' + dom.secondFilterLabel + '</span>' +
+	    	*/
+	    	'<img class="' + dom.filterInfoIconClass + '" id="comparisonImageIconTwo" src="'+ infoIconUrl +'" alt="' + i18nStrings.infoIconString + '" title="" /></div>');
+		me.tableDiv.append(filter);
+		createToolTip($("#comparisonImageIconTwo"), $("#comparisonToolTipTwo").html(), "top left");
+		initFilter(dom);
+
+		/* Create table */
+		var table = $('<table>');
+		table.attr('id', 'comparisonDatatable');
+		table.addClass('datatable-table');
+
+		var thead = $('<thead>');
+		var tr = $('<tr>');
+
+		var levelOfScienceAreaTH = $('<th>');
+		levelOfScienceAreaTH.html(i18nStrings.entityTypeString);
+
+		var checkBoxTH = $('<th>');
+		checkBoxTH.html('');
+
+		var scienceAreasTH = $('<th>');
+		scienceAreasTH.attr("id", "comparison-science-areas-th");
+		if (this.currentSelectedFilter === COMPARISON_TYPE.ORGANIZATION ) {
+			scienceAreasTH.html(i18nStrings.organizationString);
+		} else {
+			scienceAreasTH.html(i18nStrings.personString);
+		}
+
+		var activityCountTH = $('<th width="53">');
+		activityCountTH.html('# ' + i18nStrings.numberOfPubs);
+		activityCountTH.attr("id", "activity-count-column");
+
+		tr.append(levelOfScienceAreaTH);
+		tr.append(checkBoxTH);
+		tr.append(scienceAreasTH);
+		tr.append(activityCountTH);
+
+		thead.append(tr);
+
+		table.append(thead);
+
+		var tbody = $('<tbody id="comparisonTbody">');
+
+		var rowsToInsert = [];
+		var i = 0;
+
+		$.each(me.subEntities, function(index, item) {
+			rowsToInsert[i++] = '<tr id="' + index + '" style="color: grey;"><td>' + item.type + '</td>';
+			rowsToInsert[i++] = '<td><input class="chk" type="checkbox" value="' + index + '"/></td>';
+			rowsToInsert[i++] = '<td>' + item.label + '</td>';
+			rowsToInsert[i++] = '<td>' + item.pubs + '</td></tr>';
+		});
+
+		tbody.append(rowsToInsert.join(''));
+
+		table.append(tbody);
+		me.tableDiv.append(table);
+
+		table.children("tbody").children("tr").mouseenter(function() {
+
+			var item = me.subEntities[$(this).attr("id")];
+			me.sciMapWidget.mouseIn(item.type, item.label);
+		});
+
+		table.children("tbody").children("tr").mouseleave(function() {
+
+			var item = me.subEntities[$(this).attr("id")];
+			me.sciMapWidget.mouseOut(item.type, item.label);
+		});
+
+		$('.chk').click(function() {
+			var element = $(this);
+			var index = element.attr("value");
+			var item = me.subEntities[index];
+			var color = "grey";
+			if (element.prop('checked')) {
+				if ($("input:checkbox[class=chk]:checked").length > 3) {
+					element.prop('checked', false);
+					alert(i18nStrings.maxNbrForComp);
+				} else {
+					me.loadEntity(item.uri, index);
+				}
+			} else {
+				me.unloadEntity(item.type, item.label, index);
+			}
+		});
+
+		/*
+		 * GMAIL_STYLE_PAGINATION_CONTAINER_CLASS, ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER has to be declared
+		 * for the filter & pagination to work properly.
+		 * */
+		GMAIL_STYLE_PAGINATION_CONTAINER_CLASS = me.dom.paginationContainerClass;
+		ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER = me.currentSelectedFilter;
+
+		if($.inArray(disciplineOrSubdisciplineDataTableFilter, $.fn.dataTableExt.afnFiltering) < 0) {
+			$.fn.dataTableExt.afnFiltering.push(disciplineOrSubdisciplineDataTableFilter);
+		}
+
+		me.widget = table.dataTable({
+		    "sDom": '<"' + me.dom.searchBarParentContainerClass
+		    			+ '"f><"filterInfo"i><"'
+		    			+ me.dom.paginationContainerClass + '"p><"table-separator"><"datatablewrapper"t>',
+		    "aaSorting": [
+		        [3, "desc"], [2,'asc']
+		    ],
+		    "asStripClasses": [],
+		    "aoColumns": [{ "bVisible": false, "bSearchable": false },
+		                  null,
+		                  null,
+		                  null],
+		    "iDisplayLength": 10,
+		    "bInfo": true,
+		    "oLanguage": {
+				"sInfo": "_START_ - _END_ of _TOTAL_",
+				"sInfoEmpty": i18nStrings.noMatchingScienceAreas,
+				"sInfoFiltered": ""
+			},
+		    "sPaginationType": "gmail_style",
+		    "fnDrawCallback": function () {
+
+		        /* We check whether max number of allowed comparisions (currently 10) is reached
+		         * here as well becasue the only function that is guaranteed to be called during
+		         * page navigation is this. No need to bind it to the nav-buttons becuase 1. It is over-ridden
+		         * by built-in navigation events & this is much cleaner.
+		         * */
+//		        checkIfColorLimitIsReached();
+		    }
+		});
+
+		/* Create search box */
+		var searchInputBox = $("." + me.dom.searchBarParentContainerClass).find("input[type=text]");
+		searchInputBox.css("width", "140px");
+		searchInputBox.after("<span id='comparison-reset-search' title='" + i18nStrings.clearSearchQuery + "'>X</span>"
+								+ "<img class='comparisonFilterInfoIcon' id='comparisonSearchInfoIcon' src='" + infoIconUrl + "' alt='" + i18nStrings.infoIconString + "' title='' />");
+		$( document ).on('click', "#comparison-reset-search", function() {
+			me.widget.fnFilter("");
+		});
+		createToolTip($("#comparisonSearchInfoIcon"), $("#comparisonSearchInfoTooltipText").html(), "top left");
+
+		/* Create csv download button */
+		var csvButton = '<hr class="subtle-hr"/><div id="main-science-areas-table-footer"><a href="' +
+						comparisonScienceMapCsvDataUrlPrefix + me.uri +
+						'" class="map-of-science-links">' + i18nStrings.saveAllAsCSV + '</a></div>';
+		me.tableDiv.append(csvButton);
+	},
+	changeFilter: function(filterType) {
+		var me = this;
+		if (filterType === COMPARISON_TYPE.ORGANIZATION) {
+
+			$("#comparison-science-areas-th").html(i18nStrings.organizationString);
+			me.currentSelectedFilter = COMPARISON_TYPE.ORGANIZATION;
+		} else {
+
+			$("#comparison-science-areas-th").html(i18nStrings.personString);
+			me.currentSelectedFilter = COMPARISON_TYPE.PERSON;
+
+		}
+
+		ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER = me.currentSelectedFilter;
+
+		if (me.widget) {
+			me.widget.fnDraw();
+			// load one item if no item is selected. Need to be improved
+			if ($("input:checkbox[class=chk]:checked").length == 0) {
+				$("input:checkbox[class=chk]").each(function(){
+					var item = me.subEntities[$(this).attr("value")];
+					if (item.type == me.currentSelectedFilter) {
+						// click event didn't work at this point???
+						$(this).click();
+						me.loadEntity(item.uri, $(this).attr("value"));
+						return false;
+					}
+				});
+			}
+		}
+	},
+	loadEntity: function(uri, index) {
+
+		// Download data from server and add to markerManager if not gotten already
+		var me = this;
+		var url = scienceMapDataPrefix + uri;
+		downloader.downloadAndWait(url, function(data) {
+			me.sciMapWidget.loadEntity(data[0]);
+
+			// This is ugly, need fix!!!
+			var color = me.sciMapWidget.getColor(me.currentSelectedFilter, me.subEntities[index].label);
+			$("#comparisonTbody > tr[id=" + index + "]").css("color", color);
+			me.entityTablesWidget.loadEntity(data[0], color);
+		});
+	},
+	unloadEntity: function(key, childKey, index) {
+		this.sciMapWidget.unloadEntity(key, childKey);
+		this.entityTablesWidget.unloadEntity(childKey);
+
+		// This is ugly, need fix!!!
+		$("#comparisonTbody > tr[id=" + index + "]").css("color", "grey");
+	}
 });
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js
index 8b36d59738..5237b14a75 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js
@@ -1,267 +1,267 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-$.extend(this, i18nStrings);
-
-COMPARISON = {
-	"one":{ "name": "one", "color": "#99CC00"},
-	"two":{ "name": "two", "color": "#FF9900"},
-	"three":{ "name": "three", "color": "#3399FF"}
-}
-
-COMPARISON_TYPE = {
-	"ORGANIZATION": "ORGANIZATION",
-	"PERSON": "PERSON"
-}
-
-var ManagerRegistry = Class.extend({
-	init: function(itemArray) {
-		this.occupied = {};
-		this.availability = itemArray;
-	},
-	register: function(key) {
-		var me = this;
-		if (me.occupied[key] == null && me.isAvailable()) {
-			me.occupied[key] = me.availability.pop();
-		}
-		
-		return me.occupied[key];
-	},
-	unregister: function(key) {
-		var me = this;
-		var item = me.occupied[key];
-		if (item) {
-			me.availability.push(me.occupied[key]);
-			delete me.occupied[key];
-		}
-		
-		return item;
-	},
-	isAvailable: function() {
-		return (this.availability.length != 0);
-	}
-});
-
-var ComparisonScimapWidget = Class.extend({
-	init: function(map) {
-		var me = this;
-		me.activeCompositeManager = null;
-		me.map = map;
-		me.initView();
-	},
-	initView: function(){
-		var me = this;
-		me.initControlPanels();
-		me.initMarkerManagers();
-		me.show(COMPARISON_TYPE.ORGANIZATION);
-		this.activeCompositeManager.addManagersToMap();
-		this.updateDisplayedMarkers();
-	},
-	cleanView: function() {
-		var me = this;
-		me._cleanUpManagers();
-		me.sliderControl.removeFromMap();
-		me.disciplineLabelsControl.removeFromMap();
-		me.labelsMarkerManager.removeMarkersFromMap();
-	},
-	initControlPanels: function() {
-		var me = this;
-		
-		/* Create slider control panel */
-		if (me.sliderControl == null) {
-			me.sliderControl = new SliderControlPanel({ 
-				map:me.map, 
-				controlPositions: google.maps.ControlPosition.RIGHT_BOTTOM
-			});
-		}
-		
-		/* Register event */
-		me.sliderControl.addToMap();
-		me.sliderControl.setChangeEventHandler(function(event, ui) {
-			if (me.keyToCompositeManager) {
-				me.updateDisplayedMarkers();
-			}
-		});
-		
-		/* create */
-		if (me.disciplineLabelsControl == null) {
-			me.labelsMarkerManager = new DisciplineLabelsMarkerManager(map, getDisciplineBlackLabelImageURL);
-			me.disciplineLabelsControl = new CheckBoxPanel({ 
-				map: map,
-				checked: true,
-				text: i18nStrings.showDisciplineLabels,
-				click: function() {
-					if($(this).prop('checked')) {
-						me.labelsMarkerManager.showMarkers();
-					} else {
-						me.labelsMarkerManager.hideMarkers();
-					}
-				}
-			});
-		}
-		
-		/* Display labels if checked */
-		me.disciplineLabelsControl.addToMap();
-		me.labelsMarkerManager.addMarkersToMap();
-		if (me.disciplineLabelsControl.isChecked()) {
-			me.labelsMarkerManager.showMarkers();
-		}
-	},
-	initMarkerManagers: function() {
-		if (this.keyToCompositeManager == null) {
-			
-			// Create all the marker managers
-			var me = this;
-			me.keyToCompositeManager = {};
-			$.each(COMPARISON_TYPE, function(type, value) {
-				var managerArray = [];
-				
-				$.each(COMPARISON, function(key, attrs) {
-					var manager = new SubdisciplineMarkerManager(
-						me.map,
-						new SingleColorStrategy(attrs.color), 
-						null
-					);
-					manager.color = attrs.color;
-					managerArray.push(manager);
-				});
-				me.keyToCompositeManager[type] = new CompositeMarkerManager();
-				me.keyToCompositeManager[type].registry = new ManagerRegistry(managerArray);
-			});
-		}
-	},
-	loadJsonData: function(data) {
-	},
-	loadEntity: function(data) {
-		var me = this;
-		me.uri = data.uri;
-		me.label = data.label;
-		me.pubsWithNoJournals = data.pubsWithNoJournals;
-		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
-		me.pubsMapped = data.pubsMapped;
-		
-		var scienceActivities = data.subdisciplineActivity;
-		
-		var childKey = data.label;
-		var compositeManager = me.getCompositeManager(data.type);
-		// Avoid reload if data was loaded
-		if (compositeManager.hasKey(childKey)) {
-			me.updateMap();
-		} else {
-			var manager = compositeManager.registry.register(childKey);
-			if (manager) {
-				// clean previous markers
-				manager.removeAll();
-				
-				// Need to create the AreaSizeCoding function
-				manager.setSizeCoder(new CircleSizeCoder({ 
-					scaler: new Scaler({ maxValue: me.pubsMapped }) 
-				}));
-				
-				$.each(scienceActivities, function(science, density) {
-			
-					// Create marker and add it to manager
-					manager.createMarker(science, density);
-					
-				}); // end each scienceActivity
-				manager.sort();
-				
-				compositeManager.addManager(childKey, manager);
-				me.updateMap();
-			}
-		}
-	},
-	unloadEntity: function(key, childKey) {
-		this.removeManager(key, childKey);
-	},
-	getCompositeManager: function(key) {
-		return this.keyToCompositeManager[key];
-	},
-	mouseIn: function(key, childKey) {
-		var compositeManager = this.getCompositeManager(key);
-		
-		// Focus if only it is a valid manager
-		if (compositeManager == this.activeCompositeManager) {
-			// Focus all
-			compositeManager.mouseIn(childKey);
-		}
-	},
-	mouseOut: function(key, childKey) {
-		var compositeManager = this.getCompositeManager(key);
-		
-		// Unfocus if only it is a valid manager
-		if (compositeManager == this.activeCompositeManager) {
-			// Unfocus all
-			compositeManager.mouseOut(childKey);
-		}
-	},
-	mouseInNode: function(key, childKey, subdisciplineId) {
-		var compositeManager = this.getCompositeManager(key);
-		// Focus if only it is a valid manager
-		if (compositeManager == this.activeCompositeManager) {
-			// Focus all
-			compositeManager.registry.register(childKey).mouseIn(subdisciplineId);
-		}
-	},
-	mouseOutNode: function(key, childKey, subdisciplineId) {
-		var compositeManager = this.getCompositeManager(key);
-		
-		// Unfocus if only it is a valid manager
-		if (compositeManager == this.activeCompositeManager) {
-			compositeManager.registry.register(childKey).mouseOut(subdisciplineId);
-		}
-	},
-	removeManager: function(key, childKey) {
-		var compositeManager = this.getCompositeManager(key);
-		
-		// Remove manager
-		if (compositeManager == this.activeCompositeManager) {
-			this.activeCompositeManager.removeManager(childKey);
-			this.activeCompositeManager.registry.unregister(childKey);
-		}
-	},
-	show: function(key) {
-		var compositeManager = this.getCompositeManager(key);
-		if (compositeManager) {
-			this._switchActiveCompositeManager(compositeManager);
-		}
-	},
-	hide: function(key) {
-		var compositeManager = this.getCompositeManager(key);
-		if (this.activeCompositeManager == compositeManager) {
-			this._cleanupMarkers();
-		}
-	},
-	_switchActiveCompositeManager: function(compositeManager) {
-		if (this.activeCompositeManager != compositeManager) {
-			this._cleanUpManagers();
-			compositeManager.addManagersToMap();
-			this.activeCompositeManager = compositeManager;
-			this.updateMap();
-		}
-	},
-	_cleanUpManagers: function() {
-		if (this.activeCompositeManager) {
-			this.activeCompositeManager.removeManagersFromMap();
-			INFO_WINDOW.close();
-		}
-	},
-	updateDisplayedMarkers: function() {
-		this.activeCompositeManager.display(this.sliderControl.getValue());
-	},
-	updateMap: function() {
-		var compositeManager = this.activeCompositeManager;
-		if (compositeManager) {
-			var length = compositeManager.length();
-			var slider = this.sliderControl;
-			slider.setTypeString(i18nStrings.subdisciplinesLower);
-			slider.setMin(Math.min(1, length));
-			slider.setMax(length);
-			slider.setValue(length);
-		}
-	},
-	changeFilter: function(filterType) {
-		this.show(filterType);
-	},
-	getColor: function(key, childKey) {
-		return this.getCompositeManager(key).registry.register(childKey).color;
-	}
-});
+/* $This file is distributed under the terms of the license in LICENSE$ */
+$.extend(this, i18nStrings);
+
+COMPARISON = {
+	"one":{ "name": "one", "color": "#99CC00"},
+	"two":{ "name": "two", "color": "#FF9900"},
+	"three":{ "name": "three", "color": "#3399FF"}
+}
+
+COMPARISON_TYPE = {
+	"ORGANIZATION": "ORGANIZATION",
+	"PERSON": "PERSON"
+}
+
+var ManagerRegistry = Class.extend({
+	init: function(itemArray) {
+		this.occupied = {};
+		this.availability = itemArray;
+	},
+	register: function(key) {
+		var me = this;
+		if (me.occupied[key] == null && me.isAvailable()) {
+			me.occupied[key] = me.availability.pop();
+		}
+
+		return me.occupied[key];
+	},
+	unregister: function(key) {
+		var me = this;
+		var item = me.occupied[key];
+		if (item) {
+			me.availability.push(me.occupied[key]);
+			delete me.occupied[key];
+		}
+
+		return item;
+	},
+	isAvailable: function() {
+		return (this.availability.length != 0);
+	}
+});
+
+var ComparisonScimapWidget = Class.extend({
+	init: function(map) {
+		var me = this;
+		me.activeCompositeManager = null;
+		me.map = map;
+		me.initView();
+	},
+	initView: function(){
+		var me = this;
+		me.initControlPanels();
+		me.initMarkerManagers();
+		me.show(COMPARISON_TYPE.ORGANIZATION);
+		this.activeCompositeManager.addManagersToMap();
+		this.updateDisplayedMarkers();
+	},
+	cleanView: function() {
+		var me = this;
+		me._cleanUpManagers();
+		me.sliderControl.removeFromMap();
+		me.disciplineLabelsControl.removeFromMap();
+		me.labelsMarkerManager.removeMarkersFromMap();
+	},
+	initControlPanels: function() {
+		var me = this;
+
+		/* Create slider control panel */
+		if (me.sliderControl == null) {
+			me.sliderControl = new SliderControlPanel({
+				map:me.map,
+				controlPositions: google.maps.ControlPosition.RIGHT_BOTTOM
+			});
+		}
+
+		/* Register event */
+		me.sliderControl.addToMap();
+		me.sliderControl.setChangeEventHandler(function(event, ui) {
+			if (me.keyToCompositeManager) {
+				me.updateDisplayedMarkers();
+			}
+		});
+
+		/* create */
+		if (me.disciplineLabelsControl == null) {
+			me.labelsMarkerManager = new DisciplineLabelsMarkerManager(map, getDisciplineBlackLabelImageURL);
+			me.disciplineLabelsControl = new CheckBoxPanel({
+				map: map,
+				checked: true,
+				text: i18nStrings.showDisciplineLabels,
+				click: function() {
+					if($(this).prop('checked')) {
+						me.labelsMarkerManager.showMarkers();
+					} else {
+						me.labelsMarkerManager.hideMarkers();
+					}
+				}
+			});
+		}
+
+		/* Display labels if checked */
+		me.disciplineLabelsControl.addToMap();
+		me.labelsMarkerManager.addMarkersToMap();
+		if (me.disciplineLabelsControl.isChecked()) {
+			me.labelsMarkerManager.showMarkers();
+		}
+	},
+	initMarkerManagers: function() {
+		if (this.keyToCompositeManager == null) {
+
+			// Create all the marker managers
+			var me = this;
+			me.keyToCompositeManager = {};
+			$.each(COMPARISON_TYPE, function(type, value) {
+				var managerArray = [];
+
+				$.each(COMPARISON, function(key, attrs) {
+					var manager = new SubdisciplineMarkerManager(
+						me.map,
+						new SingleColorStrategy(attrs.color),
+						null
+					);
+					manager.color = attrs.color;
+					managerArray.push(manager);
+				});
+				me.keyToCompositeManager[type] = new CompositeMarkerManager();
+				me.keyToCompositeManager[type].registry = new ManagerRegistry(managerArray);
+			});
+		}
+	},
+	loadJsonData: function(data) {
+	},
+	loadEntity: function(data) {
+		var me = this;
+		me.uri = data.uri;
+		me.label = data.label;
+		me.pubsWithNoJournals = data.pubsWithNoJournals;
+		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
+		me.pubsMapped = data.pubsMapped;
+
+		var scienceActivities = data.subdisciplineActivity;
+
+		var childKey = data.label;
+		var compositeManager = me.getCompositeManager(data.type);
+		// Avoid reload if data was loaded
+		if (compositeManager.hasKey(childKey)) {
+			me.updateMap();
+		} else {
+			var manager = compositeManager.registry.register(childKey);
+			if (manager) {
+				// clean previous markers
+				manager.removeAll();
+
+				// Need to create the AreaSizeCoding function
+				manager.setSizeCoder(new CircleSizeCoder({
+					scaler: new Scaler({ maxValue: me.pubsMapped })
+				}));
+
+				$.each(scienceActivities, function(science, density) {
+
+					// Create marker and add it to manager
+					manager.createMarker(science, density);
+
+				}); // end each scienceActivity
+				manager.sort();
+
+				compositeManager.addManager(childKey, manager);
+				me.updateMap();
+			}
+		}
+	},
+	unloadEntity: function(key, childKey) {
+		this.removeManager(key, childKey);
+	},
+	getCompositeManager: function(key) {
+		return this.keyToCompositeManager[key];
+	},
+	mouseIn: function(key, childKey) {
+		var compositeManager = this.getCompositeManager(key);
+
+		// Focus if only it is a valid manager
+		if (compositeManager == this.activeCompositeManager) {
+			// Focus all
+			compositeManager.mouseIn(childKey);
+		}
+	},
+	mouseOut: function(key, childKey) {
+		var compositeManager = this.getCompositeManager(key);
+
+		// Unfocus if only it is a valid manager
+		if (compositeManager == this.activeCompositeManager) {
+			// Unfocus all
+			compositeManager.mouseOut(childKey);
+		}
+	},
+	mouseInNode: function(key, childKey, subdisciplineId) {
+		var compositeManager = this.getCompositeManager(key);
+		// Focus if only it is a valid manager
+		if (compositeManager == this.activeCompositeManager) {
+			// Focus all
+			compositeManager.registry.register(childKey).mouseIn(subdisciplineId);
+		}
+	},
+	mouseOutNode: function(key, childKey, subdisciplineId) {
+		var compositeManager = this.getCompositeManager(key);
+
+		// Unfocus if only it is a valid manager
+		if (compositeManager == this.activeCompositeManager) {
+			compositeManager.registry.register(childKey).mouseOut(subdisciplineId);
+		}
+	},
+	removeManager: function(key, childKey) {
+		var compositeManager = this.getCompositeManager(key);
+
+		// Remove manager
+		if (compositeManager == this.activeCompositeManager) {
+			this.activeCompositeManager.removeManager(childKey);
+			this.activeCompositeManager.registry.unregister(childKey);
+		}
+	},
+	show: function(key) {
+		var compositeManager = this.getCompositeManager(key);
+		if (compositeManager) {
+			this._switchActiveCompositeManager(compositeManager);
+		}
+	},
+	hide: function(key) {
+		var compositeManager = this.getCompositeManager(key);
+		if (this.activeCompositeManager == compositeManager) {
+			this._cleanupMarkers();
+		}
+	},
+	_switchActiveCompositeManager: function(compositeManager) {
+		if (this.activeCompositeManager != compositeManager) {
+			this._cleanUpManagers();
+			compositeManager.addManagersToMap();
+			this.activeCompositeManager = compositeManager;
+			this.updateMap();
+		}
+	},
+	_cleanUpManagers: function() {
+		if (this.activeCompositeManager) {
+			this.activeCompositeManager.removeManagersFromMap();
+			INFO_WINDOW.close();
+		}
+	},
+	updateDisplayedMarkers: function() {
+		this.activeCompositeManager.display(this.sliderControl.getValue());
+	},
+	updateMap: function() {
+		var compositeManager = this.activeCompositeManager;
+		if (compositeManager) {
+			var length = compositeManager.length();
+			var slider = this.sliderControl;
+			slider.setTypeString(i18nStrings.subdisciplinesLower);
+			slider.setMin(Math.min(1, length));
+			slider.setMax(length);
+			slider.setValue(length);
+		}
+	},
+	changeFilter: function(filterType) {
+		this.show(filterType);
+	},
+	getColor: function(key, childKey) {
+		return this.getCompositeManager(key).registry.register(childKey).color;
+	}
+});
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js b/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js
index 0326052775..e7c49c00a6 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js
@@ -1,168 +1,168 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-var ControlPanel = Class.extend({
-	init: function(options) {
-		this.options = $.extend({}, this.options, options);
-		this.initDiv();
-	},
-	options: {
-		divClass: null, // use this to set absolute position and style
-		controlPositions: google.maps.ControlPosition.RIGHT_TOP, // Refer to API for alternative value
-		map: null, // map to be add to
-		jQueryDiv: null // add custom div
-	},
-	initDiv: function() {
-		var opt = this.options;
-		if (opt.jQueryDiv == null) {
-			opt.jQueryDiv = $(document.createElement('div'));
-		}
-		
-		if (opt.divClass) {
-			opt.jQueryDiv.addClass(opt.divClass);
-		}
-		this.div = opt.jQueryDiv[0];
-	},
-	getDiv: function() {
-		/* Allow to edit everything start from div level by returning div jquery object */
-		return this.options.jQueryDiv;
-	},
-	hide: function() {
-		var div = this.div;
-		if (div) {
-			div.style.display = "none";
-		}
-	},
-	show: function() {
-		var div = this.div;
-		if (div) {
-			div.style.display = "block";
-		}
-	},
-	addToMap: function() {
-		var opt = this.options;
-		opt.map.controls[opt.controlPositions].push(this.div);
-	},
-	removeFromMap: function() {
-		var opt = this.options;
-		opt.map.controls[opt.controlPositions].pop();
-	}
-});
-
-var SliderControlPanel = ControlPanel.extend({
-	init: function(options) {
-		this._super(options);
-		this.initSlider();
-	},
-	initSlider: function() {
-		var me = this;
-		me.typeString = "";
-		var label = $("<div />").width(150).css("font-size", "75%").css("text-align", "center").text("");
-		var slider = $("<div />").width(150).css("font-size","60%");
-		slider.slider({
-			slide:  function(event, ui) {
-		    	me._setLabel(ui.value);
-		    }
-		});
-		
-		this.sliderDiv = slider;
-		this.labelDiv = label;
-		
-		var div = me.getDiv();
-		div.css("margin-right", "10px");
-		div.append(label);
-		div.append(slider);
-	},
-	getValue: function () {
-		return this.sliderDiv.slider( "option", "value" );
-	},
-	setMin: function(min) {
-		this.sliderDiv.slider({
-			min: min
-		});
-	},
-	setMax: function(max) {
-		this.sliderDiv.slider({
-			max: max
-		});
-	},
-	setValue: function(value) {
-		this.sliderDiv.slider({
-			value: value
-		});
-		this._setLabel(value);
-	},
-	setTypeString: function(typeString) {
-		this.typeString = typeString;
-	},
-	_setLabel: function(value) {
-		var labelText = "Top " + value + " " + this.typeString + " shown";
-        this.labelDiv.text(labelText);
-	},
-	setChangeEventHandler: function(handlerFunc) {
-		this.sliderDiv.slider({ 
-			change: handlerFunc
-		});
-	}
-});
-
-/**
- * options
- * map - Container map to be added
- * click - Handler function for click event
- * text - Description of the check Box
- */
-var CheckBoxPanel = ControlPanel.extend({
-	init: function(options) {
-		this._super(options);
-		this.initCheckBox();
-	},
-	initCheckBox: function() {
-		var me = this;
-		var description
-		var text = me.options.text;
-		var checkBox = $('<input type="checkbox"><span style="font-size: 75%; vertical-align: text-top">'
-				+ text
-				+ '</span></input>'
-			);
-		me.checkBox = checkBox;
-		
-		var div = me.getDiv();
-		div.css("margin-right", "10px");
-		div.append(checkBox);
-		
-		me.checkBox.prop('checked', me.options.checked);
-		/* Init contents if it is given */
-		var click = me.options.click;
-		if (click) {
-			me.click(click);
-		}
-	},
-	click: function(handlerFunc) {
-		this.checkBox.click(handlerFunc);
-	},
-	isChecked: function() {
-		return this.checkBox.prop('checked');
-	}
-});
-
-/**
- * Copyright
- */
-var CopyrightPanel = ControlPanel.extend({
-	init: function(options) {
-		this._super(options);
-		this.initCopyRight();
-		this.addToMap();
-	},
-	initCopyRight: function() {
-		var me = this;
-		var html = me.options.html;
-		var copyright = $("<div />").css("padding", "0px 5px 2px 5px").css("font-size", "75%").css("text-align", "center");
-		if (html) {
-			copyright.html(html);
-		}
-		me.copyright = copyright;
-		
-		me.getDiv().append(copyright);
-	}
-});
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+var ControlPanel = Class.extend({
+	init: function(options) {
+		this.options = $.extend({}, this.options, options);
+		this.initDiv();
+	},
+	options: {
+		divClass: null, // use this to set absolute position and style
+		controlPositions: google.maps.ControlPosition.RIGHT_TOP, // Refer to API for alternative value
+		map: null, // map to be add to
+		jQueryDiv: null // add custom div
+	},
+	initDiv: function() {
+		var opt = this.options;
+		if (opt.jQueryDiv == null) {
+			opt.jQueryDiv = $(document.createElement('div'));
+		}
+
+		if (opt.divClass) {
+			opt.jQueryDiv.addClass(opt.divClass);
+		}
+		this.div = opt.jQueryDiv[0];
+	},
+	getDiv: function() {
+		/* Allow to edit everything start from div level by returning div jquery object */
+		return this.options.jQueryDiv;
+	},
+	hide: function() {
+		var div = this.div;
+		if (div) {
+			div.style.display = "none";
+		}
+	},
+	show: function() {
+		var div = this.div;
+		if (div) {
+			div.style.display = "block";
+		}
+	},
+	addToMap: function() {
+		var opt = this.options;
+		opt.map.controls[opt.controlPositions].push(this.div);
+	},
+	removeFromMap: function() {
+		var opt = this.options;
+		opt.map.controls[opt.controlPositions].pop();
+	}
+});
+
+var SliderControlPanel = ControlPanel.extend({
+	init: function(options) {
+		this._super(options);
+		this.initSlider();
+	},
+	initSlider: function() {
+		var me = this;
+		me.typeString = "";
+		var label = $("<div />").width(150).css("font-size", "75%").css("text-align", "center").text("");
+		var slider = $("<div />").width(150).css("font-size","60%");
+		slider.slider({
+			slide:  function(event, ui) {
+		    	me._setLabel(ui.value);
+		    }
+		});
+
+		this.sliderDiv = slider;
+		this.labelDiv = label;
+
+		var div = me.getDiv();
+		div.css("margin-right", "10px");
+		div.append(label);
+		div.append(slider);
+	},
+	getValue: function () {
+		return this.sliderDiv.slider( "option", "value" );
+	},
+	setMin: function(min) {
+		this.sliderDiv.slider({
+			min: min
+		});
+	},
+	setMax: function(max) {
+		this.sliderDiv.slider({
+			max: max
+		});
+	},
+	setValue: function(value) {
+		this.sliderDiv.slider({
+			value: value
+		});
+		this._setLabel(value);
+	},
+	setTypeString: function(typeString) {
+		this.typeString = typeString;
+	},
+	_setLabel: function(value) {
+		var labelText = "Top " + value + " " + this.typeString + " shown";
+        this.labelDiv.text(labelText);
+	},
+	setChangeEventHandler: function(handlerFunc) {
+		this.sliderDiv.slider({
+			change: handlerFunc
+		});
+	}
+});
+
+/**
+ * options
+ * map - Container map to be added
+ * click - Handler function for click event
+ * text - Description of the check Box
+ */
+var CheckBoxPanel = ControlPanel.extend({
+	init: function(options) {
+		this._super(options);
+		this.initCheckBox();
+	},
+	initCheckBox: function() {
+		var me = this;
+		var description
+		var text = me.options.text;
+		var checkBox = $('<input type="checkbox"><span style="font-size: 75%; vertical-align: text-top">'
+				+ text
+				+ '</span></input>'
+			);
+		me.checkBox = checkBox;
+
+		var div = me.getDiv();
+		div.css("margin-right", "10px");
+		div.append(checkBox);
+
+		me.checkBox.prop('checked', me.options.checked);
+		/* Init contents if it is given */
+		var click = me.options.click;
+		if (click) {
+			me.click(click);
+		}
+	},
+	click: function(handlerFunc) {
+		this.checkBox.click(handlerFunc);
+	},
+	isChecked: function() {
+		return this.checkBox.prop('checked');
+	}
+});
+
+/**
+ * Copyright
+ */
+var CopyrightPanel = ControlPanel.extend({
+	init: function(options) {
+		this._super(options);
+		this.initCopyRight();
+		this.addToMap();
+	},
+	initCopyRight: function() {
+		var me = this;
+		var html = me.options.html;
+		var copyright = $("<div />").css("padding", "0px 5px 2px 5px").css("font-size", "75%").css("text-align", "center");
+		if (html) {
+			copyright.html(html);
+		}
+		me.copyright = copyright;
+
+		me.getDiv().append(copyright);
+	}
+});
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js b/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js
index 0096ffe641..913a480993 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js
@@ -1,65 +1,65 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-var ScinodePolygon = CirclePolygon.extend({
-	init: function(options) {
-		this._super(options);
-		this.hide();
-	},
-	setValue: function(value) {
-		this.polygon.value = value;
-	},
-	getValue: function() {
-		return this.polygon.value;
-	},
-	setSize: function(size) {
-		this.setRadius(size);
-		this.setZIndex(-size);
-	},
-	focus: function() {
-		this.setOptions({strokeWeight: 1.2, strokeColor: '#000'});
-	},
-	unfocus: function() {
-		this.setOptions({strokeWeight: 1.0, strokeColor: '#808080'});
-	},
-	setContent: function(content) {
-		this.polygon.content = content;
-	},
-	registerEvents : function() {
-		var me = this;
-		var polygon = me.polygon;
-		me._super();
-		
-		me.registerEvent(addClickListener(polygon, function() {
-			INFO_WINDOW.setPosition(this.center);
-			var content = this.content;
-			INFO_WINDOW.setContent(content);
-			INFO_WINDOW.open(this.map);
-		}));
-		
-		me.registerEvent(addMouseOverListener(polygon, function() {
-			me.focus();
-		}));
-		
-		me.registerEvent(addMouseOutListener(polygon, function() {
-			me.unfocus();
-		}));
-	}
-});
-
-function createScinodeMarker(map, label, value, radius, color, latlng) {
-	var circleOptions = {
-		label: label,
-		value: value,
-		strokeColor: '#808080',
-		strokeOpacity: 1.0,
-		strokeWeight: 1.0,
-		fillColor: color,
-		fillOpacity: 0.9,
-		map: map,
-		center: latlng,
-		zIndex: -radius,
-		radius: radius // min: 10000, max: 2500000
-	};
-	
-	return new ScinodePolygon(circleOptions);
-}
-
+/* $This file is distributed under the terms of the license in LICENSE$ */
+var ScinodePolygon = CirclePolygon.extend({
+	init: function(options) {
+		this._super(options);
+		this.hide();
+	},
+	setValue: function(value) {
+		this.polygon.value = value;
+	},
+	getValue: function() {
+		return this.polygon.value;
+	},
+	setSize: function(size) {
+		this.setRadius(size);
+		this.setZIndex(-size);
+	},
+	focus: function() {
+		this.setOptions({strokeWeight: 1.2, strokeColor: '#000'});
+	},
+	unfocus: function() {
+		this.setOptions({strokeWeight: 1.0, strokeColor: '#808080'});
+	},
+	setContent: function(content) {
+		this.polygon.content = content;
+	},
+	registerEvents : function() {
+		var me = this;
+		var polygon = me.polygon;
+		me._super();
+
+		me.registerEvent(addClickListener(polygon, function() {
+			INFO_WINDOW.setPosition(this.center);
+			var content = this.content;
+			INFO_WINDOW.setContent(content);
+			INFO_WINDOW.open(this.map);
+		}));
+
+		me.registerEvent(addMouseOverListener(polygon, function() {
+			me.focus();
+		}));
+
+		me.registerEvent(addMouseOutListener(polygon, function() {
+			me.unfocus();
+		}));
+	}
+});
+
+function createScinodeMarker(map, label, value, radius, color, latlng) {
+	var circleOptions = {
+		label: label,
+		value: value,
+		strokeColor: '#808080',
+		strokeOpacity: 1.0,
+		strokeWeight: 1.0,
+		fillColor: color,
+		fillOpacity: 0.9,
+		map: map,
+		center: latlng,
+		zIndex: -radius,
+		radius: radius // min: 10000, max: 2500000
+	};
+
+	return new ScinodePolygon(circleOptions);
+}
+
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js b/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js
index 7e9bc57618..05e6d397de 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js
@@ -1,82 +1,82 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-var DISCIPLINES = {"11": {"labelLongitude": -154.60900000000001, "color": "#A819FA", "image": "mathphys.png", "longitude": -129.375, "label": "Math & Physics", "labelLatitude": 82.645889999999994, "latitude": 81.850399999999993}, "10": {"labelLongitude": 30.34375, "color": "#B8150B", "image": "infect.png", "longitude": 47.109375, "label": "Infectious Diseases", "labelLatitude": 49.801349999999999, "latitude": 55.881900000000002}, "13": {"labelLongitude": 120.0, "color": "#FFFF00", "image": "socsci.png", "longitude": 164.53125, "label": "Social Sciences", "labelLatitude": 46.0, "latitude": 61.695430000000002}, "12": {"labelLongitude": 101.5, "color": "#FF804D", "image": "health.png", "longitude": 76.641000000000005, "label": "Health Professionals", "labelLatitude": 84.591988000000001, "latitude": 83.217100000000002}, "1": {"labelLongitude": 10.4375, "color": "#379908", "image": "bio.png", "longitude": -19.6875, "label": "Biology", "labelLatitude": -20.576339999999998, "latitude": 1.593542}, "3": {"labelLongitude": 30.914000000000001, "color": "#FF0000", "image": "medspec.png", "longitude": 44.296875, "label": "Medical Specialties", "labelLatitude": 78.219527999999997, "latitude": 71.360810000000001}, "2": {"labelLongitude": -35.375, "color": "#00FF80", "image": "biotech.png", "longitude": 0.0, "label": "Biotechnology", "labelLatitude": 64.093400000000003, "latitude": 48.582349999999998}, "5": {"labelLongitude": -42.890000000000001, "color": "#0000FF", "image": "chem.png", "longitude": -45.703099999999999, "label": "Chemistry", "labelLatitude": 85.499639999999999, "latitude": 81.648629999999997}, "4": {"labelLongitude": -63.719999999999999, "color": "#61FFFF", "image": "chemeng.png", "longitude": -74.53125, "label": "Chemical, Mechanical, & Civil Engineering", "labelLatitude": 37.326900000000002, "latitude": 57.804189999999998}, "7": {"labelLongitude": -102.3125, "color": "#FF85FF", "image": "eecs.png", "longitude": -144.140625, "label": "Electrical Engineering & Computer Science", "labelLatitude": 71.558999999999997, "latitude": 75.890950000000004}, "6": {"labelLongitude": -75.078000000000003, "color": "#A71916", "image": "earthsci.png", "longitude": -52.734375, "label": "Earth Sciences", "labelLatitude": -37.3093, "latitude": -19.797000000000001}, "9": {"labelLongitude": 130.17099999999999, "color": "#FFFF80", "image": "human.png", "longitude": 163.125, "label": "Humanities", "labelLatitude": -20.454179, "latitude": -14.42333}, "8": {"labelLongitude": 75.078000000000003, "color": "#FFB529", "image": "brain.png", "longitude": 99.84375, "label": "Brain Research", "labelLatitude": 64.4636, "latitude": 68.724699999999999}};
-var SUBDISCIPLINES = {"344": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -92.109375, "label": "Printing"}, "345": {"latitude": 12.554563999999999, "discipline": "1", "longitude": -16.875, "label": "Genetics"}, "346": {"latitude": 74.402163000000002, "discipline": "4", "longitude": -94.21875, "label": "Industrial Chemistry"}, "347": {"latitude": 77.617709000000005, "discipline": "12", "longitude": 56.25, "label": "Obesity"}, "340": {"latitude": 11.178402, "discipline": "1", "longitude": 8.4375, "label": "Parasitology"}, "341": {"latitude": 54.162433999999998, "discipline": "10", "longitude": -1.40625, "label": "Dairy Science"}, "342": {"latitude": 42.553080000000001, "discipline": "4", "longitude": -65.390625, "label": "Water Policy"}, "343": {"latitude": -7.013668, "discipline": "1", "longitude": -38.671875, "label": "Fish Research"}, "348": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Literary Criticism"}, "349": {"latitude": 31.952162000000001, "discipline": "3", "longitude": 40.78125, "label": "Hepatology"}, "298": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 89.296875, "label": "AIDS Treatment"}, "299": {"latitude": 77.312520000000006, "discipline": "7", "longitude": -140.625, "label": "Wireless Communication"}, "296": {"latitude": 67.609221000000005, "discipline": "4", "longitude": -99.84375, "label": "Vehicle System Design"}, "297": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 35.859375, "label": "Transfusion"}, "294": {"latitude": 27.683527999999999, "discipline": "1", "longitude": -21.09375, "label": "Crop Science"}, "295": {"latitude": 74.775842999999995, "discipline": "7", "longitude": -148.359375, "label": "Fuzzy Sets"}, "292": {"latitude": 79.560546000000002, "discipline": "12", "longitude": 74.53125, "label": "Hospice Care"}, "293": {"latitude": -2.8113709999999998, "discipline": "6", "longitude": -54.140625, "label": "Climatology"}, "290": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 157.5, "label": "Science Education"}, "291": {"latitude": 74.775842999999995, "discipline": "11", "longitude": -156.09375, "label": "Design & Analysis of Algorithms"}, "199": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -68.203125, "label": "Catalysis"}, "198": {"latitude": 49.382373000000001, "discipline": "13", "longitude": 168.046875, "label": "Political Geography"}, "195": {"latitude": 81.723187999999993, "discipline": "5", "longitude": -23.203125, "label": "Atomic Spectrometry"}, "194": {"latitude": 80.647035000000002, "discipline": "12", "longitude": 62.578125, "label": "Dental Research"}, "197": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 63.984375, "label": "Public Health Service"}, "196": {"latitude": 16.636192000000001, "discipline": "1", "longitude": -22.5, "label": "Botany"}, "191": {"latitude": 80.872827000000001, "discipline": "12", "longitude": 63.984375, "label": "Prosthetic Dentistry"}, "190": {"latitude": 57.704146999999999, "discipline": "3", "longitude": 33.046875, "label": "Clinical Infectious Disease"}, "193": {"latitude": 74.959391999999994, "discipline": "7", "longitude": -139.921875, "label": "Robotic Systems"}, "192": {"latitude": 79.812302000000003, "discipline": "12", "longitude": 60.46875, "label": "Orthodontics"}, "270": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "Agricultural Economics"}, "271": {"latitude": 65.366837000000004, "discipline": "13", "longitude": 143.4375, "label": "Social Work"}, "272": {"latitude": 83.753911000000002, "discipline": "12", "longitude": 80.15625, "label": "Medical Insurance"}, "273": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -76.640625, "label": "Fluid Phase Equilibrium"}, "274": {"latitude": 52.052489999999999, "discipline": "2", "longitude": 7.734375, "label": "Biotechnology Trends"}, "275": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -58.359375, "label": "Air Quality"}, "276": {"latitude": 68.911005000000003, "discipline": "7", "longitude": -168.046875, "label": "Search Engines; Web Crawling"}, "277": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -78.75, "label": "Colloid"}, "278": {"latitude": 76.351895999999996, "discipline": "12", "longitude": 61.875, "label": "Applied Physiology; Muscle"}, "279": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Biblical Literature"}, "524": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -23.90625, "label": "Mammals"}, "525": {"latitude": 30.751277999999999, "discipline": "3", "longitude": 54.84375, "label": "Impotence"}, "526": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -144.140625, "label": "Fuzzy Logic"}, "527": {"latitude": 58.813741999999998, "discipline": "13", "longitude": 168.75, "label": "Tourism"}, "520": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -35.859375, "label": "Rangeland Ecology"}, "521": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -100.546875, "label": "Welding"}, "522": {"latitude": 74.402163000000002, "discipline": "13", "longitude": -168.75, "label": "Reliability Engineering"}, "523": {"latitude": 48.458351999999998, "discipline": "10", "longitude": 18.984375, "label": "Molecular Biology Methods"}, "528": {"latitude": -14.604846999999999, "discipline": "1", "longitude": -19.6875, "label": "Aquatic Disease"}, "529": {"latitude": -23.885838, "discipline": "6", "longitude": -63.28125, "label": "Geographic Information Science"}, "449": {"latitude": 38.822591000000003, "discipline": "2", "longitude": 1.40625, "label": "Systematics & Evolutionary Microbiology"}, "448": {"latitude": 78.490551999999994, "discipline": "4", "longitude": -97.03125, "label": "Sensors & Actuators"}, "443": {"latitude": 55.776572999999999, "discipline": "10", "longitude": 23.90625, "label": "Sexually Transmitted Diseases"}, "442": {"latitude": 38.822591000000003, "discipline": "4", "longitude": -75.9375, "label": "Applied Geophysics"}, "441": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 9.84375, "label": "Peptides"}, "440": {"latitude": 76.679784999999995, "discipline": "4", "longitude": -88.59375, "label": "Digital Printing"}, "447": {"latitude": 83.277704999999997, "discipline": "12", "longitude": 88.59375, "label": "Geratric Nursing"}, "446": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -157.5, "label": "Machine Learning"}, "445": {"latitude": 65.946472, "discipline": "8", "longitude": 81.5625, "label": "NeuroImmunology"}, "444": {"latitude": 58.813741999999998, "discipline": "13", "longitude": 156.796875, "label": "Engineering Education"}, "108": {"latitude": 82.586106000000001, "discipline": "11", "longitude": -127.265625, "label": "Chaos Fractals & Complexity"}, "109": {"latitude": 12.554563999999999, "discipline": "1", "longitude": -21.09375, "label": "Environmental Contamination"}, "102": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -101.953125, "label": "Alloys"}, "103": {"latitude": 80.647035000000002, "discipline": "11", "longitude": -116.015625, "label": "Astronomy & Astrophysics"}, "100": {"latitude": 84.673513, "discipline": "12", "longitude": 85.78125, "label": "Employee Health Benefit Plans"}, "101": {"latitude": 63.548552000000001, "discipline": "3", "longitude": 51.328125, "label": "Transplantation"}, "106": {"latitude": 83.676942999999994, "discipline": "12", "longitude": 59.0625, "label": "Drug Discovery"}, "107": {"latitude": 39.909736000000002, "discipline": "10", "longitude": -2.109375, "label": "Animal Science"}, "104": {"latitude": 72.816074, "discipline": "12", "longitude": 112.5, "label": "Substance-abuse Treatment"}, "105": {"latitude": 64.472793999999993, "discipline": "13", "longitude": 174.375, "label": "Research Policy; Technology Management"}, "39": {"latitude": 78.903929000000005, "discipline": "3", "longitude": 45.0, "label": "Diabetes Care"}, "38": {"latitude": 82.308892999999998, "discipline": "11", "longitude": -106.875, "label": "Semiconducting Materials"}, "33": {"latitude": 64.168107000000006, "discipline": "3", "longitude": 30.234375, "label": "Toxicology Applied Pharmacology"}, "32": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Digestion"}, "31": {"latitude": 62.267923000000003, "discipline": "3", "longitude": 45.0, "label": "Developmental Biology"}, "30": {"latitude": -7.013668, "discipline": "1", "longitude": -38.671875, "label": "Marine Biology"}, "37": {"latitude": 81.823794000000007, "discipline": "5", "longitude": 5.625, "label": "Pharmaceutical Research"}, "36": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -84.375, "label": "Chemical Engineering"}, "35": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -49.921875, "label": "Inorganic Chemistry"}, "34": {"latitude": 63.548552000000001, "discipline": "4", "longitude": -93.515625, "label": "Transportation Research"}, "438": {"latitude": 52.052489999999999, "discipline": "13", "longitude": 171.5625, "label": "Regional Studies"}, "439": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -102.65625, "label": "Electrochemical Development"}, "436": {"latitude": 68.399180000000001, "discipline": "4", "longitude": -88.59375, "label": "Construction"}, "437": {"latitude": 56.944974000000002, "discipline": "4", "longitude": -82.265625, "label": "Dams & Tunnels"}, "434": {"latitude": 51.179343000000003, "discipline": "13", "longitude": 169.453125, "label": "Environmental Policy"}, "435": {"latitude": 80.532071000000002, "discipline": "11", "longitude": -145.546875, "label": "Topology"}, "432": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -47.109375, "label": "Liquid Crystals"}, "433": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -144.140625, "label": "Control Systems"}, "430": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -146.953125, "label": "User Interface Design"}, "431": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 168.046875, "label": "Public Policy"}, "339": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -32.34375, "label": "Environmental Chemistry"}, "338": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Geology (International)"}, "335": {"latitude": 44.087584999999997, "discipline": "4", "longitude": -67.5, "label": "Hydrology Soil Contamination"}, "334": {"latitude": -31.952162000000001, "discipline": "9", "longitude": 172.96875, "label": "Contemporary Philosophy"}, "337": {"latitude": 81.823794000000007, "discipline": "11", "longitude": -144.84375, "label": "Mathematics Research"}, "336": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 132.1875, "label": "Child Abuse"}, "331": {"latitude": 77.617709000000005, "discipline": "7", "longitude": -153.984375, "label": "Logic"}, "330": {"latitude": 78.767792, "discipline": "7", "longitude": -131.484375, "label": "Test Equipment"}, "333": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -82.265625, "label": "Textiles"}, "332": {"latitude": 78.903929000000005, "discipline": "4", "longitude": -82.265625, "label": "Pulp Paper Science"}, "6": {"latitude": 65.366837000000004, "discipline": "8", "longitude": 72.421875, "label": "Neuroscience; Molecular & Cellular"}, "99": {"latitude": 75.320025000000001, "discipline": "13", "longitude": 177.890625, "label": "BioStatistics"}, "98": {"latitude": 72.607119999999995, "discipline": "4", "longitude": -108.28125, "label": "Automotive Engineering"}, "91": {"latitude": 59.534317999999999, "discipline": "3", "longitude": 30.9375, "label": "AIDS Research"}, "90": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -97.734375, "label": "Ceramics"}, "93": {"latitude": 84.474064999999996, "discipline": "12", "longitude": 87.890625, "label": "Medical Records"}, "92": {"latitude": 68.138852, "discipline": "4", "longitude": -109.6875, "label": "Military Aviation"}, "95": {"latitude": 52.482779999999998, "discipline": "13", "longitude": 179.296875, "label": "Applied Economics"}, "94": {"latitude": 74.211983000000004, "discipline": "13", "longitude": -174.375, "label": "Statistics"}, "97": {"latitude": -4.2149429999999999, "discipline": "6", "longitude": -55.546875, "label": "Atmospheric Science"}, "96": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -136.40625, "label": "Automatic Control"}, "554": {"latitude": 55.379109999999997, "discipline": "10", "longitude": 23.203125, "label": "Agricultural Environmental Medicine"}, "551": {"latitude": -9.1020970000000005, "discipline": "1", "longitude": -33.75, "label": "Wetlands"}, "550": {"latitude": 54.162433999999998, "discipline": "4", "longitude": -82.265625, "label": "Bulk Solid Handling"}, "553": {"latitude": 72.607119999999995, "discipline": "7", "longitude": -124.453125, "label": "Hydraulics"}, "552": {"latitude": -21.943045999999999, "discipline": "6", "longitude": -59.0625, "label": "GIS (non English)"}, "238": {"latitude": 77.312520000000006, "discipline": "3", "longitude": 47.109375, "label": "Diabetes Metabolism"}, "239": {"latitude": 59.534317999999999, "discipline": "4", "longitude": -79.453125, "label": "Geotechnical Engineering"}, "234": {"latitude": 59.888936999999999, "discipline": "13", "longitude": 158.203125, "label": "Symbolic Interaction"}, "235": {"latitude": 69.411242000000001, "discipline": "8", "longitude": 124.453125, "label": "Child & Adolescent Psychiatry"}, "236": {"latitude": 83.277704999999997, "discipline": "12", "longitude": 83.671875, "label": "General Practice"}, "237": {"latitude": 50.736454999999999, "discipline": "13", "longitude": 175.078125, "label": "Environmental Management"}, "230": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Hispanic Studies"}, "231": {"latitude": 7.013668, "discipline": "1", "longitude": -33.046875, "label": "Forest Science"}, "232": {"latitude": 82.214217000000005, "discipline": "11", "longitude": -118.125, "label": "Plasma Physics"}, "233": {"latitude": 65.072130000000001, "discipline": "2", "longitude": 4.921875, "label": "Proteomics"}, "1": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 35.859375, "label": "Clinical Cancer Research"}, "146": {"latitude": 54.162433999999998, "discipline": "2", "longitude": 4.921875, "label": "BioInformatics"}, "147": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -104.765625, "label": "Mechanics of Solids & Structures"}, "144": {"latitude": 71.524908999999994, "discipline": "8", "longitude": 94.21875, "label": "Vision"}, "145": {"latitude": 59.888936999999999, "discipline": "13", "longitude": 168.046875, "label": "Communication Research"}, "142": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 163.828125, "label": "Music & Theatre"}, "143": {"latitude": 66.791909000000004, "discipline": "8", "longitude": 113.203125, "label": "Memory & Cognition"}, "140": {"latitude": 74.775842999999995, "discipline": "12", "longitude": 64.6875, "label": "Alternative Complementary Medicine"}, "141": {"latitude": 54.572062000000003, "discipline": "4", "longitude": -82.265625, "label": "Petroleum Engineering"}, "148": {"latitude": 76.679784999999995, "discipline": "3", "longitude": 48.515625, "label": "Pharmacy"}, "149": {"latitude": -7.013668, "discipline": "6", "longitude": -58.359375, "label": "Geomorphology"}, "133": {"latitude": 43.068888000000001, "discipline": "10", "longitude": 9.140625, "label": "Veterinary Science"}, "132": {"latitude": 83.520161999999999, "discipline": "4", "longitude": -82.96875, "label": "Corrosion"}, "131": {"latitude": 8.4071680000000004, "discipline": "1", "longitude": -9.84375, "label": "Pest Management Science"}, "130": {"latitude": 58.813741999999998, "discipline": "3", "longitude": 45.0, "label": "Pathology"}, "137": {"latitude": 74.402163000000002, "discipline": "7", "longitude": -149.765625, "label": "Neural Networks"}, "136": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -146.953125, "label": "Image Processing"}, "135": {"latitude": 69.411242000000001, "discipline": "3", "longitude": 32.34375, "label": "Stem Cells"}, "134": {"latitude": 63.233626999999998, "discipline": "13", "longitude": 158.203125, "label": "Teacher Education; Evaluation"}, "494": {"latitude": 84.541360999999995, "discipline": "12", "longitude": 81.5625, "label": "Medical Libraries"}, "495": {"latitude": -31.952162000000001, "discipline": "9", "longitude": 164.53125, "label": "Opera"}, "139": {"latitude": 68.399180000000001, "discipline": "3", "longitude": 59.0625, "label": "Intensive Care"}, "138": {"latitude": 83.520161999999999, "discipline": "12", "longitude": 99.84375, "label": "Nursing Education"}, "490": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 41.484375, "label": "Menopause"}, "491": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -44.296875, "label": "Chemistry (Russia)"}, "492": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 166.640625, "label": "GeoPolitics"}, "493": {"latitude": -10.487812, "discipline": "6", "longitude": -57.65625, "label": "Glaciology"}, "24": {"latitude": 76.351895999999996, "discipline": "3", "longitude": 47.8125, "label": "Dermatology"}, "25": {"latitude": 66.791909000000004, "discipline": "3", "longitude": 54.84375, "label": "Kidney"}, "26": {"latitude": 62.267923000000003, "discipline": "3", "longitude": 56.953125, "label": "Pharmacology Science"}, "27": {"latitude": 38.822591000000003, "discipline": "13", "longitude": 167.34375, "label": "Law"}, "20": {"latitude": 49.837981999999997, "discipline": "10", "longitude": 25.3125, "label": "Virology"}, "21": {"latitude": 31.952162000000001, "discipline": "1", "longitude": -7.734375, "label": "Plant Physiology"}, "22": {"latitude": 62.593341000000002, "discipline": "3", "longitude": 47.8125, "label": "Allergy & Clinical Immunology"}, "23": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -102.65625, "label": "Material Science"}, "28": {"latitude": 63.233626999999998, "discipline": "8", "longitude": 64.6875, "label": "Medical Imaging"}, "29": {"latitude": 52.052489999999999, "discipline": "10", "longitude": 10.546875, "label": "Bacteriology"}, "407": {"latitude": -15.961328999999999, "discipline": "9", "longitude": 165.234375, "label": "Ethics"}, "406": {"latitude": 79.171334999999999, "discipline": "4", "longitude": -99.140625, "label": "Metallurgy"}, "405": {"latitude": 65.072130000000001, "discipline": "3", "longitude": 56.25, "label": "Clinical Rehabilitation"}, "404": {"latitude": 3.5134210000000001, "discipline": "1", "longitude": -33.75, "label": "Ecological Modeling"}, "403": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 167.34375, "label": "Human Resource Management"}, "402": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 26.015625, "label": "Molecular Medicine"}, "401": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -16.875, "label": "Sociobiology"}, "400": {"latitude": 73.428424000000007, "discipline": "7", "longitude": -139.21875, "label": "Chip Design & Manufacturing"}, "409": {"latitude": 74.402163000000002, "discipline": "4", "longitude": -121.640625, "label": "Aerospace"}, "408": {"latitude": 66.791909000000004, "discipline": "13", "longitude": 133.59375, "label": "Marital & Family Therapy"}, "379": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 167.34375, "label": "German Studies"}, "378": {"latitude": 50.736454999999999, "discipline": "3", "longitude": 63.984375, "label": "Radiology"}, "371": {"latitude": 71.074055999999999, "discipline": "7", "longitude": -153.984375, "label": "Functional Programing"}, "370": {"latitude": 78.349411000000003, "discipline": "7", "longitude": -146.25, "label": "Electronic Imaging"}, "373": {"latitude": 14.604846999999999, "discipline": "1", "longitude": -15.46875, "label": "Plant Disease"}, "372": {"latitude": 18.646245, "discipline": "1", "longitude": -9.84375, "label": "Applied Genetics"}, "375": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "Developmental Economics"}, "374": {"latitude": 23.885838, "discipline": "6", "longitude": -59.0625, "label": "Water Resource"}, "377": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "International Economics"}, "376": {"latitude": 81.723187999999993, "discipline": "11", "longitude": -108.28125, "label": "Nuclear Physics"}, "393": {"latitude": 80.532071000000002, "discipline": "11", "longitude": -145.546875, "label": "Mathematical Science (Russia)"}, "392": {"latitude": 81.201419999999999, "discipline": "11", "longitude": -145.546875, "label": "Optimization Theory"}, "88": {"latitude": 84.267172000000002, "discipline": "5", "longitude": -77.34375, "label": "Computational Chemistry"}, "89": {"latitude": 58.813741999999998, "discipline": "3", "longitude": 58.359375, "label": "Surgery"}, "397": {"latitude": 83.753911000000002, "discipline": "12", "longitude": 83.671875, "label": "Rural Health Care"}, "396": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -100.546875, "label": "Materials Processing"}, "395": {"latitude": 73.226699999999994, "discipline": "7", "longitude": -146.953125, "label": "Security; Cryptography"}, "394": {"latitude": 55.776572999999999, "discipline": "10", "longitude": 37.265625, "label": "Gene Therapy"}, "82": {"latitude": 75.497157000000001, "discipline": "3", "longitude": 40.78125, "label": "Clinical Endocrinology"}, "83": {"latitude": 78.767792, "discipline": "3", "longitude": 42.1875, "label": "Dietetics"}, "80": {"latitude": 76.840816000000004, "discipline": "12", "longitude": 57.65625, "label": "Hypertension"}, "81": {"latitude": 55.776572999999999, "discipline": "3", "longitude": 53.4375, "label": "Human Molecular Genetics"}, "86": {"latitude": 73.428424000000007, "discipline": "4", "longitude": -98.4375, "label": "Gas Turbines"}, "87": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -53.4375, "label": "Remote Sensing"}, "84": {"latitude": 54.162433999999998, "discipline": "10", "longitude": 18.28125, "label": "Clinical Microbiology"}, "85": {"latitude": 81.518271999999996, "discipline": "12", "longitude": 63.984375, "label": "Hospital Pharmacy"}, "7": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 61.171875, "label": "Anesthetics & Analgesics"}, "245": {"latitude": 43.068888000000001, "discipline": "4", "longitude": -64.6875, "label": "Water Quality & Resource Management"}, "244": {"latitude": 68.911005000000003, "discipline": "13", "longitude": 141.328125, "label": "Eating Disorders; Sex Roles"}, "247": {"latitude": 68.911005000000003, "discipline": "8", "longitude": 104.0625, "label": "Geriatric Psychiatry"}, "246": {"latitude": 46.073231, "discipline": "13", "longitude": 168.046875, "label": "Ethnic Migration"}, "241": {"latitude": 68.911005000000003, "discipline": "3", "longitude": 47.8125, "label": "Clinical Chemistry"}, "240": {"latitude": 81.201419999999999, "discipline": "7", "longitude": -125.15625, "label": "Instrumentation"}, "243": {"latitude": 71.074055999999999, "discipline": "12", "longitude": 71.015625, "label": "Arthroscopy"}, "242": {"latitude": 71.074055999999999, "discipline": "4", "longitude": -94.921875, "label": "Fluid Engineering"}, "249": {"latitude": 72.607119999999995, "discipline": "4", "longitude": -90.703125, "label": "Ore Processing"}, "248": {"latitude": 71.965388000000004, "discipline": "4", "longitude": -107.578125, "label": "Sound & Vibration"}, "519": {"latitude": 73.226699999999994, "discipline": "8", "longitude": 99.140625, "label": "Forensic Science"}, "518": {"latitude": 82.494823999999994, "discipline": "4", "longitude": -101.25, "label": "Defects & Diffusion in Materials"}, "511": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 165.9375, "label": "Human Rights"}, "510": {"latitude": 62.593341000000002, "discipline": "8", "longitude": 77.34375, "label": "Hearing Research"}, "513": {"latitude": 53.330872999999997, "discipline": "13", "longitude": 178.59375, "label": "Social Economics"}, "512": {"latitude": 59.534317999999999, "discipline": "3", "longitude": 54.140625, "label": "Lung Cancer"}, "515": {"latitude": 55.379109999999997, "discipline": "2", "longitude": 2.109375, "label": "Biotechnology Bioengineering"}, "514": {"latitude": 65.946472, "discipline": "5", "longitude": -20.390625, "label": "Carbohydrate Research"}, "517": {"latitude": 81.413933, "discipline": "7", "longitude": -125.15625, "label": "Electronics"}, "516": {"latitude": 43.068888000000001, "discipline": "13", "longitude": 168.75, "label": "Rural Studies"}, "458": {"latitude": 72.181804, "discipline": "7", "longitude": -150.46875, "label": "Computer Systems Theory"}, "459": {"latitude": 69.657086000000007, "discipline": "4", "longitude": -94.21875, "label": "Combustion"}, "450": {"latitude": 78.903929000000005, "discipline": "7", "longitude": -140.625, "label": "Medical Image Processing"}, "451": {"latitude": 81.823794000000007, "discipline": "12", "longitude": 70.3125, "label": "Medical Education"}, "452": {"latitude": 62.593341000000002, "discipline": "8", "longitude": 70.3125, "label": "Magnetic Resonance Imagery"}, "453": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 78.046875, "label": "Hospital Management"}, "454": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -6.328125, "label": "Insect Physiology"}, "455": {"latitude": 78.061988999999997, "discipline": "7", "longitude": -134.296875, "label": "Power Transmission"}, "456": {"latitude": 55.776572999999999, "discipline": "2", "longitude": -7.734375, "label": "Food Engineering"}, "457": {"latitude": 77.617709000000005, "discipline": "12", "longitude": 67.5, "label": "Oral Surgery"}, "179": {"latitude": 84.124972999999997, "discipline": "5", "longitude": -91.40625, "label": "Molecular Physics"}, "178": {"latitude": 74.775842999999995, "discipline": "12", "longitude": 68.90625, "label": "Biomechanics"}, "177": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -82.265625, "label": "Wool"}, "176": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -117.421875, "label": "Optics & Lasers"}, "175": {"latitude": 80.872827000000001, "discipline": "7", "longitude": -122.34375, "label": "Solid State Electronics"}, "174": {"latitude": 68.911005000000003, "discipline": "8", "longitude": 107.578125, "label": "Geriatrics"}, "173": {"latitude": 70.140364000000005, "discipline": "13", "longitude": -166.640625, "label": "Computer-Aided Process Planning"}, "172": {"latitude": 31.952162000000001, "discipline": "4", "longitude": -42.1875, "label": "Agricultural Engineering"}, "171": {"latitude": 65.072130000000001, "discipline": "13", "longitude": 172.96875, "label": "Leadership & Organizational Behavior"}, "170": {"latitude": -2.8113709999999998, "discipline": "9", "longitude": 165.9375, "label": "American History"}, "253": {"latitude": 80.297927000000001, "discipline": "7", "longitude": -126.5625, "label": "Dielectrics"}, "182": {"latitude": -17.978732999999998, "discipline": "9", "longitude": 168.75, "label": "Science History"}, "183": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.9375, "label": "Poetry"}, "180": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -20.390625, "label": "Comparative Animal Physiology"}, "181": {"latitude": 49.382373000000001, "discipline": "13", "longitude": 165.9375, "label": "Political Science"}, "186": {"latitude": 77.157162999999997, "discipline": "7", "longitude": -143.4375, "label": "Speech Recognition"}, "187": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -103.359375, "label": "Fluid Mechanics"}, "184": {"latitude": 51.179343000000003, "discipline": "3", "longitude": 63.28125, "label": "Nuclear Medicine"}, "185": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -92.109375, "label": "Nanotechnology"}, "188": {"latitude": 76.184995000000001, "discipline": "7", "longitude": -149.0625, "label": "Computer Graphics"}, "189": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -73.125, "label": "Filtration Membrane"}, "11": {"latitude": 70.844673, "discipline": "8", "longitude": 109.6875, "label": "Affective Disorders"}, "10": {"latitude": 79.812302000000003, "discipline": "5", "longitude": -54.140625, "label": "Macromolecules & Polymers"}, "13": {"latitude": 83.026218999999998, "discipline": "11", "longitude": -106.171875, "label": "Surface Science"}, "12": {"latitude": 58.447732999999999, "discipline": "3", "longitude": 52.03125, "label": "Oncology"}, "15": {"latitude": 84.124972999999997, "discipline": "12", "longitude": 85.78125, "label": "Hospital Financial Management"}, "14": {"latitude": 79.935918000000001, "discipline": "11", "longitude": -149.0625, "label": "Nonlinear Analysis"}, "17": {"latitude": 81.518271999999996, "discipline": "12", "longitude": 32.34375, "label": "Occupational Health"}, "16": {"latitude": 67.339860999999999, "discipline": "3", "longitude": 47.8125, "label": "Rheumatology"}, "19": {"latitude": 61.606395999999997, "discipline": "3", "longitude": 38.671875, "label": "Leukemia"}, "18": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -44.296875, "label": "Organic Chemistry"}, "62": {"latitude": 72.816074, "discipline": "12", "longitude": 69.609375, "label": "Bone Joint Surgery"}, "322": {"latitude": 79.171334999999999, "discipline": "11", "longitude": -122.34375, "label": "Space Research"}, "323": {"latitude": -7.013668, "discipline": "1", "longitude": -15.46875, "label": "Entomology"}, "320": {"latitude": 53.330872999999997, "discipline": "10", "longitude": 28.828125, "label": "Mutation; DNA Repair"}, "321": {"latitude": -12.554563999999999, "discipline": "1", "longitude": -24.609375, "label": "Human Evolution"}, "326": {"latitude": 83.676942999999994, "discipline": "5", "longitude": -35.859375, "label": "Computer Aided Molecular Design"}, "327": {"latitude": 60.586967000000001, "discipline": "13", "longitude": 144.84375, "label": "Criminology"}, "324": {"latitude": 65.946472, "discipline": "8", "longitude": 92.8125, "label": "Epilepsy"}, "325": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -29.53125, "label": "Plant Ecology"}, "328": {"latitude": 70.844673, "discipline": "8", "longitude": 122.34375, "label": "Forensic Psychiatry"}, "329": {"latitude": 70.844673, "discipline": "13", "longitude": 139.921875, "label": "Personality"}, "201": {"latitude": 80.647035000000002, "discipline": "4", "longitude": -108.984375, "label": "Machine Tools"}, "200": {"latitude": 40.446947000000002, "discipline": "3", "longitude": 68.203125, "label": "Radiation Protection"}, "203": {"latitude": 80.178713999999999, "discipline": "12", "longitude": 59.765625, "label": "Periodontology"}, "202": {"latitude": 44.590466999999997, "discipline": "10", "longitude": 6.328125, "label": "Veterinary Medicine"}, "205": {"latitude": 71.074055999999999, "discipline": "3", "longitude": 52.03125, "label": "Thrombosis"}, "204": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 52.03125, "label": "Birth Defects"}, "207": {"latitude": 82.494823999999994, "discipline": "12", "longitude": 104.0625, "label": "Mental Health Nursing"}, "206": {"latitude": -7.013668, "discipline": "1", "longitude": -35.859375, "label": "Freshwater Biology"}, "209": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "English Literature"}, "208": {"latitude": 72.607119999999995, "discipline": "7", "longitude": -157.5, "label": "Artificial Evolution"}, "77": {"latitude": 71.965388000000004, "discipline": "3", "longitude": 54.140625, "label": "Cardiovascular"}, "76": {"latitude": 68.399180000000001, "discipline": "3", "longitude": 45.0, "label": "Pediatrics"}, "75": {"latitude": 80.532071000000002, "discipline": "5", "longitude": -20.390625, "label": "Chromatography; Electrophoresis"}, "74": {"latitude": 70.844673, "discipline": "13", "longitude": -167.34375, "label": "Operations Research"}, "73": {"latitude": 76.184995000000001, "discipline": "12", "longitude": 75.9375, "label": "Sports Medicine"}, "72": {"latitude": 3.5134210000000001, "discipline": "6", "longitude": -58.359375, "label": "Oceanography"}, "71": {"latitude": 72.181804, "discipline": "12", "longitude": 127.265625, "label": "Psychoanalysis"}, "70": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -108.984375, "label": "Aeronautics & Astronautics"}, "79": {"latitude": 50.736454999999999, "discipline": "13", "longitude": 177.890625, "label": "Economics"}, "78": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -51.328125, "label": "Paleobiology"}, "2": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 59.765625, "label": "Circulation"}, "542": {"latitude": 76.184995000000001, "discipline": "12", "longitude": 87.1875, "label": "Perception Motor Skills"}, "543": {"latitude": 40.446947000000002, "discipline": "13", "longitude": 167.34375, "label": "World Trade; Law"}, "540": {"latitude": 77.617709000000005, "discipline": "4", "longitude": -74.53125, "label": "Textile Art"}, "541": {"latitude": -23.885838, "discipline": "9", "longitude": 165.234375, "label": "Italian Studies"}, "546": {"latitude": 83.026218999999998, "discipline": "5", "longitude": -64.6875, "label": "Paints & Coatings"}, "547": {"latitude": 83.979259999999996, "discipline": "12", "longitude": 100.546875, "label": "Nursing Theory"}, "544": {"latitude": -7.013668, "discipline": "1", "longitude": -20.390625, "label": "Insects"}, "545": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -28.828125, "label": "Australian Ecology"}, "8": {"latitude": 52.482779999999998, "discipline": "3", "longitude": 51.328125, "label": "Urology"}, "548": {"latitude": -12.554563999999999, "discipline": "1", "longitude": -32.34375, "label": "Crustaceans"}, "549": {"latitude": 79.560546000000002, "discipline": "12", "longitude": 52.03125, "label": "Laser Surgery"}, "68": {"latitude": 75.497157000000001, "discipline": "12", "longitude": 60.46875, "label": "Retinal Surgery"}, "120": {"latitude": 18.646245, "discipline": "4", "longitude": -44.296875, "label": "Soil Quality"}, "121": {"latitude": 76.351895999999996, "discipline": "7", "longitude": -139.21875, "label": "Integrated Circuit Design"}, "122": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 179.296875, "label": "Philosophy Psychology"}, "123": {"latitude": 65.946472, "discipline": "13", "longitude": 178.59375, "label": "Construction & Project Management"}, "124": {"latitude": 67.609221000000005, "discipline": "13", "longitude": 144.84375, "label": "Social Psychology"}, "125": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -117.421875, "label": "High Energy Physics"}, "126": {"latitude": 63.548552000000001, "discipline": "13", "longitude": 171.5625, "label": "Strategic Management"}, "127": {"latitude": 38.822591000000003, "discipline": "2", "longitude": 14.0625, "label": "Genomics & Nucleic Acids"}, "128": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -97.03125, "label": "Heat Transfer"}, "129": {"latitude": 69.411242000000001, "discipline": "4", "longitude": -82.96875, "label": "Cement & Concrete"}, "414": {"latitude": 72.607119999999995, "discipline": "12", "longitude": 75.9375, "label": "Trauma"}, "415": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -34.453125, "label": "Thermal Analysis"}, "416": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -98.4375, "label": "Solar & Wind Power"}, "417": {"latitude": 49.837981999999997, "discipline": "4", "longitude": -82.265625, "label": "Ocean Engineering"}, "410": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 165.234375, "label": "Critical Studies"}, "411": {"latitude": 56.944974000000002, "discipline": "13", "longitude": 177.890625, "label": "Econometrics"}, "412": {"latitude": 67.609221000000005, "discipline": "8", "longitude": 103.359375, "label": "Neuroscience Methods"}, "413": {"latitude": -2.8113709999999998, "discipline": "6", "longitude": -65.390625, "label": "Mineralogy"}, "498": {"latitude": 11.178402, "discipline": "13", "longitude": 159.609375, "label": "Pragmatics & Discourse"}, "418": {"latitude": 61.606395999999997, "discipline": "13", "longitude": 146.953125, "label": "Educational Psychology"}, "419": {"latitude": 7.013668, "discipline": "1", "longitude": -23.90625, "label": "Mycology"}, "499": {"latitude": 54.572062000000003, "discipline": "10", "longitude": 17.578125, "label": "Reproduction Veterinary"}, "319": {"latitude": 57.704146999999999, "discipline": "3", "longitude": 55.546875, "label": "Clinical Medicine (translated)"}, "318": {"latitude": 71.524908999999994, "discipline": "12", "longitude": 118.125, "label": "Mental Health Assessment"}, "313": {"latitude": 72.607119999999995, "discipline": "12", "longitude": 74.53125, "label": "Pain"}, "312": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 131.484375, "label": "Child Development"}, "311": {"latitude": 81.723187999999993, "discipline": "12", "longitude": 47.109375, "label": "Medical Screening & Epidemiology"}, "310": {"latitude": 83.676942999999994, "discipline": "5", "longitude": -82.265625, "label": "Chemistry & Material Science"}, "317": {"latitude": 76.351895999999996, "discipline": "7", "longitude": -143.4375, "label": "Pattern Recognition"}, "316": {"latitude": 58.813741999999998, "discipline": "4", "longitude": -82.265625, "label": "Safety Management"}, "315": {"latitude": 17.978732999999998, "discipline": "1", "longitude": -31.640625, "label": "Soil Analysis"}, "314": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 168.75, "label": "Public Administration"}, "496": {"latitude": 57.704146999999999, "discipline": "13", "longitude": 156.09375, "label": "Education"}, "497": {"latitude": 73.428424000000007, "discipline": "4", "longitude": -103.359375, "label": "Acoustics"}, "3": {"latitude": 74.211983000000004, "discipline": "7", "longitude": -152.578125, "label": "Data Mining"}, "368": {"latitude": 58.447732999999999, "discipline": "4", "longitude": -108.984375, "label": "Naval Architecture"}, "369": {"latitude": -0.70310700000000004, "discipline": "1", "longitude": -42.890625, "label": "Environmental Microbiology"}, "366": {"latitude": 74.959391999999994, "discipline": "3", "longitude": 42.890625, "label": "Eye"}, "367": {"latitude": 74.959391999999994, "discipline": "12", "longitude": 116.015625, "label": "Addictive Behavior"}, "364": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -61.875, "label": "Geodesy"}, "365": {"latitude": 84.474064999999996, "discipline": "5", "longitude": -77.34375, "label": "Surfactants"}, "362": {"latitude": 52.482779999999998, "discipline": "4", "longitude": -73.125, "label": "Water Utilities"}, "363": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Sedimentary Geology"}, "360": {"latitude": 52.052489999999999, "discipline": "13", "longitude": 174.375, "label": "Financial Accounting"}, "361": {"latitude": 49.382373000000001, "discipline": "2", "longitude": -8.4375, "label": "Microbiology Biotechnology"}, "380": {"latitude": -19.973348999999999, "discipline": "9", "longitude": 163.828125, "label": "Medieval History"}, "381": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 179.296875, "label": "Philosophy of Education"}, "382": {"latitude": 61.606395999999997, "discipline": "4", "longitude": -104.765625, "label": "Oceanographic Instrumentation"}, "383": {"latitude": 46.073231, "discipline": "13", "longitude": 168.75, "label": "Foreign Policy"}, "384": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Gut"}, "385": {"latitude": 81.723187999999993, "discipline": "7", "longitude": -126.5625, "label": "Microwaves; Radio Frequencies"}, "386": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 134.296875, "label": "School Psychology"}, "387": {"latitude": 54.572062000000003, "discipline": "10", "longitude": 29.53125, "label": "Vaccines"}, "388": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 171.5625, "label": "Environmental Law"}, "389": {"latitude": 78.903929000000005, "discipline": "5", "longitude": -15.46875, "label": "Mass Spectrometry"}, "60": {"latitude": 76.679784999999995, "discipline": "4", "longitude": -88.59375, "label": "Pulp & Paper"}, "61": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -62.578125, "label": "Seismology"}, "258": {"latitude": 72.607119999999995, "discipline": "3", "longitude": 56.25, "label": "Electrocardiography"}, "259": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 176.484375, "label": "International Development"}, "64": {"latitude": 80.297927000000001, "discipline": "11", "longitude": -146.953125, "label": "Algebra"}, "65": {"latitude": 80.872827000000001, "discipline": "7", "longitude": -127.96875, "label": "Antenna"}, "66": {"latitude": 78.767792, "discipline": "7", "longitude": -134.296875, "label": "Circuit Systems"}, "67": {"latitude": 83.676942999999994, "discipline": "12", "longitude": 95.625, "label": "Nursing Specialists"}, "252": {"latitude": 56.559482000000003, "discipline": "3", "longitude": 60.46875, "label": "Cancer (translated)"}, "69": {"latitude": 65.946472, "discipline": "8", "longitude": 94.21875, "label": "Psychopharmacology"}, "250": {"latitude": 31.952162000000001, "discipline": "13", "longitude": 165.9375, "label": "Ethnology"}, "251": {"latitude": 67.339860999999999, "discipline": "3", "longitude": 49.21875, "label": "Prenatal Diagnostics"}, "256": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -107.578125, "label": "Numerical Methods in Engineering"}, "257": {"latitude": 80.872827000000001, "discipline": "5", "longitude": 2.109375, "label": "EthnoPharmacology"}, "254": {"latitude": -10.487812, "discipline": "6", "longitude": -54.140625, "label": "Atmospheric GeoPhysics"}, "255": {"latitude": 80.872827000000001, "discipline": "5", "longitude": -14.0625, "label": "Flavors & Fragrance"}, "508": {"latitude": -0.70310700000000004, "discipline": "1", "longitude": -44.296875, "label": "Marine Pollution"}, "509": {"latitude": 75.320025000000001, "discipline": "5", "longitude": -2.8125, "label": "Toxins"}, "506": {"latitude": 65.072130000000001, "discipline": "3", "longitude": 45.0, "label": "Pulmonary"}, "507": {"latitude": 65.366837000000004, "discipline": "4", "longitude": -100.546875, "label": "Waste Management"}, "504": {"latitude": 70.844673, "discipline": "12", "longitude": 59.0625, "label": "Artifical Organs"}, "505": {"latitude": 73.824820000000003, "discipline": "12", "longitude": 72.421875, "label": "Physical Therapy; Orthopedic"}, "502": {"latitude": -12.554563999999999, "discipline": "9", "longitude": 167.34375, "label": "Socio-Cultural Anthropology"}, "503": {"latitude": 33.724339999999998, "discipline": "10", "longitude": 1.40625, "label": "Poultry Science"}, "500": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -44.296875, "label": "Crystallography"}, "501": {"latitude": 79.560546000000002, "discipline": "11", "longitude": -135.0, "label": "Applied Math"}, "469": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 79.453125, "label": "Preventive Medicine"}, "468": {"latitude": -19.973348999999999, "discipline": "6", "longitude": -45.0, "label": "Archeological Science"}, "465": {"latitude": 79.171334999999999, "discipline": "4", "longitude": -99.84375, "label": "Fractures & Fatigue"}, "464": {"latitude": 65.946472, "discipline": "13", "longitude": 129.375, "label": "Pychiatric & Behavioral Genetics"}, "467": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Cross Disciplinary Studies"}, "466": {"latitude": 76.679784999999995, "discipline": "12", "longitude": 75.9375, "label": "Emergency Medicine"}, "461": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -25.3125, "label": "Wildlife Research"}, "460": {"latitude": 73.226699999999994, "discipline": "3", "longitude": 42.890625, "label": "Dermatological Surgery"}, "463": {"latitude": 83.026218999999998, "discipline": "11", "longitude": -116.015625, "label": "Physics; Current Developments"}, "462": {"latitude": 83.979259999999996, "discipline": "12", "longitude": 97.734375, "label": "Midwifery"}, "168": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -94.21875, "label": "Composites"}, "169": {"latitude": 41.508577000000002, "discipline": "13", "longitude": 154.6875, "label": "Language Learning"}, "164": {"latitude": 68.399180000000001, "discipline": "7", "longitude": -171.5625, "label": "Library Science; Infomation Retrieval"}, "165": {"latitude": 77.767582000000004, "discipline": "12", "longitude": 63.28125, "label": "Biomaterials"}, "166": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -60.46875, "label": "Quaternary Research"}, "167": {"latitude": 42.553080000000001, "discipline": "3", "longitude": 56.25, "label": "Endoscopic Surgery"}, "160": {"latitude": 73.226699999999994, "discipline": "7", "longitude": -151.875, "label": "Artificial Intelligence"}, "161": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -45.0, "label": "Electro Analytical Chemistry"}, "162": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 68.90625, "label": "Dental Education"}, "163": {"latitude": 58.447732999999999, "discipline": "2", "longitude": -4.21875, "label": "Enzyme Microbiological Techniques"}, "9": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 29.53125, "label": "Immunology"}, "357": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -26.015625, "label": "Wildlife Management"}, "356": {"latitude": 70.844673, "discipline": "7", "longitude": -152.578125, "label": "Software Design and Development"}, "355": {"latitude": 71.074055999999999, "discipline": "12", "longitude": 123.046875, "label": "Psychiatric Services"}, "354": {"latitude": 71.965388000000004, "discipline": "12", "longitude": 112.5, "label": "Forensic Medicine"}, "353": {"latitude": 80.297927000000001, "discipline": "11", "longitude": -116.71875, "label": "Geophysical Science"}, "352": {"latitude": 42.553080000000001, "discipline": "10", "longitude": 23.203125, "label": "World Health Organization"}, "351": {"latitude": 79.935918000000001, "discipline": "11", "longitude": -134.296875, "label": "Computational Math"}, "350": {"latitude": 72.607119999999995, "discipline": "8", "longitude": 92.109375, "label": "Physical Therapy; Brain Injury"}, "359": {"latitude": 72.181804, "discipline": "7", "longitude": -157.5, "label": "Database Design & Management"}, "358": {"latitude": 14.604846999999999, "discipline": "4", "longitude": -72.421875, "label": "Ocean Coastal Management"}, "216": {"latitude": 63.233626999999998, "discipline": "4", "longitude": -85.78125, "label": "Mining"}, "217": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -18.28125, "label": "Aquaculture"}, "214": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Modern Language"}, "215": {"latitude": 66.513260000000002, "discipline": "8", "longitude": 82.96875, "label": "Neurophsyiology & Neuroscience"}, "212": {"latitude": 64.168107000000006, "discipline": "13", "longitude": 167.34375, "label": "Higher Education"}, "213": {"latitude": -2.8113709999999998, "discipline": "1", "longitude": -26.015625, "label": "Ecology"}, "210": {"latitude": 74.211983000000004, "discipline": "12", "longitude": 63.984375, "label": "Plastic Surgery"}, "211": {"latitude": 84.124972999999997, "discipline": "12", "longitude": 96.328125, "label": "Nursing Administration"}, "218": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -11.25, "label": "Molecular Biological Evolution"}, "219": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -118.828125, "label": "Photonics"}, "289": {"latitude": 68.138852, "discipline": "12", "longitude": 127.96875, "label": "Behavioral Research Therapy"}, "288": {"latitude": 72.816074, "discipline": "7", "longitude": -144.140625, "label": "Spyware; Malware"}, "4": {"latitude": 64.472793999999993, "discipline": "2", "longitude": 14.765625, "label": "Protein Science"}, "281": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 166.640625, "label": "Third World Political Economics"}, "280": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -140.625, "label": "Fault Tolerant Computing"}, "283": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 164.53125, "label": "Sociology"}, "282": {"latitude": 84.541360999999995, "discipline": "12", "longitude": 87.1875, "label": "Public Hospitals"}, "285": {"latitude": 74.775842999999995, "discipline": "3", "longitude": 54.140625, "label": "Bone & Osteoporosis"}, "284": {"latitude": 21.943045999999999, "discipline": "1", "longitude": -28.125, "label": "Horticulture"}, "287": {"latitude": 55.379109999999997, "discipline": "4", "longitude": -66.796875, "label": "Water Treatment"}, "286": {"latitude": 55.379109999999997, "discipline": "3", "longitude": 61.171875, "label": "Radiation Therapy"}, "263": {"latitude": 81.723187999999993, "discipline": "11", "longitude": -104.765625, "label": "Surface Coating Technology"}, "262": {"latitude": 72.607119999999995, "discipline": "3", "longitude": 40.078125, "label": "Molecular Endocrinology"}, "261": {"latitude": 51.179343000000003, "discipline": "13", "longitude": 165.9375, "label": "Political Studies"}, "260": {"latitude": 82.494823999999994, "discipline": "4", "longitude": -83.671875, "label": "Electrochemistry"}, "267": {"latitude": 46.073231, "discipline": "13", "longitude": 165.234375, "label": "International Conflict"}, "266": {"latitude": 54.572062000000003, "discipline": "4", "longitude": -82.265625, "label": "Oil & Natural Gas"}, "265": {"latitude": 65.072130000000001, "discipline": "13", "longitude": 151.875, "label": "Vocational Counseling"}, "264": {"latitude": 23.241346, "discipline": "1", "longitude": 9.140625, "label": "Molecular Biochemical Parasitology"}, "269": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -66.09375, "label": "Applied Catalysis"}, "268": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Art History"}, "59": {"latitude": 62.593341000000002, "discipline": "3", "longitude": 61.875, "label": "Vascular Surgery"}, "58": {"latitude": 63.548552000000001, "discipline": "13", "longitude": 171.5625, "label": "Business Ethics"}, "55": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 26.015625, "label": "AntiMicrobial Agents"}, "54": {"latitude": 77.617709000000005, "discipline": "5", "longitude": 1.40625, "label": "Pharmaceutical Design"}, "57": {"latitude": 66.513260000000002, "discipline": "13", "longitude": -179.296875, "label": "Decision Support Systems"}, "56": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -157.5, "label": "Systems Software"}, "51": {"latitude": 65.366837000000004, "discipline": "3", "longitude": 49.21875, "label": "Chest & Respiratory"}, "50": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 42.890625, "label": "Obstetrics"}, "53": {"latitude": -15.961328999999999, "discipline": "1", "longitude": -26.015625, "label": "Zoology"}, "52": {"latitude": 72.181804, "discipline": "4", "longitude": -82.265625, "label": "Earthquake Engineering"}, "537": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 63.28125, "label": "Clinical Medicine (Romania)"}, "536": {"latitude": 64.168107000000006, "discipline": "13", "longitude": 168.046875, "label": "Marketing"}, "535": {"latitude": 72.181804, "discipline": "13", "longitude": 162.421875, "label": "Education Psychological Measures"}, "63": {"latitude": 65.366837000000004, "discipline": "8", "longitude": 90.0, "label": "Neurology"}, "533": {"latitude": 69.411242000000001, "discipline": "8", "longitude": 88.59375, "label": "Neurotoxicology"}, "532": {"latitude": 66.513260000000002, "discipline": "8", "longitude": 92.8125, "label": "Sleep"}, "531": {"latitude": 83.111070999999995, "discipline": "12", "longitude": 59.0625, "label": "Public Health"}, "530": {"latitude": 76.184995000000001, "discipline": "3", "longitude": 43.59375, "label": "Hormone Research"}, "539": {"latitude": 78.349411000000003, "discipline": "12", "longitude": 54.140625, "label": "Optometry"}, "538": {"latitude": 82.586106000000001, "discipline": "5", "longitude": -44.296875, "label": "Green Chemistry"}, "115": {"latitude": 80.647035000000002, "discipline": "5", "longitude": -4.921875, "label": "Phytochemistry"}, "114": {"latitude": 66.513260000000002, "discipline": "3", "longitude": 58.359375, "label": "Thoracic Surgery"}, "117": {"latitude": 56.944974000000002, "discipline": "2", "longitude": 5.625, "label": "Food Protection"}, "116": {"latitude": 31.952162000000001, "discipline": "10", "longitude": 16.875, "label": "Tropical Medicine"}, "111": {"latitude": 74.959391999999994, "discipline": "4", "longitude": -116.015625, "label": "Mechanical Design Engineering"}, "110": {"latitude": 67.609221000000005, "discipline": "8", "longitude": 67.5, "label": "Otolaryngology; Laryngoscope"}, "113": {"latitude": -2.8113709999999998, "discipline": "1", "longitude": -33.046875, "label": "Biological Conservation"}, "112": {"latitude": -19.973348999999999, "discipline": "9", "longitude": 165.234375, "label": "Classics"}, "119": {"latitude": 69.411242000000001, "discipline": "4", "longitude": -85.078125, "label": "Energy Fuel"}, "118": {"latitude": 75.320025000000001, "discipline": "7", "longitude": -141.328125, "label": "Broadband Communication"}, "429": {"latitude": 23.885838, "discipline": "1", "longitude": -40.78125, "label": "Weed Management"}, "428": {"latitude": 73.824820000000003, "discipline": "7", "longitude": -147.65625, "label": "Computer Networks"}, "534": {"latitude": 70.377853999999999, "discipline": "3", "longitude": 47.109375, "label": "Pediatric Research"}, "421": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -71.71875, "label": "Dyes & Pigments"}, "420": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 164.53125, "label": "Semiotics"}, "423": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -25.3125, "label": "Molecular Ecology"}, "422": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 52.03125, "label": "Drug Safety"}, "425": {"latitude": 70.140364000000005, "discipline": "12", "longitude": 125.15625, "label": "Clinical Psychiatry"}, "424": {"latitude": 56.559482000000003, "discipline": "10", "longitude": 38.671875, "label": "Cytogentics & Genome Mapping"}, "427": {"latitude": 38.272689, "discipline": "4", "longitude": -61.875, "label": "Water Waste"}, "426": {"latitude": -9.1020970000000005, "discipline": "6", "longitude": -55.546875, "label": "Paleogeography"}, "308": {"latitude": 78.490551999999994, "discipline": "7", "longitude": -134.296875, "label": "Electrical Networks"}, "309": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Endoscopy"}, "300": {"latitude": 71.524908999999994, "discipline": "3", "longitude": 49.21875, "label": "Atherosclerosis"}, "301": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 82.96875, "label": "Region & Medical Ethics"}, "302": {"latitude": 65.072130000000001, "discipline": "8", "longitude": 115.3125, "label": "Speech Language & Hearing"}, "303": {"latitude": 61.606395999999997, "discipline": "3", "longitude": 38.671875, "label": "Thoracic & Respiratory"}, "304": {"latitude": 47.040182000000001, "discipline": "10", "longitude": 8.4375, "label": "Veterinary Microbiology"}, "305": {"latitude": 32.546813, "discipline": "4", "longitude": -45.0, "label": "Environmental Protection"}, "306": {"latitude": 72.181804, "discipline": "7", "longitude": -150.46875, "label": "Computer Systems Design"}, "307": {"latitude": 25.165172999999999, "discipline": "4", "longitude": -46.40625, "label": "Environmental Pollution"}, "229": {"latitude": 82.586106000000001, "discipline": "11", "longitude": -116.015625, "label": "Nuclear Instrumentation"}, "228": {"latitude": 80.178713999999999, "discipline": "11", "longitude": -130.78125, "label": "Simulation"}, "227": {"latitude": 12.554563999999999, "discipline": "4", "longitude": -45.0, "label": "Soil Science"}, "226": {"latitude": 65.366837000000004, "discipline": "12", "longitude": 84.375, "label": "Audiology"}, "225": {"latitude": 74.775842999999995, "discipline": "7", "longitude": -131.484375, "label": "Robotics"}, "224": {"latitude": 70.377853999999999, "discipline": "12", "longitude": 69.609375, "label": "Spine"}, "223": {"latitude": 81.518271999999996, "discipline": "7", "longitude": -120.9375, "label": "Photo-Optics"}, "222": {"latitude": -7.013668, "discipline": "9", "longitude": 161.71875, "label": "Linguistics"}, "221": {"latitude": 80.178713999999999, "discipline": "11", "longitude": -148.359375, "label": "Functional Analysis"}, "220": {"latitude": 52.482779999999998, "discipline": "13", "longitude": 168.75, "label": "Urban Studies"}, "391": {"latitude": -0.70310700000000004, "discipline": "9", "longitude": 165.234375, "label": "Asian Studies"}, "390": {"latitude": 78.490551999999994, "discipline": "12", "longitude": 112.5, "label": "Psychiatric Nursing"}, "151": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 82.265625, "label": "BioEthics"}, "150": {"latitude": 69.657086000000007, "discipline": "8", "longitude": 104.0625, "label": "Psychosis; Schizophrenia"}, "153": {"latitude": 77.617709000000005, "discipline": "7", "longitude": -134.296875, "label": "Power Distribution"}, "152": {"latitude": 72.181804, "discipline": "7", "longitude": -144.140625, "label": "Parellel Computing"}, "155": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -83.671875, "label": "Wood"}, "154": {"latitude": 74.402163000000002, "discipline": "12", "longitude": 121.640625, "label": "Gerontology"}, "157": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Geology & Tectonics"}, "156": {"latitude": 78.490551999999994, "discipline": "11", "longitude": -152.578125, "label": "Discrete Applied Mathematics"}, "159": {"latitude": 74.402163000000002, "discipline": "7", "longitude": -146.953125, "label": "Mobile Networks"}, "158": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -63.984375, "label": "GeoChemistry"}, "399": {"latitude": 56.559482000000003, "discipline": "3", "longitude": 54.140625, "label": "Surgical Oncology"}, "398": {"latitude": 77.767582000000004, "discipline": "7", "longitude": -138.515625, "label": "Power Systems"}, "48": {"latitude": 58.813741999999998, "discipline": "10", "longitude": 23.203125, "label": "Molecular Cell Biology"}, "49": {"latitude": 69.411242000000001, "discipline": "5", "longitude": 4.21875, "label": "Food Chemistry"}, "46": {"latitude": 82.214217000000005, "discipline": "7", "longitude": -122.34375, "label": "Applied Optics"}, "47": {"latitude": 73.226699999999994, "discipline": "4", "longitude": -94.21875, "label": "Nuclear Engineering"}, "44": {"latitude": 63.548552000000001, "discipline": "8", "longitude": 74.53125, "label": "Neurosurgery"}, "45": {"latitude": 67.609221000000005, "discipline": "3", "longitude": 38.671875, "label": "Fertility"}, "42": {"latitude": 73.824820000000003, "discipline": "12", "longitude": 30.9375, "label": "Nutrition"}, "43": {"latitude": 59.534317999999999, "discipline": "13", "longitude": -177.890625, "label": "Finance"}, "40": {"latitude": 65.946472, "discipline": "8", "longitude": 99.84375, "label": "Clinical Neurophysiology"}, "41": {"latitude": 75.497157000000001, "discipline": "3", "longitude": 54.140625, "label": "Opthamology"}, "5": {"latitude": 76.679784999999995, "discipline": "7", "longitude": -140.625, "label": "Signal Processing"}, "489": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -143.4375, "label": "Consumer Electronics"}, "488": {"latitude": -12.554563999999999, "discipline": "9", "longitude": 166.640625, "label": "Social History"}, "487": {"latitude": -10.487812, "discipline": "1", "longitude": -28.125, "label": "Fish Biology"}, "486": {"latitude": 65.946472, "discipline": "13", "longitude": 178.59375, "label": "Operations Management"}, "485": {"latitude": 70.140364000000005, "discipline": "8", "longitude": 81.5625, "label": "Headache"}, "484": {"latitude": 78.767792, "discipline": "7", "longitude": -134.296875, "label": "Antennae; Mobile Radio"}, "483": {"latitude": 81.201419999999999, "discipline": "11", "longitude": -116.015625, "label": "Superconductor Science"}, "482": {"latitude": 81.413933, "discipline": "4", "longitude": -101.953125, "label": "Friction Lubrication & Wear"}, "481": {"latitude": 76.679784999999995, "discipline": "7", "longitude": -140.625, "label": "Circuits"}, "480": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -78.75, "label": "Wood Components"}, "472": {"latitude": 70.377853999999999, "discipline": "13", "longitude": 130.78125, "label": "Psychosomatic Medicine"}, "473": {"latitude": 80.647035000000002, "discipline": "12", "longitude": 66.09375, "label": "Pharmaco Economics"}, "470": {"latitude": 80.872827000000001, "discipline": "5", "longitude": -70.3125, "label": "Carbon"}, "471": {"latitude": 60.930432000000003, "discipline": "3", "longitude": 46.40625, "label": "Gynecology Oncology"}, "476": {"latitude": 75.320025000000001, "discipline": "11", "longitude": -161.71875, "label": "Cancer Statistics"}, "477": {"latitude": 67.339860999999999, "discipline": "8", "longitude": 118.125, "label": "Consciousness"}, "474": {"latitude": 78.061988999999997, "discipline": "7", "longitude": -149.765625, "label": "Computer Modeling and Animation"}, "475": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 78.75, "label": "Medical Practice"}, "478": {"latitude": 67.339860999999999, "discipline": "12", "longitude": 68.203125, "label": "Otolyngology; Head Neck"}, "479": {"latitude": 70.844673, "discipline": "3", "longitude": 59.0625, "label": "Heart Failure; Catheters"}};
-var SCIMAP_TYPE = {
-	DISCIPLINE: "DISCIPLINE",
-	SUBDISCIPLINE: "SUBDISCIPLINE"
-};
-
-function getDisciplineLabelImageURL(key) {
-	return disciplineLabelImageUrlPrefix + DISCIPLINES[key].image;
-}
-
-function getDisciplineBlackLabelImageURL(key) {
-	return disciplineBlackLabelImageUrlPrefix + DISCIPLINES[key].image;
-}
-
-function createScimapType(map, mapName) {
-	var sciMapTypeOptions = {
-		getTileUrl: function(coord, zoom) {
-			var normalizedCoord = getNormalizedCoord(coord, zoom);
-			if (!normalizedCoord) {
-				return mapOfScienceImageFolderPrefix + "tiles/blank.png";
-			}
-			var bound = Math.pow(2, zoom);
-			return mapOfScienceImageFolderPrefix + "tiles/tiles" + zoom + "_" + normalizedCoord.x + "_" +
-					normalizedCoord.y + ".png";
-		},
-		tileSize: new google.maps.Size(256, 256),
-		isPng: true,
-		minZoom: 1,
-		maxZoom: 4,
-		name: mapName
-	};
-	
-	var sciMapType = new google.maps.ImageMapType(sciMapTypeOptions);
-	new CopyrightPanel ({
-		map: map,
-		controlPositions: google.maps.ControlPosition.BOTTOM_RIGHT,
-		html: '&copy; 2008 The Regents of the University of California and SciTech Strategies.<br>' +
-				'Map updated by <a href="http://mapofscience.com">SciTech Strategies</a>, ' +
-				'<a href="http://www.ost.uqam.ca/" title="Observatoire des sciences et des technologies">OST</a>, ' +
-				'and <a href="http://cns.iu.edu" title="CyberInfrastructure for Network Science">CNS</a> in 2011.'
-	});
-	map.mapTypes.set(mapName, sciMapType);
-}
-
-//Normalizes the coords that tiles repeat across the x axis (horizontally)
-// like the standard Google map tiles.
-function getNormalizedCoord(coord, zoom) {
-	var y = coord.y;
-	var x = coord.x;
-	
-	// tile range in one direction range is dependent on zoom level
-	// 0 = 1 tile, 1 = 2 tiles, 2 = 4 tiles, 3 = 8 tiles, etc
-	var tileRange = 1 << zoom;
-	
-	// don't repeat across y-axis (vertically)
-	if (y < 0 || y > customTileRange(zoom)) {
-		return null;
-	}
-	
-	// repeat across x-axis (horizontal)
-	if (x < 0 || x >= tileRange) {
-		x = (x % tileRange + tileRange) % tileRange;
-	}
-	
-	return {
-		x: x,
-		y: y
-	};
-}
-
-// horizontal range bound
-function customTileRange(zoom) {
-	if (zoom < 3) {
-		return zoom;
-	} else if (zoom == 3){
-		return 4;
-	} else if (zoom == 4) {
-		return 9;
-	}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+var DISCIPLINES = {"11": {"labelLongitude": -154.60900000000001, "color": "#A819FA", "image": "mathphys.png", "longitude": -129.375, "label": "Math & Physics", "labelLatitude": 82.645889999999994, "latitude": 81.850399999999993}, "10": {"labelLongitude": 30.34375, "color": "#B8150B", "image": "infect.png", "longitude": 47.109375, "label": "Infectious Diseases", "labelLatitude": 49.801349999999999, "latitude": 55.881900000000002}, "13": {"labelLongitude": 120.0, "color": "#FFFF00", "image": "socsci.png", "longitude": 164.53125, "label": "Social Sciences", "labelLatitude": 46.0, "latitude": 61.695430000000002}, "12": {"labelLongitude": 101.5, "color": "#FF804D", "image": "health.png", "longitude": 76.641000000000005, "label": "Health Professionals", "labelLatitude": 84.591988000000001, "latitude": 83.217100000000002}, "1": {"labelLongitude": 10.4375, "color": "#379908", "image": "bio.png", "longitude": -19.6875, "label": "Biology", "labelLatitude": -20.576339999999998, "latitude": 1.593542}, "3": {"labelLongitude": 30.914000000000001, "color": "#FF0000", "image": "medspec.png", "longitude": 44.296875, "label": "Medical Specialties", "labelLatitude": 78.219527999999997, "latitude": 71.360810000000001}, "2": {"labelLongitude": -35.375, "color": "#00FF80", "image": "biotech.png", "longitude": 0.0, "label": "Biotechnology", "labelLatitude": 64.093400000000003, "latitude": 48.582349999999998}, "5": {"labelLongitude": -42.890000000000001, "color": "#0000FF", "image": "chem.png", "longitude": -45.703099999999999, "label": "Chemistry", "labelLatitude": 85.499639999999999, "latitude": 81.648629999999997}, "4": {"labelLongitude": -63.719999999999999, "color": "#61FFFF", "image": "chemeng.png", "longitude": -74.53125, "label": "Chemical, Mechanical, & Civil Engineering", "labelLatitude": 37.326900000000002, "latitude": 57.804189999999998}, "7": {"labelLongitude": -102.3125, "color": "#FF85FF", "image": "eecs.png", "longitude": -144.140625, "label": "Electrical Engineering & Computer Science", "labelLatitude": 71.558999999999997, "latitude": 75.890950000000004}, "6": {"labelLongitude": -75.078000000000003, "color": "#A71916", "image": "earthsci.png", "longitude": -52.734375, "label": "Earth Sciences", "labelLatitude": -37.3093, "latitude": -19.797000000000001}, "9": {"labelLongitude": 130.17099999999999, "color": "#FFFF80", "image": "human.png", "longitude": 163.125, "label": "Humanities", "labelLatitude": -20.454179, "latitude": -14.42333}, "8": {"labelLongitude": 75.078000000000003, "color": "#FFB529", "image": "brain.png", "longitude": 99.84375, "label": "Brain Research", "labelLatitude": 64.4636, "latitude": 68.724699999999999}};
+var SUBDISCIPLINES = {"344": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -92.109375, "label": "Printing"}, "345": {"latitude": 12.554563999999999, "discipline": "1", "longitude": -16.875, "label": "Genetics"}, "346": {"latitude": 74.402163000000002, "discipline": "4", "longitude": -94.21875, "label": "Industrial Chemistry"}, "347": {"latitude": 77.617709000000005, "discipline": "12", "longitude": 56.25, "label": "Obesity"}, "340": {"latitude": 11.178402, "discipline": "1", "longitude": 8.4375, "label": "Parasitology"}, "341": {"latitude": 54.162433999999998, "discipline": "10", "longitude": -1.40625, "label": "Dairy Science"}, "342": {"latitude": 42.553080000000001, "discipline": "4", "longitude": -65.390625, "label": "Water Policy"}, "343": {"latitude": -7.013668, "discipline": "1", "longitude": -38.671875, "label": "Fish Research"}, "348": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Literary Criticism"}, "349": {"latitude": 31.952162000000001, "discipline": "3", "longitude": 40.78125, "label": "Hepatology"}, "298": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 89.296875, "label": "AIDS Treatment"}, "299": {"latitude": 77.312520000000006, "discipline": "7", "longitude": -140.625, "label": "Wireless Communication"}, "296": {"latitude": 67.609221000000005, "discipline": "4", "longitude": -99.84375, "label": "Vehicle System Design"}, "297": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 35.859375, "label": "Transfusion"}, "294": {"latitude": 27.683527999999999, "discipline": "1", "longitude": -21.09375, "label": "Crop Science"}, "295": {"latitude": 74.775842999999995, "discipline": "7", "longitude": -148.359375, "label": "Fuzzy Sets"}, "292": {"latitude": 79.560546000000002, "discipline": "12", "longitude": 74.53125, "label": "Hospice Care"}, "293": {"latitude": -2.8113709999999998, "discipline": "6", "longitude": -54.140625, "label": "Climatology"}, "290": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 157.5, "label": "Science Education"}, "291": {"latitude": 74.775842999999995, "discipline": "11", "longitude": -156.09375, "label": "Design & Analysis of Algorithms"}, "199": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -68.203125, "label": "Catalysis"}, "198": {"latitude": 49.382373000000001, "discipline": "13", "longitude": 168.046875, "label": "Political Geography"}, "195": {"latitude": 81.723187999999993, "discipline": "5", "longitude": -23.203125, "label": "Atomic Spectrometry"}, "194": {"latitude": 80.647035000000002, "discipline": "12", "longitude": 62.578125, "label": "Dental Research"}, "197": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 63.984375, "label": "Public Health Service"}, "196": {"latitude": 16.636192000000001, "discipline": "1", "longitude": -22.5, "label": "Botany"}, "191": {"latitude": 80.872827000000001, "discipline": "12", "longitude": 63.984375, "label": "Prosthetic Dentistry"}, "190": {"latitude": 57.704146999999999, "discipline": "3", "longitude": 33.046875, "label": "Clinical Infectious Disease"}, "193": {"latitude": 74.959391999999994, "discipline": "7", "longitude": -139.921875, "label": "Robotic Systems"}, "192": {"latitude": 79.812302000000003, "discipline": "12", "longitude": 60.46875, "label": "Orthodontics"}, "270": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "Agricultural Economics"}, "271": {"latitude": 65.366837000000004, "discipline": "13", "longitude": 143.4375, "label": "Social Work"}, "272": {"latitude": 83.753911000000002, "discipline": "12", "longitude": 80.15625, "label": "Medical Insurance"}, "273": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -76.640625, "label": "Fluid Phase Equilibrium"}, "274": {"latitude": 52.052489999999999, "discipline": "2", "longitude": 7.734375, "label": "Biotechnology Trends"}, "275": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -58.359375, "label": "Air Quality"}, "276": {"latitude": 68.911005000000003, "discipline": "7", "longitude": -168.046875, "label": "Search Engines; Web Crawling"}, "277": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -78.75, "label": "Colloid"}, "278": {"latitude": 76.351895999999996, "discipline": "12", "longitude": 61.875, "label": "Applied Physiology; Muscle"}, "279": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Biblical Literature"}, "524": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -23.90625, "label": "Mammals"}, "525": {"latitude": 30.751277999999999, "discipline": "3", "longitude": 54.84375, "label": "Impotence"}, "526": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -144.140625, "label": "Fuzzy Logic"}, "527": {"latitude": 58.813741999999998, "discipline": "13", "longitude": 168.75, "label": "Tourism"}, "520": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -35.859375, "label": "Rangeland Ecology"}, "521": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -100.546875, "label": "Welding"}, "522": {"latitude": 74.402163000000002, "discipline": "13", "longitude": -168.75, "label": "Reliability Engineering"}, "523": {"latitude": 48.458351999999998, "discipline": "10", "longitude": 18.984375, "label": "Molecular Biology Methods"}, "528": {"latitude": -14.604846999999999, "discipline": "1", "longitude": -19.6875, "label": "Aquatic Disease"}, "529": {"latitude": -23.885838, "discipline": "6", "longitude": -63.28125, "label": "Geographic Information Science"}, "449": {"latitude": 38.822591000000003, "discipline": "2", "longitude": 1.40625, "label": "Systematics & Evolutionary Microbiology"}, "448": {"latitude": 78.490551999999994, "discipline": "4", "longitude": -97.03125, "label": "Sensors & Actuators"}, "443": {"latitude": 55.776572999999999, "discipline": "10", "longitude": 23.90625, "label": "Sexually Transmitted Diseases"}, "442": {"latitude": 38.822591000000003, "discipline": "4", "longitude": -75.9375, "label": "Applied Geophysics"}, "441": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 9.84375, "label": "Peptides"}, "440": {"latitude": 76.679784999999995, "discipline": "4", "longitude": -88.59375, "label": "Digital Printing"}, "447": {"latitude": 83.277704999999997, "discipline": "12", "longitude": 88.59375, "label": "Geratric Nursing"}, "446": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -157.5, "label": "Machine Learning"}, "445": {"latitude": 65.946472, "discipline": "8", "longitude": 81.5625, "label": "NeuroImmunology"}, "444": {"latitude": 58.813741999999998, "discipline": "13", "longitude": 156.796875, "label": "Engineering Education"}, "108": {"latitude": 82.586106000000001, "discipline": "11", "longitude": -127.265625, "label": "Chaos Fractals & Complexity"}, "109": {"latitude": 12.554563999999999, "discipline": "1", "longitude": -21.09375, "label": "Environmental Contamination"}, "102": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -101.953125, "label": "Alloys"}, "103": {"latitude": 80.647035000000002, "discipline": "11", "longitude": -116.015625, "label": "Astronomy & Astrophysics"}, "100": {"latitude": 84.673513, "discipline": "12", "longitude": 85.78125, "label": "Employee Health Benefit Plans"}, "101": {"latitude": 63.548552000000001, "discipline": "3", "longitude": 51.328125, "label": "Transplantation"}, "106": {"latitude": 83.676942999999994, "discipline": "12", "longitude": 59.0625, "label": "Drug Discovery"}, "107": {"latitude": 39.909736000000002, "discipline": "10", "longitude": -2.109375, "label": "Animal Science"}, "104": {"latitude": 72.816074, "discipline": "12", "longitude": 112.5, "label": "Substance-abuse Treatment"}, "105": {"latitude": 64.472793999999993, "discipline": "13", "longitude": 174.375, "label": "Research Policy; Technology Management"}, "39": {"latitude": 78.903929000000005, "discipline": "3", "longitude": 45.0, "label": "Diabetes Care"}, "38": {"latitude": 82.308892999999998, "discipline": "11", "longitude": -106.875, "label": "Semiconducting Materials"}, "33": {"latitude": 64.168107000000006, "discipline": "3", "longitude": 30.234375, "label": "Toxicology Applied Pharmacology"}, "32": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Digestion"}, "31": {"latitude": 62.267923000000003, "discipline": "3", "longitude": 45.0, "label": "Developmental Biology"}, "30": {"latitude": -7.013668, "discipline": "1", "longitude": -38.671875, "label": "Marine Biology"}, "37": {"latitude": 81.823794000000007, "discipline": "5", "longitude": 5.625, "label": "Pharmaceutical Research"}, "36": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -84.375, "label": "Chemical Engineering"}, "35": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -49.921875, "label": "Inorganic Chemistry"}, "34": {"latitude": 63.548552000000001, "discipline": "4", "longitude": -93.515625, "label": "Transportation Research"}, "438": {"latitude": 52.052489999999999, "discipline": "13", "longitude": 171.5625, "label": "Regional Studies"}, "439": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -102.65625, "label": "Electrochemical Development"}, "436": {"latitude": 68.399180000000001, "discipline": "4", "longitude": -88.59375, "label": "Construction"}, "437": {"latitude": 56.944974000000002, "discipline": "4", "longitude": -82.265625, "label": "Dams & Tunnels"}, "434": {"latitude": 51.179343000000003, "discipline": "13", "longitude": 169.453125, "label": "Environmental Policy"}, "435": {"latitude": 80.532071000000002, "discipline": "11", "longitude": -145.546875, "label": "Topology"}, "432": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -47.109375, "label": "Liquid Crystals"}, "433": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -144.140625, "label": "Control Systems"}, "430": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -146.953125, "label": "User Interface Design"}, "431": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 168.046875, "label": "Public Policy"}, "339": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -32.34375, "label": "Environmental Chemistry"}, "338": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Geology (International)"}, "335": {"latitude": 44.087584999999997, "discipline": "4", "longitude": -67.5, "label": "Hydrology Soil Contamination"}, "334": {"latitude": -31.952162000000001, "discipline": "9", "longitude": 172.96875, "label": "Contemporary Philosophy"}, "337": {"latitude": 81.823794000000007, "discipline": "11", "longitude": -144.84375, "label": "Mathematics Research"}, "336": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 132.1875, "label": "Child Abuse"}, "331": {"latitude": 77.617709000000005, "discipline": "7", "longitude": -153.984375, "label": "Logic"}, "330": {"latitude": 78.767792, "discipline": "7", "longitude": -131.484375, "label": "Test Equipment"}, "333": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -82.265625, "label": "Textiles"}, "332": {"latitude": 78.903929000000005, "discipline": "4", "longitude": -82.265625, "label": "Pulp Paper Science"}, "6": {"latitude": 65.366837000000004, "discipline": "8", "longitude": 72.421875, "label": "Neuroscience; Molecular & Cellular"}, "99": {"latitude": 75.320025000000001, "discipline": "13", "longitude": 177.890625, "label": "BioStatistics"}, "98": {"latitude": 72.607119999999995, "discipline": "4", "longitude": -108.28125, "label": "Automotive Engineering"}, "91": {"latitude": 59.534317999999999, "discipline": "3", "longitude": 30.9375, "label": "AIDS Research"}, "90": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -97.734375, "label": "Ceramics"}, "93": {"latitude": 84.474064999999996, "discipline": "12", "longitude": 87.890625, "label": "Medical Records"}, "92": {"latitude": 68.138852, "discipline": "4", "longitude": -109.6875, "label": "Military Aviation"}, "95": {"latitude": 52.482779999999998, "discipline": "13", "longitude": 179.296875, "label": "Applied Economics"}, "94": {"latitude": 74.211983000000004, "discipline": "13", "longitude": -174.375, "label": "Statistics"}, "97": {"latitude": -4.2149429999999999, "discipline": "6", "longitude": -55.546875, "label": "Atmospheric Science"}, "96": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -136.40625, "label": "Automatic Control"}, "554": {"latitude": 55.379109999999997, "discipline": "10", "longitude": 23.203125, "label": "Agricultural Environmental Medicine"}, "551": {"latitude": -9.1020970000000005, "discipline": "1", "longitude": -33.75, "label": "Wetlands"}, "550": {"latitude": 54.162433999999998, "discipline": "4", "longitude": -82.265625, "label": "Bulk Solid Handling"}, "553": {"latitude": 72.607119999999995, "discipline": "7", "longitude": -124.453125, "label": "Hydraulics"}, "552": {"latitude": -21.943045999999999, "discipline": "6", "longitude": -59.0625, "label": "GIS (non English)"}, "238": {"latitude": 77.312520000000006, "discipline": "3", "longitude": 47.109375, "label": "Diabetes Metabolism"}, "239": {"latitude": 59.534317999999999, "discipline": "4", "longitude": -79.453125, "label": "Geotechnical Engineering"}, "234": {"latitude": 59.888936999999999, "discipline": "13", "longitude": 158.203125, "label": "Symbolic Interaction"}, "235": {"latitude": 69.411242000000001, "discipline": "8", "longitude": 124.453125, "label": "Child & Adolescent Psychiatry"}, "236": {"latitude": 83.277704999999997, "discipline": "12", "longitude": 83.671875, "label": "General Practice"}, "237": {"latitude": 50.736454999999999, "discipline": "13", "longitude": 175.078125, "label": "Environmental Management"}, "230": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Hispanic Studies"}, "231": {"latitude": 7.013668, "discipline": "1", "longitude": -33.046875, "label": "Forest Science"}, "232": {"latitude": 82.214217000000005, "discipline": "11", "longitude": -118.125, "label": "Plasma Physics"}, "233": {"latitude": 65.072130000000001, "discipline": "2", "longitude": 4.921875, "label": "Proteomics"}, "1": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 35.859375, "label": "Clinical Cancer Research"}, "146": {"latitude": 54.162433999999998, "discipline": "2", "longitude": 4.921875, "label": "BioInformatics"}, "147": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -104.765625, "label": "Mechanics of Solids & Structures"}, "144": {"latitude": 71.524908999999994, "discipline": "8", "longitude": 94.21875, "label": "Vision"}, "145": {"latitude": 59.888936999999999, "discipline": "13", "longitude": 168.046875, "label": "Communication Research"}, "142": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 163.828125, "label": "Music & Theatre"}, "143": {"latitude": 66.791909000000004, "discipline": "8", "longitude": 113.203125, "label": "Memory & Cognition"}, "140": {"latitude": 74.775842999999995, "discipline": "12", "longitude": 64.6875, "label": "Alternative Complementary Medicine"}, "141": {"latitude": 54.572062000000003, "discipline": "4", "longitude": -82.265625, "label": "Petroleum Engineering"}, "148": {"latitude": 76.679784999999995, "discipline": "3", "longitude": 48.515625, "label": "Pharmacy"}, "149": {"latitude": -7.013668, "discipline": "6", "longitude": -58.359375, "label": "Geomorphology"}, "133": {"latitude": 43.068888000000001, "discipline": "10", "longitude": 9.140625, "label": "Veterinary Science"}, "132": {"latitude": 83.520161999999999, "discipline": "4", "longitude": -82.96875, "label": "Corrosion"}, "131": {"latitude": 8.4071680000000004, "discipline": "1", "longitude": -9.84375, "label": "Pest Management Science"}, "130": {"latitude": 58.813741999999998, "discipline": "3", "longitude": 45.0, "label": "Pathology"}, "137": {"latitude": 74.402163000000002, "discipline": "7", "longitude": -149.765625, "label": "Neural Networks"}, "136": {"latitude": 76.840816000000004, "discipline": "7", "longitude": -146.953125, "label": "Image Processing"}, "135": {"latitude": 69.411242000000001, "discipline": "3", "longitude": 32.34375, "label": "Stem Cells"}, "134": {"latitude": 63.233626999999998, "discipline": "13", "longitude": 158.203125, "label": "Teacher Education; Evaluation"}, "494": {"latitude": 84.541360999999995, "discipline": "12", "longitude": 81.5625, "label": "Medical Libraries"}, "495": {"latitude": -31.952162000000001, "discipline": "9", "longitude": 164.53125, "label": "Opera"}, "139": {"latitude": 68.399180000000001, "discipline": "3", "longitude": 59.0625, "label": "Intensive Care"}, "138": {"latitude": 83.520161999999999, "discipline": "12", "longitude": 99.84375, "label": "Nursing Education"}, "490": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 41.484375, "label": "Menopause"}, "491": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -44.296875, "label": "Chemistry (Russia)"}, "492": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 166.640625, "label": "GeoPolitics"}, "493": {"latitude": -10.487812, "discipline": "6", "longitude": -57.65625, "label": "Glaciology"}, "24": {"latitude": 76.351895999999996, "discipline": "3", "longitude": 47.8125, "label": "Dermatology"}, "25": {"latitude": 66.791909000000004, "discipline": "3", "longitude": 54.84375, "label": "Kidney"}, "26": {"latitude": 62.267923000000003, "discipline": "3", "longitude": 56.953125, "label": "Pharmacology Science"}, "27": {"latitude": 38.822591000000003, "discipline": "13", "longitude": 167.34375, "label": "Law"}, "20": {"latitude": 49.837981999999997, "discipline": "10", "longitude": 25.3125, "label": "Virology"}, "21": {"latitude": 31.952162000000001, "discipline": "1", "longitude": -7.734375, "label": "Plant Physiology"}, "22": {"latitude": 62.593341000000002, "discipline": "3", "longitude": 47.8125, "label": "Allergy & Clinical Immunology"}, "23": {"latitude": 81.823794000000007, "discipline": "4", "longitude": -102.65625, "label": "Material Science"}, "28": {"latitude": 63.233626999999998, "discipline": "8", "longitude": 64.6875, "label": "Medical Imaging"}, "29": {"latitude": 52.052489999999999, "discipline": "10", "longitude": 10.546875, "label": "Bacteriology"}, "407": {"latitude": -15.961328999999999, "discipline": "9", "longitude": 165.234375, "label": "Ethics"}, "406": {"latitude": 79.171334999999999, "discipline": "4", "longitude": -99.140625, "label": "Metallurgy"}, "405": {"latitude": 65.072130000000001, "discipline": "3", "longitude": 56.25, "label": "Clinical Rehabilitation"}, "404": {"latitude": 3.5134210000000001, "discipline": "1", "longitude": -33.75, "label": "Ecological Modeling"}, "403": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 167.34375, "label": "Human Resource Management"}, "402": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 26.015625, "label": "Molecular Medicine"}, "401": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -16.875, "label": "Sociobiology"}, "400": {"latitude": 73.428424000000007, "discipline": "7", "longitude": -139.21875, "label": "Chip Design & Manufacturing"}, "409": {"latitude": 74.402163000000002, "discipline": "4", "longitude": -121.640625, "label": "Aerospace"}, "408": {"latitude": 66.791909000000004, "discipline": "13", "longitude": 133.59375, "label": "Marital & Family Therapy"}, "379": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 167.34375, "label": "German Studies"}, "378": {"latitude": 50.736454999999999, "discipline": "3", "longitude": 63.984375, "label": "Radiology"}, "371": {"latitude": 71.074055999999999, "discipline": "7", "longitude": -153.984375, "label": "Functional Programing"}, "370": {"latitude": 78.349411000000003, "discipline": "7", "longitude": -146.25, "label": "Electronic Imaging"}, "373": {"latitude": 14.604846999999999, "discipline": "1", "longitude": -15.46875, "label": "Plant Disease"}, "372": {"latitude": 18.646245, "discipline": "1", "longitude": -9.84375, "label": "Applied Genetics"}, "375": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "Developmental Economics"}, "374": {"latitude": 23.885838, "discipline": "6", "longitude": -59.0625, "label": "Water Resource"}, "377": {"latitude": 53.330872999999997, "discipline": "13", "longitude": -179.296875, "label": "International Economics"}, "376": {"latitude": 81.723187999999993, "discipline": "11", "longitude": -108.28125, "label": "Nuclear Physics"}, "393": {"latitude": 80.532071000000002, "discipline": "11", "longitude": -145.546875, "label": "Mathematical Science (Russia)"}, "392": {"latitude": 81.201419999999999, "discipline": "11", "longitude": -145.546875, "label": "Optimization Theory"}, "88": {"latitude": 84.267172000000002, "discipline": "5", "longitude": -77.34375, "label": "Computational Chemistry"}, "89": {"latitude": 58.813741999999998, "discipline": "3", "longitude": 58.359375, "label": "Surgery"}, "397": {"latitude": 83.753911000000002, "discipline": "12", "longitude": 83.671875, "label": "Rural Health Care"}, "396": {"latitude": 81.518271999999996, "discipline": "4", "longitude": -100.546875, "label": "Materials Processing"}, "395": {"latitude": 73.226699999999994, "discipline": "7", "longitude": -146.953125, "label": "Security; Cryptography"}, "394": {"latitude": 55.776572999999999, "discipline": "10", "longitude": 37.265625, "label": "Gene Therapy"}, "82": {"latitude": 75.497157000000001, "discipline": "3", "longitude": 40.78125, "label": "Clinical Endocrinology"}, "83": {"latitude": 78.767792, "discipline": "3", "longitude": 42.1875, "label": "Dietetics"}, "80": {"latitude": 76.840816000000004, "discipline": "12", "longitude": 57.65625, "label": "Hypertension"}, "81": {"latitude": 55.776572999999999, "discipline": "3", "longitude": 53.4375, "label": "Human Molecular Genetics"}, "86": {"latitude": 73.428424000000007, "discipline": "4", "longitude": -98.4375, "label": "Gas Turbines"}, "87": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -53.4375, "label": "Remote Sensing"}, "84": {"latitude": 54.162433999999998, "discipline": "10", "longitude": 18.28125, "label": "Clinical Microbiology"}, "85": {"latitude": 81.518271999999996, "discipline": "12", "longitude": 63.984375, "label": "Hospital Pharmacy"}, "7": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 61.171875, "label": "Anesthetics & Analgesics"}, "245": {"latitude": 43.068888000000001, "discipline": "4", "longitude": -64.6875, "label": "Water Quality & Resource Management"}, "244": {"latitude": 68.911005000000003, "discipline": "13", "longitude": 141.328125, "label": "Eating Disorders; Sex Roles"}, "247": {"latitude": 68.911005000000003, "discipline": "8", "longitude": 104.0625, "label": "Geriatric Psychiatry"}, "246": {"latitude": 46.073231, "discipline": "13", "longitude": 168.046875, "label": "Ethnic Migration"}, "241": {"latitude": 68.911005000000003, "discipline": "3", "longitude": 47.8125, "label": "Clinical Chemistry"}, "240": {"latitude": 81.201419999999999, "discipline": "7", "longitude": -125.15625, "label": "Instrumentation"}, "243": {"latitude": 71.074055999999999, "discipline": "12", "longitude": 71.015625, "label": "Arthroscopy"}, "242": {"latitude": 71.074055999999999, "discipline": "4", "longitude": -94.921875, "label": "Fluid Engineering"}, "249": {"latitude": 72.607119999999995, "discipline": "4", "longitude": -90.703125, "label": "Ore Processing"}, "248": {"latitude": 71.965388000000004, "discipline": "4", "longitude": -107.578125, "label": "Sound & Vibration"}, "519": {"latitude": 73.226699999999994, "discipline": "8", "longitude": 99.140625, "label": "Forensic Science"}, "518": {"latitude": 82.494823999999994, "discipline": "4", "longitude": -101.25, "label": "Defects & Diffusion in Materials"}, "511": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 165.9375, "label": "Human Rights"}, "510": {"latitude": 62.593341000000002, "discipline": "8", "longitude": 77.34375, "label": "Hearing Research"}, "513": {"latitude": 53.330872999999997, "discipline": "13", "longitude": 178.59375, "label": "Social Economics"}, "512": {"latitude": 59.534317999999999, "discipline": "3", "longitude": 54.140625, "label": "Lung Cancer"}, "515": {"latitude": 55.379109999999997, "discipline": "2", "longitude": 2.109375, "label": "Biotechnology Bioengineering"}, "514": {"latitude": 65.946472, "discipline": "5", "longitude": -20.390625, "label": "Carbohydrate Research"}, "517": {"latitude": 81.413933, "discipline": "7", "longitude": -125.15625, "label": "Electronics"}, "516": {"latitude": 43.068888000000001, "discipline": "13", "longitude": 168.75, "label": "Rural Studies"}, "458": {"latitude": 72.181804, "discipline": "7", "longitude": -150.46875, "label": "Computer Systems Theory"}, "459": {"latitude": 69.657086000000007, "discipline": "4", "longitude": -94.21875, "label": "Combustion"}, "450": {"latitude": 78.903929000000005, "discipline": "7", "longitude": -140.625, "label": "Medical Image Processing"}, "451": {"latitude": 81.823794000000007, "discipline": "12", "longitude": 70.3125, "label": "Medical Education"}, "452": {"latitude": 62.593341000000002, "discipline": "8", "longitude": 70.3125, "label": "Magnetic Resonance Imagery"}, "453": {"latitude": 84.865781999999996, "discipline": "12", "longitude": 78.046875, "label": "Hospital Management"}, "454": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -6.328125, "label": "Insect Physiology"}, "455": {"latitude": 78.061988999999997, "discipline": "7", "longitude": -134.296875, "label": "Power Transmission"}, "456": {"latitude": 55.776572999999999, "discipline": "2", "longitude": -7.734375, "label": "Food Engineering"}, "457": {"latitude": 77.617709000000005, "discipline": "12", "longitude": 67.5, "label": "Oral Surgery"}, "179": {"latitude": 84.124972999999997, "discipline": "5", "longitude": -91.40625, "label": "Molecular Physics"}, "178": {"latitude": 74.775842999999995, "discipline": "12", "longitude": 68.90625, "label": "Biomechanics"}, "177": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -82.265625, "label": "Wool"}, "176": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -117.421875, "label": "Optics & Lasers"}, "175": {"latitude": 80.872827000000001, "discipline": "7", "longitude": -122.34375, "label": "Solid State Electronics"}, "174": {"latitude": 68.911005000000003, "discipline": "8", "longitude": 107.578125, "label": "Geriatrics"}, "173": {"latitude": 70.140364000000005, "discipline": "13", "longitude": -166.640625, "label": "Computer-Aided Process Planning"}, "172": {"latitude": 31.952162000000001, "discipline": "4", "longitude": -42.1875, "label": "Agricultural Engineering"}, "171": {"latitude": 65.072130000000001, "discipline": "13", "longitude": 172.96875, "label": "Leadership & Organizational Behavior"}, "170": {"latitude": -2.8113709999999998, "discipline": "9", "longitude": 165.9375, "label": "American History"}, "253": {"latitude": 80.297927000000001, "discipline": "7", "longitude": -126.5625, "label": "Dielectrics"}, "182": {"latitude": -17.978732999999998, "discipline": "9", "longitude": 168.75, "label": "Science History"}, "183": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.9375, "label": "Poetry"}, "180": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -20.390625, "label": "Comparative Animal Physiology"}, "181": {"latitude": 49.382373000000001, "discipline": "13", "longitude": 165.9375, "label": "Political Science"}, "186": {"latitude": 77.157162999999997, "discipline": "7", "longitude": -143.4375, "label": "Speech Recognition"}, "187": {"latitude": 76.184995000000001, "discipline": "4", "longitude": -103.359375, "label": "Fluid Mechanics"}, "184": {"latitude": 51.179343000000003, "discipline": "3", "longitude": 63.28125, "label": "Nuclear Medicine"}, "185": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -92.109375, "label": "Nanotechnology"}, "188": {"latitude": 76.184995000000001, "discipline": "7", "longitude": -149.0625, "label": "Computer Graphics"}, "189": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -73.125, "label": "Filtration Membrane"}, "11": {"latitude": 70.844673, "discipline": "8", "longitude": 109.6875, "label": "Affective Disorders"}, "10": {"latitude": 79.812302000000003, "discipline": "5", "longitude": -54.140625, "label": "Macromolecules & Polymers"}, "13": {"latitude": 83.026218999999998, "discipline": "11", "longitude": -106.171875, "label": "Surface Science"}, "12": {"latitude": 58.447732999999999, "discipline": "3", "longitude": 52.03125, "label": "Oncology"}, "15": {"latitude": 84.124972999999997, "discipline": "12", "longitude": 85.78125, "label": "Hospital Financial Management"}, "14": {"latitude": 79.935918000000001, "discipline": "11", "longitude": -149.0625, "label": "Nonlinear Analysis"}, "17": {"latitude": 81.518271999999996, "discipline": "12", "longitude": 32.34375, "label": "Occupational Health"}, "16": {"latitude": 67.339860999999999, "discipline": "3", "longitude": 47.8125, "label": "Rheumatology"}, "19": {"latitude": 61.606395999999997, "discipline": "3", "longitude": 38.671875, "label": "Leukemia"}, "18": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -44.296875, "label": "Organic Chemistry"}, "62": {"latitude": 72.816074, "discipline": "12", "longitude": 69.609375, "label": "Bone Joint Surgery"}, "322": {"latitude": 79.171334999999999, "discipline": "11", "longitude": -122.34375, "label": "Space Research"}, "323": {"latitude": -7.013668, "discipline": "1", "longitude": -15.46875, "label": "Entomology"}, "320": {"latitude": 53.330872999999997, "discipline": "10", "longitude": 28.828125, "label": "Mutation; DNA Repair"}, "321": {"latitude": -12.554563999999999, "discipline": "1", "longitude": -24.609375, "label": "Human Evolution"}, "326": {"latitude": 83.676942999999994, "discipline": "5", "longitude": -35.859375, "label": "Computer Aided Molecular Design"}, "327": {"latitude": 60.586967000000001, "discipline": "13", "longitude": 144.84375, "label": "Criminology"}, "324": {"latitude": 65.946472, "discipline": "8", "longitude": 92.8125, "label": "Epilepsy"}, "325": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -29.53125, "label": "Plant Ecology"}, "328": {"latitude": 70.844673, "discipline": "8", "longitude": 122.34375, "label": "Forensic Psychiatry"}, "329": {"latitude": 70.844673, "discipline": "13", "longitude": 139.921875, "label": "Personality"}, "201": {"latitude": 80.647035000000002, "discipline": "4", "longitude": -108.984375, "label": "Machine Tools"}, "200": {"latitude": 40.446947000000002, "discipline": "3", "longitude": 68.203125, "label": "Radiation Protection"}, "203": {"latitude": 80.178713999999999, "discipline": "12", "longitude": 59.765625, "label": "Periodontology"}, "202": {"latitude": 44.590466999999997, "discipline": "10", "longitude": 6.328125, "label": "Veterinary Medicine"}, "205": {"latitude": 71.074055999999999, "discipline": "3", "longitude": 52.03125, "label": "Thrombosis"}, "204": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 52.03125, "label": "Birth Defects"}, "207": {"latitude": 82.494823999999994, "discipline": "12", "longitude": 104.0625, "label": "Mental Health Nursing"}, "206": {"latitude": -7.013668, "discipline": "1", "longitude": -35.859375, "label": "Freshwater Biology"}, "209": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "English Literature"}, "208": {"latitude": 72.607119999999995, "discipline": "7", "longitude": -157.5, "label": "Artificial Evolution"}, "77": {"latitude": 71.965388000000004, "discipline": "3", "longitude": 54.140625, "label": "Cardiovascular"}, "76": {"latitude": 68.399180000000001, "discipline": "3", "longitude": 45.0, "label": "Pediatrics"}, "75": {"latitude": 80.532071000000002, "discipline": "5", "longitude": -20.390625, "label": "Chromatography; Electrophoresis"}, "74": {"latitude": 70.844673, "discipline": "13", "longitude": -167.34375, "label": "Operations Research"}, "73": {"latitude": 76.184995000000001, "discipline": "12", "longitude": 75.9375, "label": "Sports Medicine"}, "72": {"latitude": 3.5134210000000001, "discipline": "6", "longitude": -58.359375, "label": "Oceanography"}, "71": {"latitude": 72.181804, "discipline": "12", "longitude": 127.265625, "label": "Psychoanalysis"}, "70": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -108.984375, "label": "Aeronautics & Astronautics"}, "79": {"latitude": 50.736454999999999, "discipline": "13", "longitude": 177.890625, "label": "Economics"}, "78": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -51.328125, "label": "Paleobiology"}, "2": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 59.765625, "label": "Circulation"}, "542": {"latitude": 76.184995000000001, "discipline": "12", "longitude": 87.1875, "label": "Perception Motor Skills"}, "543": {"latitude": 40.446947000000002, "discipline": "13", "longitude": 167.34375, "label": "World Trade; Law"}, "540": {"latitude": 77.617709000000005, "discipline": "4", "longitude": -74.53125, "label": "Textile Art"}, "541": {"latitude": -23.885838, "discipline": "9", "longitude": 165.234375, "label": "Italian Studies"}, "546": {"latitude": 83.026218999999998, "discipline": "5", "longitude": -64.6875, "label": "Paints & Coatings"}, "547": {"latitude": 83.979259999999996, "discipline": "12", "longitude": 100.546875, "label": "Nursing Theory"}, "544": {"latitude": -7.013668, "discipline": "1", "longitude": -20.390625, "label": "Insects"}, "545": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -28.828125, "label": "Australian Ecology"}, "8": {"latitude": 52.482779999999998, "discipline": "3", "longitude": 51.328125, "label": "Urology"}, "548": {"latitude": -12.554563999999999, "discipline": "1", "longitude": -32.34375, "label": "Crustaceans"}, "549": {"latitude": 79.560546000000002, "discipline": "12", "longitude": 52.03125, "label": "Laser Surgery"}, "68": {"latitude": 75.497157000000001, "discipline": "12", "longitude": 60.46875, "label": "Retinal Surgery"}, "120": {"latitude": 18.646245, "discipline": "4", "longitude": -44.296875, "label": "Soil Quality"}, "121": {"latitude": 76.351895999999996, "discipline": "7", "longitude": -139.21875, "label": "Integrated Circuit Design"}, "122": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 179.296875, "label": "Philosophy Psychology"}, "123": {"latitude": 65.946472, "discipline": "13", "longitude": 178.59375, "label": "Construction & Project Management"}, "124": {"latitude": 67.609221000000005, "discipline": "13", "longitude": 144.84375, "label": "Social Psychology"}, "125": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -117.421875, "label": "High Energy Physics"}, "126": {"latitude": 63.548552000000001, "discipline": "13", "longitude": 171.5625, "label": "Strategic Management"}, "127": {"latitude": 38.822591000000003, "discipline": "2", "longitude": 14.0625, "label": "Genomics & Nucleic Acids"}, "128": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -97.03125, "label": "Heat Transfer"}, "129": {"latitude": 69.411242000000001, "discipline": "4", "longitude": -82.96875, "label": "Cement & Concrete"}, "414": {"latitude": 72.607119999999995, "discipline": "12", "longitude": 75.9375, "label": "Trauma"}, "415": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -34.453125, "label": "Thermal Analysis"}, "416": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -98.4375, "label": "Solar & Wind Power"}, "417": {"latitude": 49.837981999999997, "discipline": "4", "longitude": -82.265625, "label": "Ocean Engineering"}, "410": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 165.234375, "label": "Critical Studies"}, "411": {"latitude": 56.944974000000002, "discipline": "13", "longitude": 177.890625, "label": "Econometrics"}, "412": {"latitude": 67.609221000000005, "discipline": "8", "longitude": 103.359375, "label": "Neuroscience Methods"}, "413": {"latitude": -2.8113709999999998, "discipline": "6", "longitude": -65.390625, "label": "Mineralogy"}, "498": {"latitude": 11.178402, "discipline": "13", "longitude": 159.609375, "label": "Pragmatics & Discourse"}, "418": {"latitude": 61.606395999999997, "discipline": "13", "longitude": 146.953125, "label": "Educational Psychology"}, "419": {"latitude": 7.013668, "discipline": "1", "longitude": -23.90625, "label": "Mycology"}, "499": {"latitude": 54.572062000000003, "discipline": "10", "longitude": 17.578125, "label": "Reproduction Veterinary"}, "319": {"latitude": 57.704146999999999, "discipline": "3", "longitude": 55.546875, "label": "Clinical Medicine (translated)"}, "318": {"latitude": 71.524908999999994, "discipline": "12", "longitude": 118.125, "label": "Mental Health Assessment"}, "313": {"latitude": 72.607119999999995, "discipline": "12", "longitude": 74.53125, "label": "Pain"}, "312": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 131.484375, "label": "Child Development"}, "311": {"latitude": 81.723187999999993, "discipline": "12", "longitude": 47.109375, "label": "Medical Screening & Epidemiology"}, "310": {"latitude": 83.676942999999994, "discipline": "5", "longitude": -82.265625, "label": "Chemistry & Material Science"}, "317": {"latitude": 76.351895999999996, "discipline": "7", "longitude": -143.4375, "label": "Pattern Recognition"}, "316": {"latitude": 58.813741999999998, "discipline": "4", "longitude": -82.265625, "label": "Safety Management"}, "315": {"latitude": 17.978732999999998, "discipline": "1", "longitude": -31.640625, "label": "Soil Analysis"}, "314": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 168.75, "label": "Public Administration"}, "496": {"latitude": 57.704146999999999, "discipline": "13", "longitude": 156.09375, "label": "Education"}, "497": {"latitude": 73.428424000000007, "discipline": "4", "longitude": -103.359375, "label": "Acoustics"}, "3": {"latitude": 74.211983000000004, "discipline": "7", "longitude": -152.578125, "label": "Data Mining"}, "368": {"latitude": 58.447732999999999, "discipline": "4", "longitude": -108.984375, "label": "Naval Architecture"}, "369": {"latitude": -0.70310700000000004, "discipline": "1", "longitude": -42.890625, "label": "Environmental Microbiology"}, "366": {"latitude": 74.959391999999994, "discipline": "3", "longitude": 42.890625, "label": "Eye"}, "367": {"latitude": 74.959391999999994, "discipline": "12", "longitude": 116.015625, "label": "Addictive Behavior"}, "364": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -61.875, "label": "Geodesy"}, "365": {"latitude": 84.474064999999996, "discipline": "5", "longitude": -77.34375, "label": "Surfactants"}, "362": {"latitude": 52.482779999999998, "discipline": "4", "longitude": -73.125, "label": "Water Utilities"}, "363": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Sedimentary Geology"}, "360": {"latitude": 52.052489999999999, "discipline": "13", "longitude": 174.375, "label": "Financial Accounting"}, "361": {"latitude": 49.382373000000001, "discipline": "2", "longitude": -8.4375, "label": "Microbiology Biotechnology"}, "380": {"latitude": -19.973348999999999, "discipline": "9", "longitude": 163.828125, "label": "Medieval History"}, "381": {"latitude": -39.909736000000002, "discipline": "9", "longitude": 179.296875, "label": "Philosophy of Education"}, "382": {"latitude": 61.606395999999997, "discipline": "4", "longitude": -104.765625, "label": "Oceanographic Instrumentation"}, "383": {"latitude": 46.073231, "discipline": "13", "longitude": 168.75, "label": "Foreign Policy"}, "384": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Gut"}, "385": {"latitude": 81.723187999999993, "discipline": "7", "longitude": -126.5625, "label": "Microwaves; Radio Frequencies"}, "386": {"latitude": 67.339860999999999, "discipline": "13", "longitude": 134.296875, "label": "School Psychology"}, "387": {"latitude": 54.572062000000003, "discipline": "10", "longitude": 29.53125, "label": "Vaccines"}, "388": {"latitude": 47.040182000000001, "discipline": "13", "longitude": 171.5625, "label": "Environmental Law"}, "389": {"latitude": 78.903929000000005, "discipline": "5", "longitude": -15.46875, "label": "Mass Spectrometry"}, "60": {"latitude": 76.679784999999995, "discipline": "4", "longitude": -88.59375, "label": "Pulp & Paper"}, "61": {"latitude": -12.554563999999999, "discipline": "6", "longitude": -62.578125, "label": "Seismology"}, "258": {"latitude": 72.607119999999995, "discipline": "3", "longitude": 56.25, "label": "Electrocardiography"}, "259": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 176.484375, "label": "International Development"}, "64": {"latitude": 80.297927000000001, "discipline": "11", "longitude": -146.953125, "label": "Algebra"}, "65": {"latitude": 80.872827000000001, "discipline": "7", "longitude": -127.96875, "label": "Antenna"}, "66": {"latitude": 78.767792, "discipline": "7", "longitude": -134.296875, "label": "Circuit Systems"}, "67": {"latitude": 83.676942999999994, "discipline": "12", "longitude": 95.625, "label": "Nursing Specialists"}, "252": {"latitude": 56.559482000000003, "discipline": "3", "longitude": 60.46875, "label": "Cancer (translated)"}, "69": {"latitude": 65.946472, "discipline": "8", "longitude": 94.21875, "label": "Psychopharmacology"}, "250": {"latitude": 31.952162000000001, "discipline": "13", "longitude": 165.9375, "label": "Ethnology"}, "251": {"latitude": 67.339860999999999, "discipline": "3", "longitude": 49.21875, "label": "Prenatal Diagnostics"}, "256": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -107.578125, "label": "Numerical Methods in Engineering"}, "257": {"latitude": 80.872827000000001, "discipline": "5", "longitude": 2.109375, "label": "EthnoPharmacology"}, "254": {"latitude": -10.487812, "discipline": "6", "longitude": -54.140625, "label": "Atmospheric GeoPhysics"}, "255": {"latitude": 80.872827000000001, "discipline": "5", "longitude": -14.0625, "label": "Flavors & Fragrance"}, "508": {"latitude": -0.70310700000000004, "discipline": "1", "longitude": -44.296875, "label": "Marine Pollution"}, "509": {"latitude": 75.320025000000001, "discipline": "5", "longitude": -2.8125, "label": "Toxins"}, "506": {"latitude": 65.072130000000001, "discipline": "3", "longitude": 45.0, "label": "Pulmonary"}, "507": {"latitude": 65.366837000000004, "discipline": "4", "longitude": -100.546875, "label": "Waste Management"}, "504": {"latitude": 70.844673, "discipline": "12", "longitude": 59.0625, "label": "Artifical Organs"}, "505": {"latitude": 73.824820000000003, "discipline": "12", "longitude": 72.421875, "label": "Physical Therapy; Orthopedic"}, "502": {"latitude": -12.554563999999999, "discipline": "9", "longitude": 167.34375, "label": "Socio-Cultural Anthropology"}, "503": {"latitude": 33.724339999999998, "discipline": "10", "longitude": 1.40625, "label": "Poultry Science"}, "500": {"latitude": 82.765372999999997, "discipline": "5", "longitude": -44.296875, "label": "Crystallography"}, "501": {"latitude": 79.560546000000002, "discipline": "11", "longitude": -135.0, "label": "Applied Math"}, "469": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 79.453125, "label": "Preventive Medicine"}, "468": {"latitude": -19.973348999999999, "discipline": "6", "longitude": -45.0, "label": "Archeological Science"}, "465": {"latitude": 79.171334999999999, "discipline": "4", "longitude": -99.84375, "label": "Fractures & Fatigue"}, "464": {"latitude": 65.946472, "discipline": "13", "longitude": 129.375, "label": "Pychiatric & Behavioral Genetics"}, "467": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Cross Disciplinary Studies"}, "466": {"latitude": 76.679784999999995, "discipline": "12", "longitude": 75.9375, "label": "Emergency Medicine"}, "461": {"latitude": -6.3152990000000004, "discipline": "1", "longitude": -25.3125, "label": "Wildlife Research"}, "460": {"latitude": 73.226699999999994, "discipline": "3", "longitude": 42.890625, "label": "Dermatological Surgery"}, "463": {"latitude": 83.026218999999998, "discipline": "11", "longitude": -116.015625, "label": "Physics; Current Developments"}, "462": {"latitude": 83.979259999999996, "discipline": "12", "longitude": 97.734375, "label": "Midwifery"}, "168": {"latitude": 77.157162999999997, "discipline": "4", "longitude": -94.21875, "label": "Composites"}, "169": {"latitude": 41.508577000000002, "discipline": "13", "longitude": 154.6875, "label": "Language Learning"}, "164": {"latitude": 68.399180000000001, "discipline": "7", "longitude": -171.5625, "label": "Library Science; Infomation Retrieval"}, "165": {"latitude": 77.767582000000004, "discipline": "12", "longitude": 63.28125, "label": "Biomaterials"}, "166": {"latitude": -15.961328999999999, "discipline": "6", "longitude": -60.46875, "label": "Quaternary Research"}, "167": {"latitude": 42.553080000000001, "discipline": "3", "longitude": 56.25, "label": "Endoscopic Surgery"}, "160": {"latitude": 73.226699999999994, "discipline": "7", "longitude": -151.875, "label": "Artificial Intelligence"}, "161": {"latitude": 83.111070999999995, "discipline": "5", "longitude": -45.0, "label": "Electro Analytical Chemistry"}, "162": {"latitude": 82.214217000000005, "discipline": "12", "longitude": 68.90625, "label": "Dental Education"}, "163": {"latitude": 58.447732999999999, "discipline": "2", "longitude": -4.21875, "label": "Enzyme Microbiological Techniques"}, "9": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 29.53125, "label": "Immunology"}, "357": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -26.015625, "label": "Wildlife Management"}, "356": {"latitude": 70.844673, "discipline": "7", "longitude": -152.578125, "label": "Software Design and Development"}, "355": {"latitude": 71.074055999999999, "discipline": "12", "longitude": 123.046875, "label": "Psychiatric Services"}, "354": {"latitude": 71.965388000000004, "discipline": "12", "longitude": 112.5, "label": "Forensic Medicine"}, "353": {"latitude": 80.297927000000001, "discipline": "11", "longitude": -116.71875, "label": "Geophysical Science"}, "352": {"latitude": 42.553080000000001, "discipline": "10", "longitude": 23.203125, "label": "World Health Organization"}, "351": {"latitude": 79.935918000000001, "discipline": "11", "longitude": -134.296875, "label": "Computational Math"}, "350": {"latitude": 72.607119999999995, "discipline": "8", "longitude": 92.109375, "label": "Physical Therapy; Brain Injury"}, "359": {"latitude": 72.181804, "discipline": "7", "longitude": -157.5, "label": "Database Design & Management"}, "358": {"latitude": 14.604846999999999, "discipline": "4", "longitude": -72.421875, "label": "Ocean Coastal Management"}, "216": {"latitude": 63.233626999999998, "discipline": "4", "longitude": -85.78125, "label": "Mining"}, "217": {"latitude": 0.70310700000000004, "discipline": "1", "longitude": -18.28125, "label": "Aquaculture"}, "214": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 165.234375, "label": "Modern Language"}, "215": {"latitude": 66.513260000000002, "discipline": "8", "longitude": 82.96875, "label": "Neurophsyiology & Neuroscience"}, "212": {"latitude": 64.168107000000006, "discipline": "13", "longitude": 167.34375, "label": "Higher Education"}, "213": {"latitude": -2.8113709999999998, "discipline": "1", "longitude": -26.015625, "label": "Ecology"}, "210": {"latitude": 74.211983000000004, "discipline": "12", "longitude": 63.984375, "label": "Plastic Surgery"}, "211": {"latitude": 84.124972999999997, "discipline": "12", "longitude": 96.328125, "label": "Nursing Administration"}, "218": {"latitude": 2.8113709999999998, "discipline": "1", "longitude": -11.25, "label": "Molecular Biological Evolution"}, "219": {"latitude": 82.765372999999997, "discipline": "11", "longitude": -118.828125, "label": "Photonics"}, "289": {"latitude": 68.138852, "discipline": "12", "longitude": 127.96875, "label": "Behavioral Research Therapy"}, "288": {"latitude": 72.816074, "discipline": "7", "longitude": -144.140625, "label": "Spyware; Malware"}, "4": {"latitude": 64.472793999999993, "discipline": "2", "longitude": 14.765625, "label": "Protein Science"}, "281": {"latitude": 49.837981999999997, "discipline": "13", "longitude": 166.640625, "label": "Third World Political Economics"}, "280": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -140.625, "label": "Fault Tolerant Computing"}, "283": {"latitude": 58.447732999999999, "discipline": "13", "longitude": 164.53125, "label": "Sociology"}, "282": {"latitude": 84.541360999999995, "discipline": "12", "longitude": 87.1875, "label": "Public Hospitals"}, "285": {"latitude": 74.775842999999995, "discipline": "3", "longitude": 54.140625, "label": "Bone & Osteoporosis"}, "284": {"latitude": 21.943045999999999, "discipline": "1", "longitude": -28.125, "label": "Horticulture"}, "287": {"latitude": 55.379109999999997, "discipline": "4", "longitude": -66.796875, "label": "Water Treatment"}, "286": {"latitude": 55.379109999999997, "discipline": "3", "longitude": 61.171875, "label": "Radiation Therapy"}, "263": {"latitude": 81.723187999999993, "discipline": "11", "longitude": -104.765625, "label": "Surface Coating Technology"}, "262": {"latitude": 72.607119999999995, "discipline": "3", "longitude": 40.078125, "label": "Molecular Endocrinology"}, "261": {"latitude": 51.179343000000003, "discipline": "13", "longitude": 165.9375, "label": "Political Studies"}, "260": {"latitude": 82.494823999999994, "discipline": "4", "longitude": -83.671875, "label": "Electrochemistry"}, "267": {"latitude": 46.073231, "discipline": "13", "longitude": 165.234375, "label": "International Conflict"}, "266": {"latitude": 54.572062000000003, "discipline": "4", "longitude": -82.265625, "label": "Oil & Natural Gas"}, "265": {"latitude": 65.072130000000001, "discipline": "13", "longitude": 151.875, "label": "Vocational Counseling"}, "264": {"latitude": 23.241346, "discipline": "1", "longitude": 9.140625, "label": "Molecular Biochemical Parasitology"}, "269": {"latitude": 82.214217000000005, "discipline": "5", "longitude": -66.09375, "label": "Applied Catalysis"}, "268": {"latitude": -21.943045999999999, "discipline": "9", "longitude": 164.53125, "label": "Art History"}, "59": {"latitude": 62.593341000000002, "discipline": "3", "longitude": 61.875, "label": "Vascular Surgery"}, "58": {"latitude": 63.548552000000001, "discipline": "13", "longitude": 171.5625, "label": "Business Ethics"}, "55": {"latitude": 59.534317999999999, "discipline": "10", "longitude": 26.015625, "label": "AntiMicrobial Agents"}, "54": {"latitude": 77.617709000000005, "discipline": "5", "longitude": 1.40625, "label": "Pharmaceutical Design"}, "57": {"latitude": 66.513260000000002, "discipline": "13", "longitude": -179.296875, "label": "Decision Support Systems"}, "56": {"latitude": 71.965388000000004, "discipline": "7", "longitude": -157.5, "label": "Systems Software"}, "51": {"latitude": 65.366837000000004, "discipline": "3", "longitude": 49.21875, "label": "Chest & Respiratory"}, "50": {"latitude": 70.140364000000005, "discipline": "3", "longitude": 42.890625, "label": "Obstetrics"}, "53": {"latitude": -15.961328999999999, "discipline": "1", "longitude": -26.015625, "label": "Zoology"}, "52": {"latitude": 72.181804, "discipline": "4", "longitude": -82.265625, "label": "Earthquake Engineering"}, "537": {"latitude": 59.888936999999999, "discipline": "3", "longitude": 63.28125, "label": "Clinical Medicine (Romania)"}, "536": {"latitude": 64.168107000000006, "discipline": "13", "longitude": 168.046875, "label": "Marketing"}, "535": {"latitude": 72.181804, "discipline": "13", "longitude": 162.421875, "label": "Education Psychological Measures"}, "63": {"latitude": 65.366837000000004, "discipline": "8", "longitude": 90.0, "label": "Neurology"}, "533": {"latitude": 69.411242000000001, "discipline": "8", "longitude": 88.59375, "label": "Neurotoxicology"}, "532": {"latitude": 66.513260000000002, "discipline": "8", "longitude": 92.8125, "label": "Sleep"}, "531": {"latitude": 83.111070999999995, "discipline": "12", "longitude": 59.0625, "label": "Public Health"}, "530": {"latitude": 76.184995000000001, "discipline": "3", "longitude": 43.59375, "label": "Hormone Research"}, "539": {"latitude": 78.349411000000003, "discipline": "12", "longitude": 54.140625, "label": "Optometry"}, "538": {"latitude": 82.586106000000001, "discipline": "5", "longitude": -44.296875, "label": "Green Chemistry"}, "115": {"latitude": 80.647035000000002, "discipline": "5", "longitude": -4.921875, "label": "Phytochemistry"}, "114": {"latitude": 66.513260000000002, "discipline": "3", "longitude": 58.359375, "label": "Thoracic Surgery"}, "117": {"latitude": 56.944974000000002, "discipline": "2", "longitude": 5.625, "label": "Food Protection"}, "116": {"latitude": 31.952162000000001, "discipline": "10", "longitude": 16.875, "label": "Tropical Medicine"}, "111": {"latitude": 74.959391999999994, "discipline": "4", "longitude": -116.015625, "label": "Mechanical Design Engineering"}, "110": {"latitude": 67.609221000000005, "discipline": "8", "longitude": 67.5, "label": "Otolaryngology; Laryngoscope"}, "113": {"latitude": -2.8113709999999998, "discipline": "1", "longitude": -33.046875, "label": "Biological Conservation"}, "112": {"latitude": -19.973348999999999, "discipline": "9", "longitude": 165.234375, "label": "Classics"}, "119": {"latitude": 69.411242000000001, "discipline": "4", "longitude": -85.078125, "label": "Energy Fuel"}, "118": {"latitude": 75.320025000000001, "discipline": "7", "longitude": -141.328125, "label": "Broadband Communication"}, "429": {"latitude": 23.885838, "discipline": "1", "longitude": -40.78125, "label": "Weed Management"}, "428": {"latitude": 73.824820000000003, "discipline": "7", "longitude": -147.65625, "label": "Computer Networks"}, "534": {"latitude": 70.377853999999999, "discipline": "3", "longitude": 47.109375, "label": "Pediatric Research"}, "421": {"latitude": 75.320025000000001, "discipline": "4", "longitude": -71.71875, "label": "Dyes & Pigments"}, "420": {"latitude": -14.604846999999999, "discipline": "9", "longitude": 164.53125, "label": "Semiotics"}, "423": {"latitude": -4.2149429999999999, "discipline": "1", "longitude": -25.3125, "label": "Molecular Ecology"}, "422": {"latitude": 73.428424000000007, "discipline": "3", "longitude": 52.03125, "label": "Drug Safety"}, "425": {"latitude": 70.140364000000005, "discipline": "12", "longitude": 125.15625, "label": "Clinical Psychiatry"}, "424": {"latitude": 56.559482000000003, "discipline": "10", "longitude": 38.671875, "label": "Cytogentics & Genome Mapping"}, "427": {"latitude": 38.272689, "discipline": "4", "longitude": -61.875, "label": "Water Waste"}, "426": {"latitude": -9.1020970000000005, "discipline": "6", "longitude": -55.546875, "label": "Paleogeography"}, "308": {"latitude": 78.490551999999994, "discipline": "7", "longitude": -134.296875, "label": "Electrical Networks"}, "309": {"latitude": 21.943045999999999, "discipline": "3", "longitude": 50.625, "label": "Endoscopy"}, "300": {"latitude": 71.524908999999994, "discipline": "3", "longitude": 49.21875, "label": "Atherosclerosis"}, "301": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 82.96875, "label": "Region & Medical Ethics"}, "302": {"latitude": 65.072130000000001, "discipline": "8", "longitude": 115.3125, "label": "Speech Language & Hearing"}, "303": {"latitude": 61.606395999999997, "discipline": "3", "longitude": 38.671875, "label": "Thoracic & Respiratory"}, "304": {"latitude": 47.040182000000001, "discipline": "10", "longitude": 8.4375, "label": "Veterinary Microbiology"}, "305": {"latitude": 32.546813, "discipline": "4", "longitude": -45.0, "label": "Environmental Protection"}, "306": {"latitude": 72.181804, "discipline": "7", "longitude": -150.46875, "label": "Computer Systems Design"}, "307": {"latitude": 25.165172999999999, "discipline": "4", "longitude": -46.40625, "label": "Environmental Pollution"}, "229": {"latitude": 82.586106000000001, "discipline": "11", "longitude": -116.015625, "label": "Nuclear Instrumentation"}, "228": {"latitude": 80.178713999999999, "discipline": "11", "longitude": -130.78125, "label": "Simulation"}, "227": {"latitude": 12.554563999999999, "discipline": "4", "longitude": -45.0, "label": "Soil Science"}, "226": {"latitude": 65.366837000000004, "discipline": "12", "longitude": 84.375, "label": "Audiology"}, "225": {"latitude": 74.775842999999995, "discipline": "7", "longitude": -131.484375, "label": "Robotics"}, "224": {"latitude": 70.377853999999999, "discipline": "12", "longitude": 69.609375, "label": "Spine"}, "223": {"latitude": 81.518271999999996, "discipline": "7", "longitude": -120.9375, "label": "Photo-Optics"}, "222": {"latitude": -7.013668, "discipline": "9", "longitude": 161.71875, "label": "Linguistics"}, "221": {"latitude": 80.178713999999999, "discipline": "11", "longitude": -148.359375, "label": "Functional Analysis"}, "220": {"latitude": 52.482779999999998, "discipline": "13", "longitude": 168.75, "label": "Urban Studies"}, "391": {"latitude": -0.70310700000000004, "discipline": "9", "longitude": 165.234375, "label": "Asian Studies"}, "390": {"latitude": 78.490551999999994, "discipline": "12", "longitude": 112.5, "label": "Psychiatric Nursing"}, "151": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 82.265625, "label": "BioEthics"}, "150": {"latitude": 69.657086000000007, "discipline": "8", "longitude": 104.0625, "label": "Psychosis; Schizophrenia"}, "153": {"latitude": 77.617709000000005, "discipline": "7", "longitude": -134.296875, "label": "Power Distribution"}, "152": {"latitude": 72.181804, "discipline": "7", "longitude": -144.140625, "label": "Parellel Computing"}, "155": {"latitude": 76.351895999999996, "discipline": "4", "longitude": -83.671875, "label": "Wood"}, "154": {"latitude": 74.402163000000002, "discipline": "12", "longitude": 121.640625, "label": "Gerontology"}, "157": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -62.578125, "label": "Geology & Tectonics"}, "156": {"latitude": 78.490551999999994, "discipline": "11", "longitude": -152.578125, "label": "Discrete Applied Mathematics"}, "159": {"latitude": 74.402163000000002, "discipline": "7", "longitude": -146.953125, "label": "Mobile Networks"}, "158": {"latitude": -14.604846999999999, "discipline": "6", "longitude": -63.984375, "label": "GeoChemistry"}, "399": {"latitude": 56.559482000000003, "discipline": "3", "longitude": 54.140625, "label": "Surgical Oncology"}, "398": {"latitude": 77.767582000000004, "discipline": "7", "longitude": -138.515625, "label": "Power Systems"}, "48": {"latitude": 58.813741999999998, "discipline": "10", "longitude": 23.203125, "label": "Molecular Cell Biology"}, "49": {"latitude": 69.411242000000001, "discipline": "5", "longitude": 4.21875, "label": "Food Chemistry"}, "46": {"latitude": 82.214217000000005, "discipline": "7", "longitude": -122.34375, "label": "Applied Optics"}, "47": {"latitude": 73.226699999999994, "discipline": "4", "longitude": -94.21875, "label": "Nuclear Engineering"}, "44": {"latitude": 63.548552000000001, "discipline": "8", "longitude": 74.53125, "label": "Neurosurgery"}, "45": {"latitude": 67.609221000000005, "discipline": "3", "longitude": 38.671875, "label": "Fertility"}, "42": {"latitude": 73.824820000000003, "discipline": "12", "longitude": 30.9375, "label": "Nutrition"}, "43": {"latitude": 59.534317999999999, "discipline": "13", "longitude": -177.890625, "label": "Finance"}, "40": {"latitude": 65.946472, "discipline": "8", "longitude": 99.84375, "label": "Clinical Neurophysiology"}, "41": {"latitude": 75.497157000000001, "discipline": "3", "longitude": 54.140625, "label": "Opthamology"}, "5": {"latitude": 76.679784999999995, "discipline": "7", "longitude": -140.625, "label": "Signal Processing"}, "489": {"latitude": 75.497157000000001, "discipline": "7", "longitude": -143.4375, "label": "Consumer Electronics"}, "488": {"latitude": -12.554563999999999, "discipline": "9", "longitude": 166.640625, "label": "Social History"}, "487": {"latitude": -10.487812, "discipline": "1", "longitude": -28.125, "label": "Fish Biology"}, "486": {"latitude": 65.946472, "discipline": "13", "longitude": 178.59375, "label": "Operations Management"}, "485": {"latitude": 70.140364000000005, "discipline": "8", "longitude": 81.5625, "label": "Headache"}, "484": {"latitude": 78.767792, "discipline": "7", "longitude": -134.296875, "label": "Antennae; Mobile Radio"}, "483": {"latitude": 81.201419999999999, "discipline": "11", "longitude": -116.015625, "label": "Superconductor Science"}, "482": {"latitude": 81.413933, "discipline": "4", "longitude": -101.953125, "label": "Friction Lubrication & Wear"}, "481": {"latitude": 76.679784999999995, "discipline": "7", "longitude": -140.625, "label": "Circuits"}, "480": {"latitude": 77.312520000000006, "discipline": "4", "longitude": -78.75, "label": "Wood Components"}, "472": {"latitude": 70.377853999999999, "discipline": "13", "longitude": 130.78125, "label": "Psychosomatic Medicine"}, "473": {"latitude": 80.647035000000002, "discipline": "12", "longitude": 66.09375, "label": "Pharmaco Economics"}, "470": {"latitude": 80.872827000000001, "discipline": "5", "longitude": -70.3125, "label": "Carbon"}, "471": {"latitude": 60.930432000000003, "discipline": "3", "longitude": 46.40625, "label": "Gynecology Oncology"}, "476": {"latitude": 75.320025000000001, "discipline": "11", "longitude": -161.71875, "label": "Cancer Statistics"}, "477": {"latitude": 67.339860999999999, "discipline": "8", "longitude": 118.125, "label": "Consciousness"}, "474": {"latitude": 78.061988999999997, "discipline": "7", "longitude": -149.765625, "label": "Computer Modeling and Animation"}, "475": {"latitude": 84.267172000000002, "discipline": "12", "longitude": 78.75, "label": "Medical Practice"}, "478": {"latitude": 67.339860999999999, "discipline": "12", "longitude": 68.203125, "label": "Otolyngology; Head Neck"}, "479": {"latitude": 70.844673, "discipline": "3", "longitude": 59.0625, "label": "Heart Failure; Catheters"}};
+var SCIMAP_TYPE = {
+	DISCIPLINE: "DISCIPLINE",
+	SUBDISCIPLINE: "SUBDISCIPLINE"
+};
+
+function getDisciplineLabelImageURL(key) {
+	return disciplineLabelImageUrlPrefix + DISCIPLINES[key].image;
+}
+
+function getDisciplineBlackLabelImageURL(key) {
+	return disciplineBlackLabelImageUrlPrefix + DISCIPLINES[key].image;
+}
+
+function createScimapType(map, mapName) {
+	var sciMapTypeOptions = {
+		getTileUrl: function(coord, zoom) {
+			var normalizedCoord = getNormalizedCoord(coord, zoom);
+			if (!normalizedCoord) {
+				return mapOfScienceImageFolderPrefix + "tiles/blank.png";
+			}
+			var bound = Math.pow(2, zoom);
+			return mapOfScienceImageFolderPrefix + "tiles/tiles" + zoom + "_" + normalizedCoord.x + "_" +
+					normalizedCoord.y + ".png";
+		},
+		tileSize: new google.maps.Size(256, 256),
+		isPng: true,
+		minZoom: 1,
+		maxZoom: 4,
+		name: mapName
+	};
+
+	var sciMapType = new google.maps.ImageMapType(sciMapTypeOptions);
+	new CopyrightPanel ({
+		map: map,
+		controlPositions: google.maps.ControlPosition.BOTTOM_RIGHT,
+		html: '&copy; 2008 The Regents of the University of California and SciTech Strategies.<br>' +
+				'Map updated by <a href="http://mapofscience.com">SciTech Strategies</a>, ' +
+				'<a href="http://www.ost.uqam.ca/" title="Observatoire des sciences et des technologies">OST</a>, ' +
+				'and <a href="http://cns.iu.edu" title="CyberInfrastructure for Network Science">CNS</a> in 2011.'
+	});
+	map.mapTypes.set(mapName, sciMapType);
+}
+
+//Normalizes the coords that tiles repeat across the x axis (horizontally)
+// like the standard Google map tiles.
+function getNormalizedCoord(coord, zoom) {
+	var y = coord.y;
+	var x = coord.x;
+
+	// tile range in one direction range is dependent on zoom level
+	// 0 = 1 tile, 1 = 2 tiles, 2 = 4 tiles, 3 = 8 tiles, etc
+	var tileRange = 1 << zoom;
+
+	// don't repeat across y-axis (vertically)
+	if (y < 0 || y > customTileRange(zoom)) {
+		return null;
+	}
+
+	// repeat across x-axis (horizontal)
+	if (x < 0 || x >= tileRange) {
+		x = (x % tileRange + tileRange) % tileRange;
+	}
+
+	return {
+		x: x,
+		y: y
+	};
+}
+
+// horizontal range bound
+function customTileRange(zoom) {
+	if (zoom < 3) {
+		return zoom;
+	} else if (zoom == 3){
+		return 4;
+	} else if (zoom == 4) {
+		return 9;
+	}
 }
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js
index ce6d859655..6b3d582ea2 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js
@@ -3,11 +3,11 @@
 $.extend(this, i18nStrings);
 
 var DataTableWidget = Class.extend({
-	
+
 	dom: {
 		firstFilterLabel: "554 " + i18nStrings.subdisciplinesString,
 		secondFilterLabel: "13 " + i18nStrings.disciplinesString,
-		
+
 		searchBarParentContainerClass: "searchbar",
 		paginationContainerClass: "paginatedtabs",
 		containerID: "main-science-areas-table-container",
@@ -17,7 +17,7 @@ var DataTableWidget = Class.extend({
 		filterOptionClass: "filter-option",
 		activeFilterClass: "active-filter",
 		filterInfoIconClass: "filterInfoIcon",
-		
+
 		percentMappedInfoID: "percent-mapped-info"
 	},
 	init: function(sciMapWidget) {
@@ -31,25 +31,25 @@ var DataTableWidget = Class.extend({
 		me.percentMappedDiv = $("#" + me.dom.percentMappedInfoID);
 		me.tableDiv = $('<div />');
 		$("#" + me.dom.containerID).append(this.tableDiv);
-		
+
 		$.each(DISCIPLINES, function(index, item) {
 			var emptyScienceAreaElement = {
 				publicationCount: 0,
-				label: item.label		
+				label: item.label
 			};
 			me.disciplineInfo[index] = emptyScienceAreaElement;
 		});
-		
+
 		$.each(SUBDISCIPLINES, function(index, item) {
 			var emptyScienceAreaElement = {
 				publicationCount: 0,
-				label: item.label		
+				label: item.label
 			};
 			me.subdisciplineInfo[index] = emptyScienceAreaElement;
 		});
 	},
 	loadJsonData: function(data) {
-		
+
 		var me = this;
 		me.uri = data.uri;
 		me.label = data.label;
@@ -57,20 +57,20 @@ var DataTableWidget = Class.extend({
 		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
 		me.pubsMapped = data.pubsMapped;
 		me.type = data.type;
-		
+
 		$.each(data.subdisciplineActivity, function(subdiscipline, density) {
-			
+
 			me.subdisciplineInfo[subdiscipline].publicationCount = density;
-			
+
 			var currentSubdisciplinesDiscipline = SUBDISCIPLINES[subdiscipline].discipline;
-			
+
 			if (me.disciplineInfo[currentSubdisciplinesDiscipline]) {
-				
-				me.disciplineInfo[currentSubdisciplinesDiscipline].publicationCount = 
-					me.disciplineInfo[currentSubdisciplinesDiscipline].publicationCount + density; 
-			} 
+
+				me.disciplineInfo[currentSubdisciplinesDiscipline].publicationCount =
+					me.disciplineInfo[currentSubdisciplinesDiscipline].publicationCount + density;
+			}
 		});
-		
+
 		$(".hide-dom-on-init").show();
 		me.setupView();
 	},
@@ -93,16 +93,16 @@ var DataTableWidget = Class.extend({
 		this.changeFilter(this.currentSelectedFilter);
 	},
 	parseIDIntoScienceTypeAreaID: function(rawID) {
-		
+
 		var type = rawID.substring(0, rawID.indexOf("-"));
 		var area = rawID.substring(rawID.indexOf("-") + 1);
-		
+
 		return [type, area];
 	},
 	setupView: function() {
-		
+
 		var me = this;
-		
+
 		var dom = me.dom;
 		var filter = $('<div class="science-areas-filter">' +
 				'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">' + dom.firstFilterLabel + '</span> | ' +
@@ -111,17 +111,17 @@ var DataTableWidget = Class.extend({
 		me.tableDiv.append(filter);
 		createToolTip($("#imageIconTwo"), $('#toolTipTwo').html(), "top left");
 		initFilter(dom);
-		
+
 		var table = $('<table>');
 		table.attr('id', 'datatable');
 		table.addClass('datatable-table');
-		
+
 		var thead = $('<thead>');
 		var tr = $('<tr>');
-		
+
 		var levelOfScienceAreaTH = $('<th>');
 		levelOfScienceAreaTH.html(i18nStrings.scienceAreaLevel);
-		
+
 		var scienceAreasTH = $('<th>');
 		scienceAreasTH.attr("id", "science-areas-th");
 		if (this.currentSelectedFilter === SCIMAP_TYPE.SUBDISCIPLINE ) {
@@ -129,7 +129,7 @@ var DataTableWidget = Class.extend({
 		} else {
 			scienceAreasTH.html(i18nStrings.disciplinesString);
 		}
-		
+
 		var activityCountTH = $('<th>');
 		activityCountTH.html('# ' + i18nStrings.numberOfPubs);
 		activityCountTH.attr("id", "activity-count-column");
@@ -142,62 +142,62 @@ var DataTableWidget = Class.extend({
 		tr.append(scienceAreasTH);
 		tr.append(activityCountTH);
 		tr.append(percentageActivityTH);
-		
+
 		thead.append(tr);
-		
+
 		table.append(thead);
-		
+
 		var tbody = $('<tbody>');
-		
+
 		var rowsToInsert = [];
 		var i = 0;
-		
+
 		$.each(me.disciplineInfo, function(index, item) {
 			rowsToInsert[i++] = '<tr id="' + SCIMAP_TYPE.DISCIPLINE + '-' + index + '" style="color:' + DISCIPLINES[index].color + ';"><td>' + SCIMAP_TYPE.DISCIPLINE + '</td>';
 			rowsToInsert[i++] = '<td>' + item.label + '</td>';
 			rowsToInsert[i++] = '<td>' + item.publicationCount.toFixed(1) + '</td>';
 			rowsToInsert[i++] = '<td>' + (100 * (item.publicationCount / me.pubsMapped)).toFixed(1) + '</td></tr>';
 		});
-		
-		
+
+
 		$.each(me.subdisciplineInfo, function(index, item) {
 			rowsToInsert[i++] = '<tr id="' + SCIMAP_TYPE.SUBDISCIPLINE + '-' + index + '" style="color:' + DISCIPLINES[SUBDISCIPLINES[index].discipline].color + ';"><td>' + SCIMAP_TYPE.SUBDISCIPLINE + '</td>';
 			rowsToInsert[i++] = '<td>' + item.label + '</td>';
 			rowsToInsert[i++] = '<td>' + item.publicationCount.toFixed(1) + '</td>';
 			rowsToInsert[i++] = '<td>' + (100 * (item.publicationCount / me.pubsMapped)).toFixed(1) + '</td></tr>';
 		});
-		
+
 		tbody.append(rowsToInsert.join(''));
 
 		table.append(tbody);
 		me.tableDiv.append(table);
-		
+
 		table.children("tbody").children("tr").mouseenter(function() {
-			
+
 			var params = me.parseIDIntoScienceTypeAreaID($(this).attr("id"));
 			me.sciMapWidget.mouseIn(params[0], params[1]);
 		});
-		
+
 		table.children("tbody").children("tr").mouseleave(function() {
 
 			var params = me.parseIDIntoScienceTypeAreaID($(this).attr("id"));
 			me.sciMapWidget.mouseOut(params[0], params[1]);
 		});
-		
+
 		/*
-		 * GMAIL_STYLE_PAGINATION_CONTAINER_CLASS, ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER has to be declared 
+		 * GMAIL_STYLE_PAGINATION_CONTAINER_CLASS, ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER has to be declared
 		 * for the filter & pagination to work properly.
 		 * */
 		GMAIL_STYLE_PAGINATION_CONTAINER_CLASS = me.dom.paginationContainerClass;
 		ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER = me.currentSelectedFilter;
-		
+
 		if($.inArray(disciplineOrSubdisciplineDataTableFilter, $.fn.dataTableExt.afnFiltering) < 0) {
 			$.fn.dataTableExt.afnFiltering.push(disciplineOrSubdisciplineDataTableFilter);
 		}
-		
+
 		me.widget = table.dataTable({
-		    "sDom": '<"' + me.dom.searchBarParentContainerClass 
-		    			+ '"f><"filterInfo"i><"' 
+		    "sDom": '<"' + me.dom.searchBarParentContainerClass
+		    			+ '"f><"filterInfo"i><"'
 		    			+ me.dom.paginationContainerClass + '"p><"table-separator"><"datatablewrapper"t>',
 		    "aaSorting": [
 		        [2, "desc"], [1,'asc']
@@ -206,7 +206,7 @@ var DataTableWidget = Class.extend({
 		    "aoColumns": [{ "bVisible": false, "bSearchable": false },
 		                  null,
 		                  null,
-		                  null], 
+		                  null],
 		    "iDisplayLength": 13,
 		    "bInfo": true,
 		    "oLanguage": {
@@ -216,60 +216,60 @@ var DataTableWidget = Class.extend({
 			},
 		    "sPaginationType": "gmail_style",
 		    "fnDrawCallback": function () {
-		    	
+
 		        /* We check whether max number of allowed comparisions (currently 10) is reached
-		         * here as well becasue the only function that is guaranteed to be called during 
+		         * here as well becasue the only function that is guaranteed to be called during
 		         * page navigation is this. No need to bind it to the nav-buttons becuase 1. It is over-ridden
 		         * by built-in navigation events & this is much cleaner.
 		         * */
 //		        checkIfColorLimitIsReached();
 		    }
 		});
-		
-		
+
+
 		var searchInputBox = $("." + me.dom.searchBarParentContainerClass).find("input[type=text]");
 		searchInputBox.css("width", "140px");
-		searchInputBox.after("<span id='reset-search' title='" + i18nStrings.clearSearchQuery + "'>X</span>" 
-								+ "<img class='filterInfoIcon' id='searchInfoIcon' src='" + infoIconUrl 
+		searchInputBox.after("<span id='reset-search' title='" + i18nStrings.clearSearchQuery + "'>X</span>"
+								+ "<img class='filterInfoIcon' id='searchInfoIcon' src='" + infoIconUrl
 								+ "' alt='" + i18nStrings.infoIconString + "' title='' />");
 		$( document ).on('click', "#reset-search", function() {
 			me.widget.fnFilter("");
 		});
 		createToolTip($("#searchInfoIcon"), $('#searchInfoTooltipText').html(), "top left");
-		
+
 		var csvButton = '<hr class="subtle-hr"/><div id="main-science-areas-table-footer"><a id="csv" href="' +
-						entityMapOfScienceSubDisciplineCSVURL + 
+						entityMapOfScienceSubDisciplineCSVURL +
 						'" class="map-of-science-links">' + i18nStrings.saveAllAsCSV + '</a></div>';
 		this.tableDiv.append(csvButton);
-		
+
 		var totalPublications = me.pubsWithNoJournals + me.pubsWithInvalidJournals + me.pubsMapped;
 		$("#mapped-publications").text(addCommasToNumber(me.pubsMapped));
 		$("#percent-mapped").text((100 * me.pubsMapped / totalPublications).toFixed(2));
 		$("#total-publications").text(addCommasToNumber(totalPublications));
-		
+
 	},
 	changeFilter: function(filterType) {
 		var me = this;
 		if (filterType === SCIMAP_TYPE.SUBDISCIPLINE) {
-			
+
 			$("#science-areas-th").html(i18nStrings.subdisciplinesString);
 			if (me.widget) {
 				me.widget.fnSettings()._iDisplayLength = 10;
 			}
 			me.currentSelectedFilter = SCIMAP_TYPE.SUBDISCIPLINE;
 			$("a#csv").attr("href", entityMapOfScienceSubDisciplineCSVURL);
-			
+
 		} else {
-			
+
 			$("#science-areas-th").html(i18nStrings.disciplinesString);
 			me.currentSelectedFilter = SCIMAP_TYPE.DISCIPLINE;
 			if (me.widget) {
 				me.widget.fnSettings()._iDisplayLength = 13;
 			}
 			$("a#csv").attr("href", entityMapOfScienceDisciplineCSVURL);
-			
+
 		}
-		
+
 		ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER = me.currentSelectedFilter;
 
 		if (me.widget) {
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js b/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js
index dc50481088..fb1d1e0ac5 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js
@@ -1,50 +1,50 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-/**
- * Manage async download contents and make sure don't have the same 
- * download request in the same time. Provide ability to abort download.
- */
-
-var DownloadManager = Class.extend({
-	init: function() {
-		this.downloadList = {};
-	},
-	download: function(url, success) {
-		if (!this.hasKey(url)) {
-			this.downloadList[url] = { success: success, // TODO Try removing this property
-					jqxhr: this.startDownload(url, success, this.downloadList)};
-		}
-	},
-	downloadAndWait: function(url, success) {
-		if (!this.hasKey(url)) {
-			$.ajax({
-				url: url,
-				async: false,
-				dataType: 'json',
-				success: function(countData) { success(countData); }
-			});
-		}
-	},
-	startDownload: function(url, success, downloadList) {
-		 return $.getJSON(url, // TODO Not always "latest" //TODO Test on server with big file that consume 3 seconds download time. Then Keep on and off the checkbox while downloading, to verify if the duplicate happens
-				function(countData) {
-			        if (success) {
-						success(countData);
-		 			}
-			        delete(downloadList[url]);
-				}
-			);
-	},
-	hasKey: function(url) {
-		return (this.downloadList[url]);
-	},
-	abort: function(url) {
-		var options = this.downloadList[url];
-		if (options) {
-			options.jqxhr.abort();
-			delete(this.downloadList[url]);
-		}
-	},
-	isDone: function(url) {
-		return !this.hasKey(url);
-	}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+/**
+ * Manage async download contents and make sure don't have the same
+ * download request in the same time. Provide ability to abort download.
+ */
+
+var DownloadManager = Class.extend({
+	init: function() {
+		this.downloadList = {};
+	},
+	download: function(url, success) {
+		if (!this.hasKey(url)) {
+			this.downloadList[url] = { success: success, // TODO Try removing this property
+					jqxhr: this.startDownload(url, success, this.downloadList)};
+		}
+	},
+	downloadAndWait: function(url, success) {
+		if (!this.hasKey(url)) {
+			$.ajax({
+				url: url,
+				async: false,
+				dataType: 'json',
+				success: function(countData) { success(countData); }
+			});
+		}
+	},
+	startDownload: function(url, success, downloadList) {
+		 return $.getJSON(url, // TODO Not always "latest" //TODO Test on server with big file that consume 3 seconds download time. Then Keep on and off the checkbox while downloading, to verify if the duplicate happens
+				function(countData) {
+			        if (success) {
+						success(countData);
+		 			}
+			        delete(downloadList[url]);
+				}
+			);
+	},
+	hasKey: function(url) {
+		return (this.downloadList[url]);
+	},
+	abort: function(url) {
+		var options = this.downloadList[url];
+		if (options) {
+			options.jqxhr.abort();
+			delete(this.downloadList[url]);
+		}
+	},
+	isDone: function(url) {
+		return !this.hasKey(url);
+	}
 });
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js
index 5a238e3802..f709b5672c 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js
@@ -1,50 +1,50 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-var EntityTablesWidget = Class.extend({
-	init: function(sciMapWidget) {
-		this.sciMapWidget = sciMapWidget;
-		this.keyToDataTable = {};
-		this.container = $('<div>');
-		$("#subEntityTableArea").append(this.container);
-		$("#subEntityTableArea").show();
-	},
-	initView: function(key) {
-		this.container.show();
-	},
-	cleanView: function(key) {
-		this.container.hide();
-	},
-	loadJsonData: function(data) {
-	},
-	loadEntity: function(data, color) {
-		var key = data.label;
-		var dataTable = this.getDataTable(key);
-		if (dataTable == null) {
-			dataTable = this._createDataTable(key, data, color);
-		}
-		dataTable.initView();
-	},
-	unloadEntity: function(key) {
-		this._removeDataTable(key);
-	},
-	getDataTable: function(key) {
-		return this.keyToDataTable[key];
-	},
-	_removeDataTable: function(key) {
-		var dataTable = this.getDataTable(key);
-		if (dataTable) {
-			dataTable.cleanView();
-			delete this.keyToDataTable[key];
-		}
-	},
-	_createDataTable: function(key, data, color) {
-		dataTable = new SimpleDataTableWidget({
-			sciMapWidget: this.sciMapWidget, 
-			container: this.container
-			});
-		data.color = color;
-		dataTable.loadJsonData(data);
-		this.keyToDataTable[key] = dataTable;
-		return dataTable;
-	}
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+var EntityTablesWidget = Class.extend({
+	init: function(sciMapWidget) {
+		this.sciMapWidget = sciMapWidget;
+		this.keyToDataTable = {};
+		this.container = $('<div>');
+		$("#subEntityTableArea").append(this.container);
+		$("#subEntityTableArea").show();
+	},
+	initView: function(key) {
+		this.container.show();
+	},
+	cleanView: function(key) {
+		this.container.hide();
+	},
+	loadJsonData: function(data) {
+	},
+	loadEntity: function(data, color) {
+		var key = data.label;
+		var dataTable = this.getDataTable(key);
+		if (dataTable == null) {
+			dataTable = this._createDataTable(key, data, color);
+		}
+		dataTable.initView();
+	},
+	unloadEntity: function(key) {
+		this._removeDataTable(key);
+	},
+	getDataTable: function(key) {
+		return this.keyToDataTable[key];
+	},
+	_removeDataTable: function(key) {
+		var dataTable = this.getDataTable(key);
+		if (dataTable) {
+			dataTable.cleanView();
+			delete this.keyToDataTable[key];
+		}
+	},
+	_createDataTable: function(key, data, color) {
+		dataTable = new SimpleDataTableWidget({
+			sciMapWidget: this.sciMapWidget,
+			container: this.container
+			});
+		data.color = color;
+		dataTable.loadJsonData(data);
+		this.keyToDataTable[key] = dataTable;
+		return dataTable;
+	}
 });
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js
index 49a2bf0504..891a26ddf1 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js
@@ -3,102 +3,102 @@
 $.extend(this, i18nStrings);
 
 var ErrorDisplayWidget = Class.extend({
-	
+
 	container: '',
 	body: '',
 	bodyID: 'error-body',
 	messagePlaceholderID: 'variable-error-text',
-	
+
 	init: function(opts) {
-	
+
 		this.container = $("#" + opts.containerID);
 		this.body = this.container.find("#" + this.bodyID);
-	}, 
-	
+	},
+
 	isErrorConditionTriggered: function(responseData) {
-		
+
 		if (responseData.error) {
 			return true;
 		}
-		
+
 		if (responseData[0].pubsMapped === 0) {
 			return true;
 		}
-		
+
 		return false;
 	},
-	
+
 	show: function(errorForType, responseData) {
-		
+
 		var isZeroPublicationsCase = responseData.error ? true : false;
 		var newErrorMessage = "";
-		
+
 		/*
-		 * This means that the organization or person has zero publications. 
+		 * This means that the organization or person has zero publications.
 		 * */
 		if (isZeroPublicationsCase) {
-			
+
 			newErrorMessage += i18nStrings.noAttributedPubs + " " + errorForType.toLowerCase() + ".";
-			
+
 		} else {
 		/*
 		 * This means that the organization or person has publications but none of them are mapped.
 		 * Change the default text.
 		 * */
 			newErrorMessage += this._getUnScienceLocatedErrorMessage(errorForType, responseData[0]);
-		} 
+		}
 
 		/*
 		 * Now replace the error message with the newly created one.
 		 * */
-		this.body.find("#" + this.messagePlaceholderID).html(newErrorMessage);	
-		
+		this.body.find("#" + this.messagePlaceholderID).html(newErrorMessage);
+
 		this.container.show();
 	},
-	
+
 	_getUnScienceLocatedErrorMessage: function(errorForType, responseData) {
-		
+
 		var totalPublications = responseData.pubsWithNoJournals + responseData.pubsWithInvalidJournals;
 		var newErrorMessage = "";
 
 		if (totalPublications > 1) {
-			newErrorMessage = i18nStrings.noneOfThe + " " + totalPublications + " " 
-			                    + i18nStrings.pubsAttributedTo + " " 
-			                    + errorForType.toLowerCase() 
-			                    + " " + i18nStrings.beenScienceLocated;	
-			
+			newErrorMessage = i18nStrings.noneOfThe + " " + totalPublications + " "
+			                    + i18nStrings.pubsAttributedTo + " "
+			                    + errorForType.toLowerCase()
+			                    + " " + i18nStrings.beenScienceLocated;
+
 		} else {
-			newErrorMessage = i18nStrings.pubAttributedTo + " " 
+			newErrorMessage = i18nStrings.pubAttributedTo + " "
 				+ errorForType.toLowerCase() + " " + i18nStrings.notScienceLocated;
 		}
-		
-		
+
+
 		newErrorMessage += "<ul class='error-list'>";
-		
+
 		if (responseData.pubsWithNoJournals && responseData.pubsWithNoJournals > 0) {
-			
+
 			var publicationsText = (responseData.pubsWithNoJournals > 1) ? i18nStrings.publicationsString : i18nStrings.publicationString;
-			
-			newErrorMessage += "<li>" + responseData.pubsWithNoJournals + " " + publicationsText 
+
+			newErrorMessage += "<li>" + responseData.pubsWithNoJournals + " " + publicationsText
 			                    + " " + i18nStrings.noJournalInformation + "</li>"
-				
+
 		}
-		
+
 		if (responseData.pubsWithInvalidJournals && responseData.pubsWithInvalidJournals > 0) {
-			
+
 			var publicationsText = (responseData.pubsWithInvalidJournals > 1) ? i18nStrings.publicationsString : i18nStrings.publicationString;
-			
-			newErrorMessage += "<li>" + responseData.pubsWithInvalidJournals + " " + publicationsText + " " 
-			+ " " + i18nStrings.noMatchingMapLocation + "</li>" 				
+
+			newErrorMessage += "<li>" + responseData.pubsWithInvalidJournals + " " + publicationsText + " "
+			+ " " + i18nStrings.noMatchingMapLocation + "</li>"
 		}
-		
+
 		newErrorMessage += "</ul>";
-		
+
 		return newErrorMessage;
 	},
-	
+
 	hide: function() {
 		this.container.hide();
 	}
-	
+
 });
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js b/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js
index 2a1fc9dedd..43ee87b32d 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 /**
- * This is the Google MAP API utilities file to make sure all calls to 
+ * This is the Google MAP API utilities file to make sure all calls to
  * Google API is correct. Please add all common utilities at here.
  */
 var GMAPS = google.maps;
@@ -34,7 +34,7 @@ function createGoogleMarker(options) {
 }
 
 function createInfoWindow(content, maxWidth) {
-	return new GMAPS.InfoWindow({ 
+	return new GMAPS.InfoWindow({
 		content: content,
 		maxWidth: maxWidth
 		});
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js b/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js
index ec66b9ff47..3036a92c6f 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js
@@ -13,33 +13,33 @@ var ERROR_DISPLAY_WIDGET = '';
 var loadingScreenTimeout;
 
 /*
- * This method will setup the options for loading screen & then activate the 
+ * This method will setup the options for loading screen & then activate the
  * loading screen.
  */
 function setupLoadingScreen() {
-	
-    $.blockUI.defaults.overlayCSS = { 
-            backgroundColor: '#fff', 
+
+    $.blockUI.defaults.overlayCSS = {
+            backgroundColor: '#fff',
             opacity: 1.0
         };
-        
+
     $.blockUI.defaults.css.width = '500px';
     $.blockUI.defaults.css.height = '100px';
     $.blockUI.defaults.css.border = '0px';
-    
+
     $("#" + responseContainerID).block({
-        message: '<div id="loading-data-container"><h3><img id="data-loading-icon" src="' + loadingImageLink 
-        			+ '" />&nbsp;' + i18nStrings.loadingDataFor + ' <i>' 
+        message: '<div id="loading-data-container"><h3><img id="data-loading-icon" src="' + loadingImageLink
+        			+ '" />&nbsp;' + i18nStrings.loadingDataFor + ' <i>'
         			+ entityLabel
         			+ '</i></h3></div>'
     });
-    
+
     clearTimeout(loadingScreenTimeout);
-    
+
     loadingScreenTimeout = setTimeout(function() {
     	$("#loading-data-container")
-    		.html('<h3><img id="refresh-page-icon" src="' 
-    				+ refreshPageImageLink 
+    		.html('<h3><img id="refresh-page-icon" src="'
+    				+ refreshPageImageLink
 	    			+ '" />&nbsp;Data for <i>' + entityLabel
 	    			+ '</i> ' + i18nStrings.mapBeingRefreshed + '</h3>')
 	    	.css({'cursor': 'pointer'});
@@ -49,7 +49,7 @@ function setupLoadingScreen() {
 function initMap() {
 	var gMap = google.maps;
 	var centerLatLng = new google.maps.LatLng(55, -10);
-	
+
 	var mapOptions = {
 		center: centerLatLng,
 		zoom: 1,
@@ -58,16 +58,16 @@ function initMap() {
 		  mapTypeIds: []
 		}
 	};
-	
+
 	var mapAreaId = $("#map_area");
 	map = new gMap.Map(mapAreaId[0], mapOptions);
-	
+
 	var mapName = 'Scimap';
 	createScimapType(map, mapName);
 	map.setMapTypeId(mapName);
-	
+
 	downloader = new DownloadManager();
-	
+
 }
 
 function initVisModeController() {
@@ -84,11 +84,11 @@ function helper() {
 
 /* Using .load instead of .ready due to issue with IE and Google Maps API */
 $(window).bind("load",function() {
-	
+
 	ERROR_DISPLAY_WIDGET = new ErrorDisplayWidget({
 		containerID: 'error-container'
 	});
-	
+
 	setupLoadingScreen();
 	initMap();
 	initVisModeController();
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js b/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js
index 8b95663aaa..8015cddf0a 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js
@@ -1,60 +1,60 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-/**
- * Marker Object for that hold external information - data. Please refer to the
- * Google.map.MakerOptions for options' details
- */
-
-var Marker = Class.extend({
-	init : function(options) {
-		this.options = $.extend({}, this.options, options);
-		this.marker = createGoogleMarker(this.options);
-		this.hide();
-		this.registerEvents();
-	},
-	options : {
-		value : 0,
-		map : null,
-		icon : null,
-		position : null,
-		content : null
-	},
-	addToMap : function() {
-		this.marker.setMap(this.options.map);
-		this.registerEvents();
-	},
-	removeFromMap : function() {
-		this.marker.setMap(null);
-		this.unregisterEvents();
-	},
-	show : function() {
-		this.marker.setVisible(true);
-	},
-	hide : function() {
-		this.marker.setVisible(false);
-	},
-	setIcon : function(icon) {
-		this.marker.setIcon(icon);
-	},
-	setZIndex: function(zIndex){
-		this.marker.setZIndex(zIndex);
-	},
-	setTitle : function(title) {
-		this.marker.title = title;
-	},
-	registerEvents : function() {
-		var handlers = new Array();
-		var marker = this.marker;
-		handlers.push(addClickListener(marker, function() {
-			updateIFrame(this.url);
-		}));
-		this.handlers = handlers;
-	},
-	unregisterEvents : function() {
-		if (this.handlers) {
-			$.each(this.handlers, function(i, handler) {
-				removeListener(handler);
-			});
-			this.handlers = null;
-		}
-	}
-});
+/* $This file is distributed under the terms of the license in LICENSE$ */
+/**
+ * Marker Object for that hold external information - data. Please refer to the
+ * Google.map.MakerOptions for options' details
+ */
+
+var Marker = Class.extend({
+	init : function(options) {
+		this.options = $.extend({}, this.options, options);
+		this.marker = createGoogleMarker(this.options);
+		this.hide();
+		this.registerEvents();
+	},
+	options : {
+		value : 0,
+		map : null,
+		icon : null,
+		position : null,
+		content : null
+	},
+	addToMap : function() {
+		this.marker.setMap(this.options.map);
+		this.registerEvents();
+	},
+	removeFromMap : function() {
+		this.marker.setMap(null);
+		this.unregisterEvents();
+	},
+	show : function() {
+		this.marker.setVisible(true);
+	},
+	hide : function() {
+		this.marker.setVisible(false);
+	},
+	setIcon : function(icon) {
+		this.marker.setIcon(icon);
+	},
+	setZIndex: function(zIndex){
+		this.marker.setZIndex(zIndex);
+	},
+	setTitle : function(title) {
+		this.marker.title = title;
+	},
+	registerEvents : function() {
+		var handlers = new Array();
+		var marker = this.marker;
+		handlers.push(addClickListener(marker, function() {
+			updateIFrame(this.url);
+		}));
+		this.handlers = handlers;
+	},
+	unregisterEvents : function() {
+		if (this.handlers) {
+			$.each(this.handlers, function(i, handler) {
+				removeListener(handler);
+			});
+			this.handlers = null;
+		}
+	}
+});
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js b/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js
index 3e51a615a9..84f1d8bac1 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 /**
- * The MarkerManager is more like a composite class of Marker. It manages 
- * markers by grouping the markers by keys. 
+ * The MarkerManager is more like a composite class of Marker. It manages
+ * markers by grouping the markers by keys.
  */
 
 $.extend(this, i18nStrings);
@@ -58,7 +58,7 @@ var MarkerManager = Class.extend({
 });
 
 /**
- * Customized Discipline labels MarkerManager for Science map purpose. It is an abstract class 
+ * Customized Discipline labels MarkerManager for Science map purpose. It is an abstract class
  */
 var DisciplineLabelsMarkerManager = MarkerManager.extend({
 	init: function(map, getLabelURL) {
@@ -88,7 +88,7 @@ var DisciplineLabelsMarkerManager = MarkerManager.extend({
 });
 
 /**
- * Customized MarkerManager for Science map purpose. It is an abstract class 
+ * Customized MarkerManager for Science map purpose. It is an abstract class
  */
 var ScimapMarkerManager = MarkerManager.extend({
 	init: function(map, colorStrategy, sizeCoder) {
@@ -134,7 +134,7 @@ var ScimapMarkerManager = MarkerManager.extend({
 		if (!markerArray || !markerArray.length) {
 			markerArray = this.getMarkerArray();
 		}
-		
+
 		$.each(markerArray, function() {
 			if (numberOfMarkers >  0) {
 				this.show();
@@ -183,8 +183,8 @@ var DisciplineMarkerManager = ScimapMarkerManager.extend({
 		var me = this;
 		var marker = this._super(key, density);
 		var poly = marker.polygon;
-		
-		marker.setContent( 
+
+		marker.setContent(
 				'<div style="font-size: 80%; padding: 5px; text-align: left;"><b>'
 				+ poly.label +'</b><br />'
 				+ addCommasToNumber(poly.value.toFixed(2)) + ' ' + i18nStrings.publicationsPubs + '<br />'
@@ -207,11 +207,11 @@ var SubdisciplineMarkerManager = ScimapMarkerManager.extend({
 		/* Override the getContent for Subdiscipline */
 		marker.setContent(
 			'<div style="font-size: 80%; padding: 5px; text-align: left;"><b>'
-			+ poly.label + '</b> in ' + disciplineLabel +'<br />' 
+			+ poly.label + '</b> in ' + disciplineLabel +'<br />'
 			+ addCommasToNumber(poly.value.toFixed(2)) + ' ' + i18nStrings.publicationsPubs + '<br />'
 			+ (poly.value * 100 / this.maxValue).toFixed(2) + i18nStrings.percentActivity
 		);
-		
+
 		return marker;
 	}
 });
@@ -239,8 +239,8 @@ var CompositeMarkerManager = Class.extend({
 	},
 	getManagerArray: function() {
 		var array = [];
-		$.each(this.keyToManager, function(i, e){ 
-			array.push(e); 
+		$.each(this.keyToManager, function(i, e){
+			array.push(e);
 		});
 		return array;
 	},
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js b/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js
index bd64925b59..ca4b7032d6 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js
@@ -1,16 +1,16 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-// Adapted from http://www.mredkj.com/javascript/numberFormat.html
-// format number to a better human readable text
-function addCommasToNumber(nStr) {
-	nStr += '';
-	var x = nStr.split('.');
-	var x1 = x[0];
-	var x2 = x.length > 1 ? '.' + x[1] : '';
-	var rgx = /(\d+)(\d{3})/;
-	
-	while (rgx.test(x1)) {
-		x1 = x1.replace(rgx, '$1' + ',' + '$2');
-	}
-	
-	return x1 + x2;
+/* $This file is distributed under the terms of the license in LICENSE$ */
+// Adapted from http://www.mredkj.com/javascript/numberFormat.html
+// format number to a better human readable text
+function addCommasToNumber(nStr) {
+	nStr += '';
+	var x = nStr.split('.');
+	var x1 = x[0];
+	var x2 = x.length > 1 ? '.' + x[1] : '';
+	var rgx = /(\d+)(\d{3})/;
+
+	while (rgx.test(x1)) {
+		x1 = x1.replace(rgx, '$1' + ',' + '$2');
+	}
+
+	return x1 + x2;
 }
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js b/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js
index 110a0f99dd..88e499c4e3 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js
@@ -111,9 +111,9 @@ var CirclePolygon = Polygon.extend({
 			var projection = map.getProjection();
 			var centerPoint = projection.fromLatLngToPoint(me.options.center);
 			var radius = me.options.radius;
-			
+
 			var incrementDegreeBy = (radius > 2) ? 1 : 10;
-			
+
 			// Create polygon points (extra point to close polygon)
 			for (var degree = 0; degree < 360; degree+=incrementDegreeBy) {
 				var radian = degreeToRadians(degree);
@@ -137,14 +137,14 @@ var CirclePolygon = Polygon.extend({
 		var me = this;
 		var polygon = me.polygon;
 		this.registerEvent(addMapProjectionChangedListener(me.options.map, function() {
-			me.initCirclePoints(); 
+			me.initCirclePoints();
 		}));
-		
+
 		this.registerEvent(addMouseOverListener(polygon, function() {
 			TOOLTIP.setHtml("<b>" + this.label + "</b>");
 			TOOLTIP.show();
 		}));
-		
+
 		this.registerEvent(addMouseOutListener(polygon, function() {
 			TOOLTIP.hide();
 		}));
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js
index ce295d3382..85082f0974 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js
@@ -8,7 +8,7 @@ var ScimapWidget = Class.extend({
 		me.activeManager = null;
 		me.isUnloaded = true;
 		me.map = map;
-		
+
 		me.initView();
 	},
 	initView: function(){
@@ -27,15 +27,15 @@ var ScimapWidget = Class.extend({
 	},
 	initControlPanels: function() {
 		var me = this;
-		
+
 		/* Create slider control panel */
 		if (me.sliderControl == null) {
-			me.sliderControl = new SliderControlPanel({ 
-				map:me.map, 
+			me.sliderControl = new SliderControlPanel({
+				map:me.map,
 				controlPositions: google.maps.ControlPosition.RIGHT_BOTTOM
 			});
 		}
-		
+
 		/* Register event */
 		me.sliderControl.addToMap();
 		me.sliderControl.setChangeEventHandler(function(event, ui) {
@@ -43,11 +43,11 @@ var ScimapWidget = Class.extend({
 				me.updateDisplayedMarkers();
 			}
 		});
-		
+
 		/* create */
 		if (me.disciplineLabelsControl == null) {
 			me.labelsMarkerManager = new DisciplineLabelsMarkerManager(map);
-			me.disciplineLabelsControl = new CheckBoxPanel({ 
+			me.disciplineLabelsControl = new CheckBoxPanel({
 				map: map,
 				checked: true,
 				text: i18nStrings.showDisciplineLabels,
@@ -60,7 +60,7 @@ var ScimapWidget = Class.extend({
 				}
 			});
 		}
-		
+
 		/* Display labels if checked */
 		me.disciplineLabelsControl.addToMap();
 		me.labelsMarkerManager.addMarkersToMap();
@@ -71,18 +71,18 @@ var ScimapWidget = Class.extend({
 	initMarkerManagers: function() {
 		if (this.keyToMarkerManagers == null) {
 			var managers = {};
-			
+
 			// Create discipline Marker Manager
 			managers[SCIMAP_TYPE.DISCIPLINE] = new DisciplineMarkerManager(
-				this.map, 
-				new DisciplineColorStrategy(), 
+				this.map,
+				new DisciplineColorStrategy(),
 				null
 			);
-			
+
 			// Create subdiscipline Marker Manager
 			managers[SCIMAP_TYPE.SUBDISCIPLINE] = new SubdisciplineMarkerManager(
 				this.map,
-				new SubdisciplineColorStrategy(), 
+				new SubdisciplineColorStrategy(),
 				null
 			);
 			this.keyToMarkerManagers = managers;
@@ -99,48 +99,48 @@ var ScimapWidget = Class.extend({
 		me.pubsWithNoJournals = data.pubsWithNoJournals;
 		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
 		me.pubsMapped = data.pubsMapped;
-		
+
 		var scienceActivities = {};
 		scienceActivities[SCIMAP_TYPE.DISCIPLINE] = me._collateDisciplineActivity(data.subdisciplineActivity);
 		scienceActivities[SCIMAP_TYPE.SUBDISCIPLINE] = data.subdisciplineActivity;
-		
+
 		this.isUnloaded = false;
-		
+
 		$.each(this.keyToMarkerManagers, function(key, manager) {
-			
+
 			// Need to create the AreaSizeCoding function
-			manager.setSizeCoder(new CircleSizeCoder({ 
-				scaler: new Scaler({ maxValue: me.pubsMapped }) 
+			manager.setSizeCoder(new CircleSizeCoder({
+				scaler: new Scaler({ maxValue: me.pubsMapped })
 			}));
-			
+
 			$.each(scienceActivities[key], function(science, density) {
-		
+
 				// Create marker and add it to manager
 				var marker = manager.createMarker(science, density);
-				
+
 			}); // end each scienceActivity
-			
+
 			manager.sort();
 		}); // end each markerManagers
 		me.updateMap();
 	},
-	
+
 	_collateDisciplineActivity: function(subdiscipline) {
-		
+
 		var disciplineToActivity = {};
-		
+
 		$.each(DISCIPLINES, function(id, discipline) {
 			disciplineToActivity[id] = 0.0;
 		});
-		
+
 		$.each(subdiscipline, function(key, activity) {
 			var currentSubdisciplinesDiscipline = SUBDISCIPLINES[key].discipline;
-			disciplineToActivity[currentSubdisciplinesDiscipline] += activity; 
+			disciplineToActivity[currentSubdisciplinesDiscipline] += activity;
 		});
-		
+
 		return disciplineToActivity;
 	},
-	
+
 	mouseIn: function(key, childKey) {
 		var manager = this.getMarkerManager(key);
 		// Focus if only it is an active manager
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js
index c56e6be820..34e90b42a1 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js
@@ -1,167 +1,167 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-$.extend(this, i18nStrings);
-
-var SimpleDataTableWidget = Class.extend({
-	
-	dom: {
-		paginationContainerClass : "subpaginatedtabs"
-	},
-	init: function(options) {
-		var me = this;
-		me.options = options;
-		me.sciMapWidget = options.sciMapWidget;
-		me.currentSelectedFilter = COMPARISON_TYPE.SUBDISCIPLINE;
-		me.widget = '';
-		me.tableDiv = $('<div />');
-		me.addToContainer();
-	},
-	loadJsonData: function(data) {
-		
-		var me = this;
-		me.uri = data.uri;
-		me.label = data.label;
-		me.pubsWithNoJournals = data.pubsWithNoJournals;
-		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
-		me.pubsMapped = data.pubsMapped;
-		me.type = data.type;
-		me.color = data.color;
-		me.subdisciplineActivity = data.subdisciplineActivity;
-		me.setupView();
-	},
-	addToContainer: function() {
-		this.options.container.append(this.tableDiv);
-	},
-	removeFromContainer: function() {
-		this.tableDiv.remove();
-	},
-	hasKey: function(key) {
-		return (this.keyToMarkerManagers.hasOwnProperty(key));
-	},
-	show: function(key) {
-		this.tableDiv.show();
-	},
-	hide: function(key) {
-		this.tableDiv.hide();
-	},
-	cleanView: function() {
-		this.removeFromContainer();
-	},
-	initView: function() {
-		this.addToContainer(this.tableDiv);
-		this.show();
-	},
-	setupView: function() {
-		
-		var me = this;
-		
-		me.tableDiv.addClass("subEntityTable");
-		
-		/* Create filter */
-		entityVivoProfileURLPrefix
-		var organizationHeader = $('<div><a class="suborganization-title" href="' + 
-				entityVivoProfileURLPrefix + me.uri +'">' + 
-				truncateText(me.label, 23) + '</a><a href="' + entityMapOfScienceURLPrefix + 
-				me.uri + '"><img class="drillDownIcon" src="' + 
-				drillDownIconUrl + '" alt="' + i18nStrings.drillDownString + '" title="' + i18nStrings.drillDownString + '" /></a></div>');
-		me.tableDiv.append(organizationHeader);
-		
-		/* Create table */
-		var table = $('<table>');
-		table.attr('id', 'entityDatatable');
-		table.addClass('entity-datatable-table');
-		
-		/* Create table header */
-		var thead = $('<thead>');
-		var tr = $('<tr>');
-		
-		/*var levelOfScienceAreaTH = $('<th>');
-		levelOfScienceAreaTH.html('Level of Science Area');*/
-		
-		var scienceAreasTH = $('<th>');
-		scienceAreasTH.attr("id", "entity-science-areas-th");
-		scienceAreasTH.html(i18nStrings.subdisciplinesString);
-		
-		var activityCountTH = $('<th width="53">');
-		activityCountTH.html('# ' + i18nStrings.numberOfPubs);
-
-		//tr.append(levelOfScienceAreaTH);
-		tr.append(scienceAreasTH);
-		tr.append(activityCountTH);
-		
-		thead.append(tr);
-		table.append(thead);
-		
-		/* Create tbody and contents */
-		var tbody = $('<tbody>');
-		
-		var rowsToInsert = [];
-		var i = 0;
-		
-		$.each(me.subdisciplineActivity, function(index, density) {
-			rowsToInsert[i++] = '<tr id="' + index + '">';
-			rowsToInsert[i++] = '<td style="color:' + me.color + ';">' + truncateText(SUBDISCIPLINES[index].label, 20) + '</td>';
-			rowsToInsert[i++] = '<td style="color:' + me.color + ';">' + density.toFixed(1) + '</td></tr>';
-		});
-		
-		tbody.append(rowsToInsert.join(''));
-		table.append(tbody);
-		me.tableDiv.append(table);
-		
-		/* Register events */
-		table.children("tbody").children("tr").mouseenter(function() {
-			me.sciMapWidget.mouseInNode(me.type, me.label, $(this).attr("id"));
-		});
-		
-		table.children("tbody").children("tr").mouseleave(function() {
-			me.sciMapWidget.mouseOutNode(me.type, me.label, $(this).attr("id"));
-		});
-		
-		/* Init DataTable object */
-		me.widget = table.dataTable({
-		    "sDom": '<"' + me.dom.paginationContainerClass + '"p><"table-separator"><"datatablewrapper"t>',
-		    "aaSorting": [
-		        [1, "desc"], [0,'asc']
-		    ],
-		    "asStripClasses": [],
-		    "aoColumns": [{ "bSearchable": false },
-		                  { "bSearchable": false }], 
-		    "iDisplayLength": 10,
-		    "bInfo": true,
-		    "bFilter": false,
-		    "oLanguage": {
-				"sInfo": "_START_ - _END_ of _TOTAL_",
-				"sInfoEmpty": i18nStrings.noMatchingScienceAreas,
-				"sInfoFiltered": ""
-			},
-		    "sPaginationType": "gmail_style",
-		    "fnDrawCallback": function () {
-		    }
-		});
-		
-		/* Create csv download button */
-		var csvButton = '<hr class="subtle-hr" /><div id="main-science-areas-table-footer" style="background-color:' + me.color + ';"><a href="' +
-						entityMapOfScienceSubDisciplineCSVURLPrefix + me.uri +
-						'" class="map-of-science-links">' + i18nStrings.saveAllAsCSV + '</a></div>';
-		me.tableDiv.append(csvButton);
-		
-		/* Create mapping statistic result */
-		var totalPublications = me.pubsWithNoJournals + me.pubsWithInvalidJournals + me.pubsMapped;
-		var mappedText = '<a class="mapped-result" href="' + entityUnmappedJournalsCSVURLPrefix + me.uri + '">' + 
-						(100 * me.pubsMapped / totalPublications).toFixed(2) + '% mapped</a>';
-		me.tableDiv.append($(mappedText));
-		me.widget.fnDraw();
-	}
-});
-
-function truncateText(text, len) {
-
-	var trunc = text;
-	
-	if (text.length > len) {
-		trunc = text.substring(0, len);
-		trunc = trunc.replace(/\w+$/, '') + '<font title="' + text + '">...</font>'
-	}
-
-	return trunc;
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+$.extend(this, i18nStrings);
+
+var SimpleDataTableWidget = Class.extend({
+
+	dom: {
+		paginationContainerClass : "subpaginatedtabs"
+	},
+	init: function(options) {
+		var me = this;
+		me.options = options;
+		me.sciMapWidget = options.sciMapWidget;
+		me.currentSelectedFilter = COMPARISON_TYPE.SUBDISCIPLINE;
+		me.widget = '';
+		me.tableDiv = $('<div />');
+		me.addToContainer();
+	},
+	loadJsonData: function(data) {
+
+		var me = this;
+		me.uri = data.uri;
+		me.label = data.label;
+		me.pubsWithNoJournals = data.pubsWithNoJournals;
+		me.pubsWithInvalidJournals = data.pubsWithInvalidJournals;
+		me.pubsMapped = data.pubsMapped;
+		me.type = data.type;
+		me.color = data.color;
+		me.subdisciplineActivity = data.subdisciplineActivity;
+		me.setupView();
+	},
+	addToContainer: function() {
+		this.options.container.append(this.tableDiv);
+	},
+	removeFromContainer: function() {
+		this.tableDiv.remove();
+	},
+	hasKey: function(key) {
+		return (this.keyToMarkerManagers.hasOwnProperty(key));
+	},
+	show: function(key) {
+		this.tableDiv.show();
+	},
+	hide: function(key) {
+		this.tableDiv.hide();
+	},
+	cleanView: function() {
+		this.removeFromContainer();
+	},
+	initView: function() {
+		this.addToContainer(this.tableDiv);
+		this.show();
+	},
+	setupView: function() {
+
+		var me = this;
+
+		me.tableDiv.addClass("subEntityTable");
+
+		/* Create filter */
+		entityVivoProfileURLPrefix
+		var organizationHeader = $('<div><a class="suborganization-title" href="' +
+				entityVivoProfileURLPrefix + me.uri +'">' +
+				truncateText(me.label, 23) + '</a><a href="' + entityMapOfScienceURLPrefix +
+				me.uri + '"><img class="drillDownIcon" src="' +
+				drillDownIconUrl + '" alt="' + i18nStrings.drillDownString + '" title="' + i18nStrings.drillDownString + '" /></a></div>');
+		me.tableDiv.append(organizationHeader);
+
+		/* Create table */
+		var table = $('<table>');
+		table.attr('id', 'entityDatatable');
+		table.addClass('entity-datatable-table');
+
+		/* Create table header */
+		var thead = $('<thead>');
+		var tr = $('<tr>');
+
+		/*var levelOfScienceAreaTH = $('<th>');
+		levelOfScienceAreaTH.html('Level of Science Area');*/
+
+		var scienceAreasTH = $('<th>');
+		scienceAreasTH.attr("id", "entity-science-areas-th");
+		scienceAreasTH.html(i18nStrings.subdisciplinesString);
+
+		var activityCountTH = $('<th width="53">');
+		activityCountTH.html('# ' + i18nStrings.numberOfPubs);
+
+		//tr.append(levelOfScienceAreaTH);
+		tr.append(scienceAreasTH);
+		tr.append(activityCountTH);
+
+		thead.append(tr);
+		table.append(thead);
+
+		/* Create tbody and contents */
+		var tbody = $('<tbody>');
+
+		var rowsToInsert = [];
+		var i = 0;
+
+		$.each(me.subdisciplineActivity, function(index, density) {
+			rowsToInsert[i++] = '<tr id="' + index + '">';
+			rowsToInsert[i++] = '<td style="color:' + me.color + ';">' + truncateText(SUBDISCIPLINES[index].label, 20) + '</td>';
+			rowsToInsert[i++] = '<td style="color:' + me.color + ';">' + density.toFixed(1) + '</td></tr>';
+		});
+
+		tbody.append(rowsToInsert.join(''));
+		table.append(tbody);
+		me.tableDiv.append(table);
+
+		/* Register events */
+		table.children("tbody").children("tr").mouseenter(function() {
+			me.sciMapWidget.mouseInNode(me.type, me.label, $(this).attr("id"));
+		});
+
+		table.children("tbody").children("tr").mouseleave(function() {
+			me.sciMapWidget.mouseOutNode(me.type, me.label, $(this).attr("id"));
+		});
+
+		/* Init DataTable object */
+		me.widget = table.dataTable({
+		    "sDom": '<"' + me.dom.paginationContainerClass + '"p><"table-separator"><"datatablewrapper"t>',
+		    "aaSorting": [
+		        [1, "desc"], [0,'asc']
+		    ],
+		    "asStripClasses": [],
+		    "aoColumns": [{ "bSearchable": false },
+		                  { "bSearchable": false }],
+		    "iDisplayLength": 10,
+		    "bInfo": true,
+		    "bFilter": false,
+		    "oLanguage": {
+				"sInfo": "_START_ - _END_ of _TOTAL_",
+				"sInfoEmpty": i18nStrings.noMatchingScienceAreas,
+				"sInfoFiltered": ""
+			},
+		    "sPaginationType": "gmail_style",
+		    "fnDrawCallback": function () {
+		    }
+		});
+
+		/* Create csv download button */
+		var csvButton = '<hr class="subtle-hr" /><div id="main-science-areas-table-footer" style="background-color:' + me.color + ';"><a href="' +
+						entityMapOfScienceSubDisciplineCSVURLPrefix + me.uri +
+						'" class="map-of-science-links">' + i18nStrings.saveAllAsCSV + '</a></div>';
+		me.tableDiv.append(csvButton);
+
+		/* Create mapping statistic result */
+		var totalPublications = me.pubsWithNoJournals + me.pubsWithInvalidJournals + me.pubsMapped;
+		var mappedText = '<a class="mapped-result" href="' + entityUnmappedJournalsCSVURLPrefix + me.uri + '">' +
+						(100 * me.pubsMapped / totalPublications).toFixed(2) + '% mapped</a>';
+		me.tableDiv.append($(mappedText));
+		me.widget.fnDraw();
+	}
+});
+
+function truncateText(text, len) {
+
+	var trunc = text;
+
+	if (text.length > len) {
+		trunc = text.substring(0, len);
+		trunc = trunc.replace(/\w+$/, '') + '<font title="' + text + '">...</font>'
+	}
+
+	return trunc;
 }
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js b/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js
index 4f18c9e634..53c41d0ea3 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js
@@ -1,79 +1,79 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-/**
- * The scaler is used for scaling based on the predefined minimum value and
- * maximum value. You also can control the returned maximum scale and minimum 
- * scale.
- */
-var Scaler = Class.extend({ 
-	init: function(options) {
-		this.options = $.extend({}, this.options, options);
-	},
-	options: {
-		scaleFunc: ReallySimpleAreaScale,
-		minValue: 0.0,
-		maxValue: 0.0,
-		minScale: 0.0,
-		maxScale: 1.0
-	},
-	getScale: function(value) {
-		var o = this.options;
-		var scale = o.scaleFunc(value, o.minValue, o.maxValue, o.minScale, o.maxScale);
-		if (scale > o.maxScale) {
-			scale = maxScale;
-		} else if (scale < o.minScale) {
-			scale = minScale;
-		}
-		return scale;
-	}
-});
-
-/* Scaling that ignore minScale and maxScale */
-function ReallySimpleAreaScale(value, minValue, maxValue, minScale, maxScale) {
-	return maxScale * Math.sqrt(value / maxValue);
-}
-
-/* Scaling that cares about minScale and maxScale */
-function SimpleAreaScale(value, minValue, maxValue, minScale, maxScale) {
-	if (maxValue != minValue) {
-		var scale = minScale; 
-		if (value > minValue) {
-			var valueDiff = maxValue - minValue;
-			var areaScale = value / valueDiff;
-			scale = Math.sqrt(areaScale);
-		}
-		return scale;
-	} else {
-		return maxScale;
-	}
-}
-
-/**
- * SizeCoder use scaler to scale its interested size based on the given
- * scaler strategy.
- */
-var CircleSizeCoder = Class.extend({
-	init: function(options) {
-		this.options = $.extend({}, this.options, options);
-	},
-	options: {
-		minRadius: 0,
-		maxRadius: 25.0,
-		scaler: new Scaler({})
-	},
-	getSize: function(value) {
-		var o = this.options;
-		var radius = o.scaler.getScale(value) * o.maxRadius;
-		
-		if (radius < o.minRadius) {
-			radius = o.minRadius;
-		} else if (radius > o.maxRadius) {
-			radius = o.maxRadius;
-		}
-		
-		return radius;
-	},
-	getMaxValue: function() {
-		return this.options.scaler.options.maxValue;
-	}
-});
-
+/* $This file is distributed under the terms of the license in LICENSE$ */
+/**
+ * The scaler is used for scaling based on the predefined minimum value and
+ * maximum value. You also can control the returned maximum scale and minimum
+ * scale.
+ */
+var Scaler = Class.extend({
+	init: function(options) {
+		this.options = $.extend({}, this.options, options);
+	},
+	options: {
+		scaleFunc: ReallySimpleAreaScale,
+		minValue: 0.0,
+		maxValue: 0.0,
+		minScale: 0.0,
+		maxScale: 1.0
+	},
+	getScale: function(value) {
+		var o = this.options;
+		var scale = o.scaleFunc(value, o.minValue, o.maxValue, o.minScale, o.maxScale);
+		if (scale > o.maxScale) {
+			scale = maxScale;
+		} else if (scale < o.minScale) {
+			scale = minScale;
+		}
+		return scale;
+	}
+});
+
+/* Scaling that ignore minScale and maxScale */
+function ReallySimpleAreaScale(value, minValue, maxValue, minScale, maxScale) {
+	return maxScale * Math.sqrt(value / maxValue);
+}
+
+/* Scaling that cares about minScale and maxScale */
+function SimpleAreaScale(value, minValue, maxValue, minScale, maxScale) {
+	if (maxValue != minValue) {
+		var scale = minScale;
+		if (value > minValue) {
+			var valueDiff = maxValue - minValue;
+			var areaScale = value / valueDiff;
+			scale = Math.sqrt(areaScale);
+		}
+		return scale;
+	} else {
+		return maxScale;
+	}
+}
+
+/**
+ * SizeCoder use scaler to scale its interested size based on the given
+ * scaler strategy.
+ */
+var CircleSizeCoder = Class.extend({
+	init: function(options) {
+		this.options = $.extend({}, this.options, options);
+	},
+	options: {
+		minRadius: 0,
+		maxRadius: 25.0,
+		scaler: new Scaler({})
+	},
+	getSize: function(value) {
+		var o = this.options;
+		var radius = o.scaler.getScale(value) * o.maxRadius;
+
+		if (radius < o.minRadius) {
+			radius = o.minRadius;
+		} else if (radius > o.maxRadius) {
+			radius = o.maxRadius;
+		}
+
+		return radius;
+	},
+	getMaxValue: function() {
+		return this.options.scaler.options.maxValue;
+	}
+});
+
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js b/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js
index cc618fa235..4606271745 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js
@@ -1,101 +1,101 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-/** 
- * This tooltip source is modified based on the example of Google map V3. The demo html 
- * is at http://philmap.000space.com/gmap-api/poly-hov.html
- * 
- * Modification:
- * 1. Init container at constructor class
- * 2. Add feature functions: setHtml, setWidth, setPosition
- */
-var Tooltip = function(o) {
-	var me = this;
-	var id = 'tt';
-	var top = 3;
-	var left = 3;
-	var maxw = 300;
-	var speed = 10;
-	var fadeInTimer = 10;
-	var fadeOutTimer = 0;
-	var endalpha = 85;
-	var alpha = 0;
-	var preferredWidth;
-	var tt, t, c, b, h, w;
-	var opts = {};
-	var ie = document.all ? true : false;
-
-	opts = $.extend({}, opts, o);
-	tt = document.createElement('div');
-	tt.setAttribute('id', id);
-	t = document.createElement('div');
-	t.setAttribute('id', id + 'top');
-	c = document.createElement('div');
-	c.setAttribute('id', id + 'cont');
-	b = document.createElement('div');
-	b.setAttribute('id', id + 'bot');
-	tt.appendChild(t);
-	tt.appendChild(c);
-	tt.appendChild(b);
-	document.body.appendChild(tt);
-	tt.style.opacity = 0;
-	tt.style.filter = 'alpha(opacity=0)';
-	
-	return {
-		show: function(){
-				document.onmousemove = this.pos;
-			
-			var w = preferredWidth;
-			tt.style.display = 'block';
-			tt.style.width = w ? w + 'px' : 'auto';
-			if(!w && ie){
-				t.style.display = 'none';
-				b.style.display = 'none';
-				tt.style.width = tt.offsetWidth;
-				t.style.display = 'block';
-				b.style.display = 'block';
-			}
-			if(tt.offsetWidth > maxw) { tt.style.width = maxw + 'px' }
-			h = parseInt(tt.offsetHeight) + top;
-			clearInterval(tt.timer);
-			var me = this;
-			tt.timer = setInterval( function() { me.fade(1) }, fadeInTimer);
-		},
-		pos:function(e){
-			var u = ie ? event.clientY + document.documentElement.scrollTop : e.pageY;
-			var l = ie ? event.clientX + document.documentElement.scrollLeft : e.pageX;
-			tt.style.top = (u - h) + 'px';
-			tt.style.left = (l + left) + 'px';
-		},
-		fade:function(d){
-			var a = alpha;
-			if((a != endalpha && d == 1) || (a != 0 && d == -1)){
-				var i = speed;
-				if(endalpha - a < speed && d == 1){
-					i = endalpha - a;
-				}else if(alpha < speed && d == -1){
-					i = a;
-				}
-				alpha = a + (i * d);
-				tt.style.opacity = alpha * .01;
-				tt.style.filter = 'alpha(opacity=' + alpha + ')';
-			}else{
-				clearInterval(tt.timer);
-				if(d == -1){tt.style.display = 'none'}
-			}
-		},
-		hide:function(){
-			clearInterval(tt.timer);
-			var me = this;
-			tt.timer = setInterval( function(){ me.fade(-1) }, fadeOutTimer);
-		},
-		setHtml: function(v) {
-			c.innerHTML = v;
-		},
-		setWidth: function(w) {
-			preferredWidth = w;
-		},
-		setPosition: function(x, y) {
-			tt.style.top = x + 'px';
-			tt.style.left = y + 'px';
-		}
-	};
+/* $This file is distributed under the terms of the license in LICENSE$ */
+/**
+ * This tooltip source is modified based on the example of Google map V3. The demo html
+ * is at http://philmap.000space.com/gmap-api/poly-hov.html
+ *
+ * Modification:
+ * 1. Init container at constructor class
+ * 2. Add feature functions: setHtml, setWidth, setPosition
+ */
+var Tooltip = function(o) {
+	var me = this;
+	var id = 'tt';
+	var top = 3;
+	var left = 3;
+	var maxw = 300;
+	var speed = 10;
+	var fadeInTimer = 10;
+	var fadeOutTimer = 0;
+	var endalpha = 85;
+	var alpha = 0;
+	var preferredWidth;
+	var tt, t, c, b, h, w;
+	var opts = {};
+	var ie = document.all ? true : false;
+
+	opts = $.extend({}, opts, o);
+	tt = document.createElement('div');
+	tt.setAttribute('id', id);
+	t = document.createElement('div');
+	t.setAttribute('id', id + 'top');
+	c = document.createElement('div');
+	c.setAttribute('id', id + 'cont');
+	b = document.createElement('div');
+	b.setAttribute('id', id + 'bot');
+	tt.appendChild(t);
+	tt.appendChild(c);
+	tt.appendChild(b);
+	document.body.appendChild(tt);
+	tt.style.opacity = 0;
+	tt.style.filter = 'alpha(opacity=0)';
+
+	return {
+		show: function(){
+				document.onmousemove = this.pos;
+
+			var w = preferredWidth;
+			tt.style.display = 'block';
+			tt.style.width = w ? w + 'px' : 'auto';
+			if(!w && ie){
+				t.style.display = 'none';
+				b.style.display = 'none';
+				tt.style.width = tt.offsetWidth;
+				t.style.display = 'block';
+				b.style.display = 'block';
+			}
+			if(tt.offsetWidth > maxw) { tt.style.width = maxw + 'px' }
+			h = parseInt(tt.offsetHeight) + top;
+			clearInterval(tt.timer);
+			var me = this;
+			tt.timer = setInterval( function() { me.fade(1) }, fadeInTimer);
+		},
+		pos:function(e){
+			var u = ie ? event.clientY + document.documentElement.scrollTop : e.pageY;
+			var l = ie ? event.clientX + document.documentElement.scrollLeft : e.pageX;
+			tt.style.top = (u - h) + 'px';
+			tt.style.left = (l + left) + 'px';
+		},
+		fade:function(d){
+			var a = alpha;
+			if((a != endalpha && d == 1) || (a != 0 && d == -1)){
+				var i = speed;
+				if(endalpha - a < speed && d == 1){
+					i = endalpha - a;
+				}else if(alpha < speed && d == -1){
+					i = a;
+				}
+				alpha = a + (i * d);
+				tt.style.opacity = alpha * .01;
+				tt.style.filter = 'alpha(opacity=' + alpha + ')';
+			}else{
+				clearInterval(tt.timer);
+				if(d == -1){tt.style.display = 'none'}
+			}
+		},
+		hide:function(){
+			clearInterval(tt.timer);
+			var me = this;
+			tt.timer = setInterval( function(){ me.fade(-1) }, fadeOutTimer);
+		},
+		setHtml: function(v) {
+			c.innerHTML = v;
+		},
+		setWidth: function(w) {
+			preferredWidth = w;
+		},
+		setPosition: function(x, y) {
+			tt.style.top = x + 'px';
+			tt.style.left = y + 'px';
+		}
+	};
 };
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js b/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js
index 98173adf8e..27f34d4927 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js
@@ -4,11 +4,11 @@ function switchMarkerManager(id) {
 	markerManager = getMarkerManager(id);
 	if(isActiveMarkerManager(markerManager)) {
 		markerManager.addAllToMap();
-		
+
 		if(activeMarkerManager) {
 			activeMarkerManager.removeAllFromMap();
 		}
-		
+
 		/* switch to target marker manager */
 		activeMarkerManager = markerManager;
 	}
@@ -19,7 +19,7 @@ function createVisModeController(visMode) {
 		var controller = new EntityVisModeController(map);
 		visModeControllers[controller.visMode] = controller;
 	}
-	
+
 	if (visMode === COMPARISON_VIS_MODE) {
 		var controller = new ComparisonVisModeController(map);
 		visModeControllers[controller.visMode] = controller;
@@ -58,16 +58,16 @@ function initFilter(dom) {
 			if (checked === dom.secondFilterID) {
 				$("#" + dom.firstFilterID).removeClass(dom.activeFilterClass);
 				currentController.changeFilter(2);
-				
+
 			} else if (checked === dom.firstFilterID) {
 				$("#" + dom.secondFilterID).removeClass(dom.activeFilterClass);
 				currentController.changeFilter(1);
 			}
-				
-			obj.addClass(dom.activeFilterClass);	
+
+			obj.addClass(dom.activeFilterClass);
 		}
 	});
-	
+
 	$("#" + dom.firstFilterID).trigger('click');
 }
 
@@ -78,7 +78,7 @@ function initVisModeTypeButton() {
 		var visMode = $(viewTypeRadio+ ":checked").val();
 		switchVisMode(visMode);
 	});
-	
+
 	/* Init default filter */
 	$(viewTypeRadio+ ":eq(0)").click();
 }
diff --git a/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js b/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js
index 819ac1fcb5..3500621fa4 100644
--- a/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js
+++ b/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js
@@ -17,7 +17,7 @@ var VisModeController = Class.extend({
 		return this.isUnloaded;
 	},
 	loadData: function(url, sync) {
-		
+
 		// Download data from server and add to markerManager if not gotten already
 		var me = this;
 		if (me.isUnloaded) {
@@ -40,17 +40,17 @@ var VisModeController = Class.extend({
 		} // end if
 	},
 	loadJsonData: function(me, data) {
-		
+
 		$("#" + responseContainerID).unblock();
-		
+
 		if (ERROR_DISPLAY_WIDGET.isErrorConditionTriggered(data)) {
 			$("#map-of-science-response").hide();
 			ERROR_DISPLAY_WIDGET.show(ENTITY_TYPE, data);
 			return;
 		}
-		
+
 		data = data[0];
-		
+
 		$.each(me.widgets, function(i, widget) {
 			widget.loadJsonData(data);
 		});
@@ -80,7 +80,7 @@ var VisModeController = Class.extend({
 	},
 	changeFilter: function(value) {
 		var type = this.getFilterType(value);
-		
+
 		$.each(this.widgets, function(i, widget) {
 			widget.changeFilter(type);
 		});
@@ -102,7 +102,7 @@ var EntityVisModeController = VisModeController.extend({
 		var widgets = {};
 		widgets['scimap'] = new ScimapWidget(map);
 		widgets['sci_area_table'] = new DataTableWidget(widgets['scimap']);
-		
+
 		this.widgets = widgets;
 	}
 });
@@ -123,7 +123,7 @@ var ComparisonVisModeController = VisModeController.extend({
 		widgets['scimap'] = new ComparisonScimapWidget(map);
 		widgets['entity_area_table'] = new EntityTablesWidget(widgets['scimap']);
 		widgets['sci_area_table'] = new ComparisonDataTableWidget(widgets['scimap'], widgets['entity_area_table']);
-		
+
 		this.widgets = widgets;
 	}
 });
diff --git a/webapp/src/main/webapp/js/visualization/personlevel/person-level.js b/webapp/src/main/webapp/js/visualization/personlevel/person-level.js
index d5de95a41b..f5fe0ec715 100644
--- a/webapp/src/main/webapp/js/visualization/personlevel/person-level.js
+++ b/webapp/src/main/webapp/js/visualization/personlevel/person-level.js
@@ -3,7 +3,7 @@
 $.extend(this, i18nStringsPersonLvl);
 
 function getWellFormedURLs(given_uri, type) {
-	
+
 	if (!given_uri || given_uri == "") {
 		return;
 	}
@@ -85,24 +85,24 @@ function getWellFormedURLs(given_uri, type) {
 }
 
 function setProfileImage(imageContainerID, mainImageURL) {
-	
+
 	if (imageContainerID == "") {
 		return;
 	}
-	
+
 	if (!mainImageURL || mainImageURL == "") {
 		$("#" + imageContainerID).empty();
 		return;
 	}
-	
+
 	var rawPath = getWellFormedURLs(mainImageURL, "image");
 
 	var imageLink =  contextPath + rawPath;
 
 	var imageContainer = $("#" + imageContainerID);
-	imageContainer.image(imageLink, 
+	imageContainer.image(imageLink,
 			function(){
-		imageContainer.empty().append(this); 
+		imageContainer.empty().append(this);
 	},
 	function(){
 		// For performing any action on failure to
@@ -110,7 +110,7 @@ function setProfileImage(imageContainerID, mainImageURL) {
 		imageContainer.empty();
 	}
 	);
-	
+
 }
 
 function setProfileMoniker(monikerContainerID, moniker, doEllipsis) {
@@ -118,52 +118,52 @@ function setProfileMoniker(monikerContainerID, moniker, doEllipsis) {
 	if (monikerContainerID == "") {
 		return;
 	}
-	
+
 	if (!moniker) {
 		$("#" + monikerContainerID).empty();
 		return;
 	}
 
 	var finalDisplayMoniker;
-	
+
 	if (moniker.length > 40 && doEllipsis) {
-		
+
 		finalDisplayMoniker = moniker.substr(0,40) + "...";
-		
+
 	} else {
-		
+
 		finalDisplayMoniker = moniker;
-		
+
 	}
-	
+
 	$("#" + monikerContainerID).empty().text(finalDisplayMoniker);
 	$("#" + monikerContainerID).attr('title', moniker);
 
 }
 
 function setProfileName(nameContainerID, name, doNameEllipsis) {
-	
+
 	if (nameContainerID == "") {
 		return;
 	}
-	
+
 	if (!name) {
 		$("#" + nameContainerID).empty();
 		return;
 	}
 
 	var finalDisplayName;
-	
+
 	if (name.length > 40 && doNameEllipsis) {
-		
+
 		finalDisplayName = name.substr(0,40) + "...";
-		
+
 	} else {
-		
+
 		finalDisplayName = name;
-		
+
 	}
-	
+
 	$("#" + nameContainerID).empty().text(finalDisplayName);
 	$("#" + nameContainerID).attr('title', name);
 
@@ -177,7 +177,7 @@ function processProfileInformation(nameContainerID,
 		doNameEllipsis) {
 
 	var name, mainImageURL, moniker;
-	
+
 	if (jQuery.isEmptyObject(profileInfoJSON)) {
 		return;
 	}
@@ -207,59 +207,59 @@ function processProfileInformation(nameContainerID,
 }
 
 function visLoaded(nodes){
-	
+
 	var jsonedNodes = jQuery.parseJSON(nodes);
-	
-	$(document).ready(function() { 
+
+	$(document).ready(function() {
 		 createTable(collaboratorTableMetadata.tableID, collaboratorTableMetadata.tableContainer, jsonedNodes);
 	});
 
 }
 
 function createTable(tableID, tableContainer, tableData) {
-	
+
 	var number_of_works = "";
-	
+
 	var table = $('<table>');
 	table.attr('id', tableID);
-	
-	table.append($('<caption>').html(collaboratorTableMetadata.tableCaption 
-										+ "<a href=\"" + collaboratorTableMetadata.tableCSVFileLink 
-										+ "\">(.CSV " + i18nStringsPersonLvl.fileCapitalized + ")</a>"));  
+
+	table.append($('<caption>').html(collaboratorTableMetadata.tableCaption
+										+ "<a href=\"" + collaboratorTableMetadata.tableCSVFileLink
+										+ "\">(.CSV " + i18nStringsPersonLvl.fileCapitalized + ")</a>"));
 
 	var header = $('<thead>');
-	
-	var row = $('<tr>'); 
 
-	row.append($('<th>').html(collaboratorTableMetadata.tableColumnTitle1)); 
-	row.append($('<th>').html(collaboratorTableMetadata.tableColumnTitle2 + "" + $('#ego_label').text()));  
+	var row = $('<tr>');
+
+	row.append($('<th>').html(collaboratorTableMetadata.tableColumnTitle1));
+	row.append($('<th>').html(collaboratorTableMetadata.tableColumnTitle2 + "" + $('#ego_label').text()));
 
 	header.append(row);
-	
+
 	table.append(header);
 
-	$.each(tableData, function(i, item){ 
-		
+	$.each(tableData, function(i, item){
+
 		/*
 		 * Make sure that we dont append a row that belong to the ego in the "co-investigator/author" table.
 		 * */
 		if (item.url !== unEncodedEgoURI) {
-			
+
 			number_of_works = item[collaboratorTableMetadata.jsonNumberWorksProperty];
-			
-			var row = $('<tr>'); 
-	
+
+			var row = $('<tr>');
+
 			row.append($('<td>').html(item.label));
 			row.append($('<td>').html(number_of_works));
-	
+
 			table.append(row);
 		}
 
-	});	
+	});
 
 	table.prependTo('#' + tableContainer);
 	$('#' + tableContainer + " #loadingData").remove();
-	
+
 }
 
 /*
diff --git a/webapp/src/main/webapp/js/visualization/sparkline.js b/webapp/src/main/webapp/js/visualization/sparkline.js
index 4e8ebd58e8..0cb22ab78a 100644
--- a/webapp/src/main/webapp/js/visualization/sparkline.js
+++ b/webapp/src/main/webapp/js/visualization/sparkline.js
@@ -4,10 +4,10 @@
 
 var visualization = {
 	renderCoAuthor: function(url) {
-	
+
 		var containerIdCoAuthor = 'vis_container_coauthor',
 		containerCoAuthor = $('#' + containerIdCoAuthor);
-			
+
         $.ajax({
             url: url,
 			data: {
@@ -21,10 +21,10 @@ var visualization = {
             	if ($.trim(data) != "") {
             		containerCoAuthor.html(data);
     				containerCoAuthor.children("#pub_count_short_sparkline_vis");
-            	} 
-				
+            	}
+
             }
-        });		
+        });
 	}
 };
 
diff --git a/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js b/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js
index dcd2ef9389..c51f543c4d 100644
--- a/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js
+++ b/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js
@@ -2,10 +2,10 @@
 
 /**
  * For rendering images dynamically.
- * 
+ *
  */
 $.fn.image = function(src, successFunc, failureFunc){
-	return this.each(function(){ 
+	return this.each(function(){
 		var profileImage = new Image();
 		profileImage.onerror = failureFunc;
 		profileImage.onload = successFunc;
@@ -17,7 +17,7 @@ $.fn.image = function(src, successFunc, failureFunc){
 
 
 /**
- * Function by Google Charts API Team to do "extended encode" of data. 
+ * Function by Google Charts API Team to do "extended encode" of data.
 */
 function extendedEncodeDataForChartURL(arrVals, maxVal) {
 
@@ -49,10 +49,10 @@ function extendedEncodeDataForChartURL(arrVals, maxVal) {
 /**
  * This will be used for getting images directly from the secure https://charts.googleapis.com
  * instead of http://charts.apis.google.com which currently throws security warnings.
- * 
+ *
  * see http://code.google.com/apis/chart/docs/chart_params.html FOR chart parameters
  * see http://code.google.com/apis/chart/docs/data_formats.html FOR how to encode data
- * 
+ *
  * sample constructed URL - https://chart.googleapis.com/chart?cht=ls&chs=148x58&chdlp=r&chco=3399CC&chd=e%3AW2ttpJbb..ttgAbbNtAA
  */
 function constructVisualizationURLForSparkline(dataString, visualizationOptions) {
@@ -67,8 +67,8 @@ function constructVisualizationURLForSparkline(dataString, visualizationOptions)
     var rootGoogleChartAPI_URL = "https://chart.googleapis.com/chart?";
 
     /*
-     * cht=ls indicates chart of type "line chart sparklines". 
-     * see http://code.google.com/apis/chart/docs/gallery/chart_gall.html 
+     * cht=ls indicates chart of type "line chart sparklines".
+     * see http://code.google.com/apis/chart/docs/gallery/chart_gall.html
 	*/
     var chartType = "cht=" + visualizationOptions.chartType;
 
@@ -89,10 +89,10 @@ function constructVisualizationURLForSparkline(dataString, visualizationOptions)
 	*/
     var chartColor = "chco=" + visualizationOptions.color;
 
-    return rootGoogleChartAPI_URL + chartType + parameterDifferentiator 
-    			+ chartSize + parameterDifferentiator 
-    			+ chartLabelPosition + parameterDifferentiator 
-    			+ chartColor + parameterDifferentiator 
+    return rootGoogleChartAPI_URL + chartType + parameterDifferentiator
+    			+ chartSize + parameterDifferentiator
+    			+ chartLabelPosition + parameterDifferentiator
+    			+ chartColor + parameterDifferentiator
     			+ "chd=" + dataString
 }
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl b/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl
index 123ea9a46b..ebc226585c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl
@@ -7,38 +7,38 @@
 <#else>
 
     <#if jobKnown == "false">
-        
+
         <p>${i18n().error_no_job_specified}</p>
-        
+
         <p>${i18n().probably_a_bug_so_report}</p>
-        
+
     <#else>
-        
+
         <h2><a class="ingestMenu" href="${urls.base}/ingest" title="${i18n().return_to_ingest_menu}">${i18n().ingest_menu}</a> > ${jobSpecificHeader}</h2>
-        
+
         <#-- check to ensure harvester.location is set in runtime.properties -->
         <#if harvesterLocation?has_content>
-            
+
             <script type="text/javascript">
-                
+
                 var harvestProgressResponse;
-                
+
                 function doHarvest() {
                     document.getElementById("harvestButton").disabled = true;
                     document.getElementById("harvestButtonHelpText").innerHTML = "${i18n().data_being_harvested}";
-                    
+
                     var request = createRequest();
                     request.onreadystatechange=function() {
                         if(request.readyState == 4 && request.status == 200) {
                             harvestProgressResponse = request.responseText;
-                            
+
                             var json = eval("(" + harvestProgressResponse + ")");
                             if(checkForFatalError(json))
                                 return;
-                            
+
                             var scriptTextArea = document.getElementById("scriptTextArea");
                             scriptTextArea.innerHTML = json.scriptText;
-                            
+
                             window.setTimeout(continueHarvest, 1000);
                         }
                     }
@@ -47,19 +47,19 @@
                     //request.send("${paramMode}=${modeHarvest}&${paramJob}=${job}");
                     request.send("${paramMode}=${modeHarvest}");
                 }
-                
+
                 function continueHarvest() {
                     var response = harvestProgressResponse;
                     var json = eval("(" + response + ")");
                     if(checkForFatalError(json)) {
                         return;
                     }
-                    
+
                     var logAppend = json.progressSinceLastCheck;
                     var progressTextArea = document.getElementById("progressTextArea");
                     progressTextArea.innerHTML = progressTextArea.innerHTML + logAppend;
                     progressTextArea.scrollTop = progressTextArea.scrollHeight;
-                    
+
                     if(!json.finished) {
                         var request = createRequest();
                         request.onreadystatechange=function() {
@@ -76,12 +76,12 @@
                         // var linkHeader = document.getElementById("linkHeader");
                         // linkHeader.style.display = "inline";
                         $('#linkHeader').removeClass('hidden');
-                        
+
                         var importedItems = document.getElementById("importedItems")
-                        
+
                         if(json.newlyAddedUrls.length > 0) {
                             for(var i = 0; i < json.newlyAddedUrls.length; i++) {
-                                
+
                                 var newLi = document.createElement("li");
                                 newLi.innerHTML = "<a href=\"" + json.newlyAddedUrls[i] + "\" target=\"_blank\">" + json.newlyAddedUris[i] + "</a>";
                                 importedItems.appendChild(newLi);
@@ -91,11 +91,11 @@
                             newLi.innerHTML = "${jobSpecificNoNewDataMessage}";
                             importedItems.appendChild(newLi);
                         }
-                        
+
                         document.getElementById("harvestButtonHelpText").innerHTML = "${i18n().harvest_complete}";
                     }
                 }
-                
+
                 function createRequest() {
                     var request;
                     if (window.XMLHttpRequest) {
@@ -105,33 +105,33 @@
                     }
                     return request;
                 }
-                
+
                 function fileResponse() {
                     var response = frames["uploadTarget"].document.getElementsByTagName("body")[0].innerHTML;
                     var json = eval("(" + response + ")");
                     if(checkForFatalError(json)) {
                         return;
                     }
-                    
+
                     var fileListing = document.getElementById("fileListing")
                     var newLi = document.createElement("li");
-                    
+
                     if (json.success) {
                         newLi.innerHTML = json.fileName + " <span style=\"color:green\">" + json.errorMessage + "</span>";
                     } else {
                         newLi.innerHTML = json.fileName + " <span style=\"color:red\">upload failed: " + json.errorMessage + "</span>";
                     }
-                    
+
                     fileListing.appendChild(newLi);
-                    
+
                     document.getElementById("${paramFirstUpload}").value = "false";
-                    
+
                     //document.getElementById("responseArea").innerHTML = response;
                 }
-                
+
                 function init() {
                         document.getElementById("harvestButton").disabled = false;
-                        
+
                         document.getElementById("${paramFirstUpload}").value = "true";
                         document.getElementById("fileUploadForm").onsubmit = function()
                         {
@@ -143,7 +143,7 @@
                             document.getElementById("downloadTemplateForm").target = "uploadTarget";
                         }
                 }
-                
+
                 function checkForFatalError(json) {
                     if(json.fatalError) {
                         handleFatalError();
@@ -152,33 +152,33 @@
                         return false;
                     }
                 }
-                
+
                 function handleFatalError() {
                     $('#fileHarvestErrorHelp').removeClass('hidden');
                     $('#fileHarvestForm').addClass('hidden');
-                } 
-                
+                }
+
                 window.onload = init;
-                
+
                 $(document).ready(function() {
                     $('a.help').click(function() {
                         $('#csvHelp-collapsible').toggleClass('hidden');
                         return false;
                     });
-                    
+
                     $('#harvestButton').click(function() {
                         doHarvest();
                         return false;
                     });
                 });
-                
+
             </script>
-            
+
             <div id="fileHarvestErrorHelp" class="hidden">
                 <p>${i18n().error_harvest_cannot_continue}</p>
-                
+
                 <p>${i18n().harvest_error_instructions_one}</p>
-                
+
                 <ol>
                     <li>${i18n().harvest_error_instructions_two}</li>
                     <li>${i18n().the_capitalized} <em>${i18n().harvester_location}</em> ${i18n().harvest_error_instructions_three}</li>
@@ -187,7 +187,7 @@
                     <li>${i18n().harvest_error_instructions_sixA} <em>${i18n().harvest_error_instructions_sixB}</em> ${i18n().harvest_error_instructions_sixC}</li>
                 </ol>
             </div>
-            
+
             <div id="fileHarvestForm">
                 <div id="step1" class="testfile-step">
                     <h3 class="testfile-step-header">${i18n().step_one}</h3>
@@ -199,7 +199,7 @@
                         </form>
                     </div>
                 </div>
-                
+
                 <div id="step2" class="testfile-step">
                     <h3 class="testfile-step-header">${i18n().step_two}</h3>
                     <div id="step2-inner" class="testfile-step-body">
@@ -214,7 +214,7 @@
                         </div>
                     </div>
                 </div>
-                
+
                 <div id="step3" class="testfile-step">
                     <h3 class="testfile-step-header">${i18n().step_three}</h3>
                     <div id="step3-inner" class="testfile-step-body">
@@ -232,7 +232,7 @@
                         </ul>
                     </div>
                 </div>
-                
+
                 <div id="step4" class="testfile-step">
                     <h3 class="testfile-step-header">${i18n().step_four}</h3>
                     <div id="step4-inner" class="testfile-step-body">
@@ -240,18 +240,18 @@
                         <p><input type="button" name="harvestButton" id="harvestButton" class="green button" value="${i18n().harvest_capitalized}" /><span id="harvestButtonHelpText">${i18n().click_to_harvest}</span></p>
                     </div>
                 </div>
-                
+
                 <div id="step5" class="testfile-step">
                     <h3 class="testfile-step-header">${i18n().step_five}</h3>
                     <div id="step5-inner" class="testfile-step-body">
                         <h4 class="testfile-step-subheader">${i18n().view_results}</h4>
                         <div id="script">
                             <h5>${i18n().script_executed}</h5>
-                            <textarea cols="100" rows="20" readonly="readonly" id="scriptTextArea"></textarea>      
+                            <textarea cols="100" rows="20" readonly="readonly" id="scriptTextArea"></textarea>
                         </div>
                         <div id="progress">
                             <h5>${i18n().progress_capitalized}</h5>
-                            <textarea cols="100" rows="20" readonly="readonly" id="progressTextArea"></textarea>        
+                            <textarea cols="100" rows="20" readonly="readonly" id="progressTextArea"></textarea>
                         </div>
                         <div id="summary">
                             <h5 id="linkHeader" class="hidden">${jobSpecificLinkHeader}</h5>
@@ -261,20 +261,20 @@
                     </div>
                 </div>
             </div>
-            
+
         <#else>
-            
+
             <div id="fileHarvestErrorHelp">
                 <p>${i18n().the_capitalized} <em>${i18n().harvester_location}</em> ${i18n().undefined_runtime_property}</p>
-                
+
                 <p>${i18n().define_value_for_property}</p>
             </div>
-            
+
         <#-- if harvester.location is defined -->
         </#if>
-        
+
         ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/harvester/fileharvest.css" />')}
-        
+
     <#-- if job known -->
     </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl
index 5bc00b5252..407413ae68 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl
@@ -18,12 +18,12 @@
 </#assign>
 
 <#if individual.mostSpecificTypes?seq_contains("Academic Department") && getGrantResults?has_content>
-    <#assign departmentalGrantsExtension>    
+    <#assign departmentalGrantsExtension>
         <div id="activeGrantsLink">
         <img src="${urls.base}/images/individual/arrow-green.gif">
             <a href="${urls.base}/deptGrants?individualURI=${individual.uri}" title="${i18n().view_all_active_grants}">
                 ${i18n().view_all_active_grants}
-            </a>    
+            </a>
         </div>
     </#assign>
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
index 0cff81203d..5264d4b2e0 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
@@ -18,19 +18,19 @@
 <#--Number of distinct languages represented, with no language tag counting as a language, across labels-->
 <#if !languageCount??>
 	<#assign languageCount = 1>
-</#if>	
+</#if>
 <#assign qrCodeIcon = "qr-code-icon.png">
 <#assign visRequestingTemplate = "foaf-person-2column">
 <#--add the VIVO-ORCID interface -->
-<#include "individual-orcidInterface.ftl">  
+<#include "individual-orcidInterface.ftl">
 <section id="individual-intro" class="vcard person" role="region"><span itemscope itemtype="http://schema.org/Person">
-    <section id="share-contact" role="region"> 
-        <#-- Image -->           
+    <section id="share-contact" role="region">
+        <#-- Image -->
         <#assign individualImage>
-            <@p.image individual=individual 
-                      propertyGroups=propertyGroups 
-                      namespaces=namespaces 
-                      editable=editable 
+            <@p.image individual=individual
+                      propertyGroups=propertyGroups
+                      namespaces=namespaces
+                      editable=editable
                       showPlaceholder="always" />
         </#assign>
 
@@ -39,7 +39,7 @@
         </#if>
 
         <div id="photo-wrapper" >${individualImage}</div>
-        
+
         <#include "individual-visualizationFoafPerson.ftl">
     </section> <!-- end share-contact -->
     <section id="individual-info" ${infoClass!} role="region">
@@ -48,8 +48,8 @@
             <#if relatedSubject??>
                 <h2>${relatedSubject.relatingPredicateDomainPublic} ${i18n().for} ${relatedSubject.name}</h2>
                 <p><a href="${relatedSubject.url}" title="${i18n().return_to(relatedSubject.name)}">&larr; ${i18n().return_to(relatedSubject.name)}</a></p>
-            <#else>  
-                <h1 itemprop="name" class="vcard foaf-person fn" <#if !editable>style="float:left;border-right:1px solid #A6B1B0;"</#if>> 
+            <#else>
+                <h1 itemprop="name" class="vcard foaf-person fn" <#if !editable>style="float:left;border-right:1px solid #A6B1B0;"</#if>>
                     <#-- Label -->
                     <@p.label individual editable labelCount localesCount/>
                 </h1>
@@ -57,7 +57,7 @@
                 <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
                 <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
                     <#if (title.statements?size < 1) >
-                        <@p.addLinkWithLabel title editable /> 
+                        <@p.addLinkWithLabel title editable />
                     <#elseif editable>
                         <h2>${title.name?capitalize!}</h2>
                         <@p.verboseDisplay title />
@@ -75,23 +75,23 @@
                 <#if ! (title.statements)?has_content>
                     <@p.mostSpecificTypesPerson individual editable/>
                 </#if>
-            </#if>        
+            </#if>
             <span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess>style="top:5px"</#if>>
                 <#include "individual-iconControls.ftl">
             </span>
             <#if editable && profilePageTypesEnabled >
                 <#include "individual-profilePageTypes.ftl">
             </#if>
-        </header>     
+        </header>
         <!-- Positions -->
         <#include "individual-positions.ftl">
-        
+
         <!-- Overview -->
         <#if !editable>
             <p></p>
         </#if>
         <#include "individual-overview.ftl">
-        
+
         <!-- Research Areas -->
         <#include "individual-researchAreas.ftl">
 
@@ -122,8 +122,8 @@
 <#assign nameForOtherGroup = "${i18n().other}">
 <#if !editable>
 	<#-- We don't want to see the first name and last name unless we might edit them. -->
-	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!> 
-	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!> 
+	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
+	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
 </#if>
 
 <#include "individual-property-group-tabs.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
index 9ce4ab57eb..b3707fee00 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
@@ -20,17 +20,17 @@
 <#--Number of distinct languages represented, with no language tag counting as a language, across labels-->
 <#if !languageCount??>
 	<#assign languageCount = 1>
-</#if>	
+</#if>
 <#assign qrCodeIcon = "qr-code-icon.png">
 <#assign individualImage>
-    <@p.image individual=individual 
-              propertyGroups=propertyGroups 
-              namespaces=namespaces 
-              editable=editable 
+    <@p.image individual=individual
+              propertyGroups=propertyGroups
+              namespaces=namespaces
+              editable=editable
               showPlaceholder="always"/>
 </#assign>
 
-<#-- 
+<#--
      the display in this template is driven by whether the individual has a web page,
      so set this variable now
 -->
@@ -57,10 +57,10 @@
             <#if relatedSubject??>
                 <h2>${relatedSubject.relatingPredicateDomainPublic} ${i18n().for} ${relatedSubject.name}</h2>
                 <p><a href="${relatedSubject.url}" title="${i18n().return_to(relatedSubject.name)}">&larr; ${i18n().return_to(relatedSubject.name)}</a></p>
-            <#else> 
+            <#else>
                 <#-- Image  -->
                 <div id="photo-wrapper">${individualImage}</div>
-                <h1 itemprop="name" class="vcard foaf-person fn" <#if !editable>style="float:left;border-right:1px solid #A6B1B0;"</#if>> 
+                <h1 itemprop="name" class="vcard foaf-person fn" <#if !editable>style="float:left;border-right:1px solid #A6B1B0;"</#if>>
                     <#-- Label -->
                     <@p.label individual editable labelCount localesCount/>
                 </h1>
@@ -84,9 +84,9 @@
                 </#if>
                 <#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
                 <#if ! (title.statements)?has_content>
-                    <@p.mostSpecificTypesPerson individual editable /> 
+                    <@p.mostSpecificTypesPerson individual editable />
                 </#if>
-            </#if>       
+            </#if>
         </header>
     </section> <!-- end label-title  -->
     <#include "individual-adminPanel.ftl">
@@ -104,16 +104,16 @@
         </div>
     </#if>
 
-    <#-- 
+    <#--
         If this individual has a web page or pages, then we highlight them on the left-hand side
         of the profile page against a shaded background. If not, all the right-hand content shifts
         left and displays across the full width of the page.
     -->
     <#if hasWebpage >
-        <section id="qv-share-contact" class="share-contact" role="region" <#if !editable>style="padding-top:12px"</#if>> 
+        <section id="qv-share-contact" class="share-contact" role="region" <#if !editable>style="padding-top:12px"</#if>>
             <img id="webpage-popout-top" src="${urls.images}/individual/webpage-popout-top.png"  alt="${i18n().background_top_image}"/>
             <div id="webpage-wrapper" >
-                <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>            
+                <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
                 <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
                     <#if editable>
                         <h2 class="websites" >${i18n().websites} <@p.addLink webpage editable ""/></h2>
@@ -128,7 +128,7 @@
             <img id="webpage-popout-bottom" src="${urls.images}/individual/webpage-popout-bottom.png"  alt="${i18n().background_top_image}"  />
         </section> <!-- end share-contact -->
     </#if>
-    <section id="individual-info" class="qv-individual-info" role="region" style=" <#if !editable>padding-top:12px;</#if><#if hasWebpage>width:53%<#else>width:100%;clear:left</#if>;">       
+    <section id="individual-info" class="qv-individual-info" role="region" style=" <#if !editable>padding-top:12px;</#if><#if hasWebpage>width:53%<#else>width:100%;clear:left</#if>;">
         <!-- Positions -->
         <#include "individual-positions.ftl">
 
@@ -136,7 +136,7 @@
         <#include "individual-researchAreas.ftl">
 
         <!-- Geographic Focus -->
-        <#assign geographicFocus = propertyGroups.pullProperty("${core}geographicFocus")!> 
+        <#assign geographicFocus = propertyGroups.pullProperty("${core}geographicFocus")!>
         <#if geographicFocus?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
             <h2 id="geoFocus" class="mainPropGroup">${i18n().geographic_focus} <@p.addLink geographicFocus editable ""/></h2>
             <@p.verboseDisplay geographicFocus />
@@ -155,12 +155,12 @@
                     <@p.objectProperty geographicFocus editable />
                 </ul>
             </#if>
-        </#if>   
+        </#if>
 
         <#-- If the individual does not have webpages and we're in edit mode, provide the opportunity to add webpages -->
         <#if editable && !hasWebpage >
             <!-- Webpages -->
-            <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>            
+            <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
             <#if webpage?has_content>
                 <h2 id="webpage" class="mainPropGroup">${i18n().websites} <@p.addLink webpage editable ""/></h2>
                 <@p.verboseDisplay webpage />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
index bc0a91bbff..586eadabc3 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -1,22 +1,22 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
 
-    This version of individual--foaf-person.ftl is a "router" template. The original VIVO 
+    This version of individual--foaf-person.ftl is a "router" template. The original VIVO
     version of this template now resides in the /themes/wilma/templates directory.
-    
-    This version of the template is used when the profile page types feature is enabled. 
-    This template serves to "rout" the user to the correct template based (1) the 
-    profile page type of the foaf person being displayed or (2) the targeted view that 
-    the user wants to see. For example, when a user is routed to a quick view template, 
-    the user has the option of displaying the full view. If the user chooses that option, 
-    the targetedView variable gets set. 
-    
+
+    This version of the template is used when the profile page types feature is enabled.
+    This template serves to "rout" the user to the correct template based (1) the
+    profile page type of the foaf person being displayed or (2) the targeted view that
+    the user wants to see. For example, when a user is routed to a quick view template,
+    the user has the option of displaying the full view. If the user chooses that option,
+    the targetedView variable gets set.
+
     This template could also be used to load just the "individual--foaf-person-2column.ftl"
     without enabling profile page types. "individual--foaf-person-2column.ftl" is a slightly
-    different design than the "individual--foaf-person.ftl" template in the themes/wilma 
+    different design than the "individual--foaf-person.ftl" template in the themes/wilma
     directory.
-        
+
  -->
 
 <#include "individual-setup.ftl">
@@ -24,7 +24,7 @@
 ${scripts.add('<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}
 ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
 
-<#-- 
+<#--
     First, check to see if profile page types are enabled. If not, get the 2 column template:
     "individual--foaf-person-2column.ftl".
 
@@ -40,7 +40,7 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
     <#assign profilePageType = profileType >
 
     <#-- targetedView takes precedence over the profilePageType. -->
- 
+
     <#if targetedView?has_content>
         <#if targetedView != "standardView">
             <#assign selectedTemplate = "individual--foaf-person-quickview.ftl" >
@@ -49,4 +49,4 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
         <#assign selectedTemplate = "individual--foaf-person-quickview.ftl" >
     </#if>
 </#if>
-<#include selectedTemplate >              
+<#include selectedTemplate >
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl
index 9f56f4c88a..88208a08fd 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl
@@ -8,11 +8,11 @@
 	        <h2>OpenSocial</h2>
 		    <#-- It would likely make sense to remove the #if logic as it is safe and -->
 		    <#-- arguably better to just have both divs in all conditions -->
-		    <#if editable>								  
+		    <#if editable>
         	    <div id="gadgets-edit" class="gadgets-gadget-parent"></div>
             <#else>
         	    <div id="gadgets-view" class="gadgets-gadget-parent" ></div>
             </#if>
         </div>
-    </#if>	
+    </#if>
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
index 6e0d410e78..6cfb473dd9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
@@ -13,7 +13,7 @@
 <#assign individualProductExtension>
     <#-- Include for any class specific template additions -->
     ${classSpecificExtension!}
-    ${departmentalGrantsExtension!} 
+    ${departmentalGrantsExtension!}
     <!--PREINDIVIDUAL OVERVIEW.FTL-->
     <#include "individual-vocabularyService.ftl">
     <#include "individual-webpage.ftl">
@@ -25,9 +25,9 @@
 </#assign>
 
 <#if individual.conceptSubclass() >
-    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#broader")!> 
-    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#narrower")!> 
-    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#related")!> 
+    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#broader")!>
+    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#narrower")!>
+    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#related")!>
 </#if>
 
 <#include "individual-vitro.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
index 60f5a74968..5594808503 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
@@ -6,23 +6,23 @@
 </#if>
 <form id="addLabelForm" name="addLabelForm" class="customForm" action="${submitUrl}">
            <h2>${i18n().add_label}</h2>
-           <#if isPersonType?has_content && isPersonType = "true">       
+           <#if isPersonType?has_content && isPersonType = "true">
 	        <p>
 	            <label for="firstName">${i18n().first_name} ${requiredHint}</label>
 	            <input size="30"  type="text" id="firstName" name="firstName" value="${firstNameValue}" />
 	        </p>
 			<#--TODO: With ISF changes, add middle name input-->
-	
+
 			<p>
 	            <label for="middleName">${i18n().middle_name} </label>
 	            <input size="30"  type="text" id="middleName" name="middleName" value="${middleNameValue}" />
 	        </p>
-	
+
 	        <p>
 	            <label for="lastName">${i18n().last_name} ${requiredHint}</label>
 	            <input size="30"  type="text" id="lastName" name="lastName" value="${lastNameValue}" />
 	        </p>
-	    <#else>       
+	    <#else>
 	        <p>
 	            <label for="name">${i18n().name_capitalized} ${requiredHint}</label>
 	            <input size="30"  type="text" id="label" name="label" value="${labelValue}" />
@@ -30,20 +30,20 @@
 	    </#if>
            <label for="newLabelLanguage">${i18n().add_label_for_language}</label>
 			<select  name="newLabelLanguage" id="newLabelLanguage"  >
-			<option value=""<#if !newLabelLanguageValue?has_content> selected="selected"</#if>>${i18n().select_locale}</option>  
+			<option value=""<#if !newLabelLanguageValue?has_content> selected="selected"</#if>>${i18n().select_locale}</option>
 			<#if editConfiguration.pageData.selectLocale?has_content>
 				<#assign selectLocale = editConfiguration.pageData.selectLocale />
 				<#list selectLocale as locale>
 			 	<option value="${locale.code}"<#if newLabelLanguageValue?has_content && locale.code == newLabelLanguageValue> selected="selected"</#if>>${locale.label}</option>
     			</#list>
-			</#if>           
-			</select>          
-			
+			</#if>
+			</select>
+
  			<input type="hidden" name="editKey" id="editKey" value="${editKey}"/>
-            
+
         	<input type="submit" class="submit" id="submit" value="${i18n().save_button}" role="button" role="input" />
-			${i18n().or} 
+			${i18n().or}
 			<a href="${urls.referringPage}" class="cancel" title="${i18n().cancel_title}" >${i18n().cancel_link}</a>
-        	
+
             <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
             </form>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl
index 738d4d99dc..d5b65fe3ee 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <p>${i18n().publications_text_one}  </p>
-   
+
 <p> ${i18n().publications_text_two}</p>
-    
+
 <code>
 display:About <br>
     a display:Page ; <br>
@@ -11,8 +11,8 @@ display:About <br>
     display:title "About" ;<br>
     display:urlMapping "/about" .<br>
     <br>
-</code>    
+</code>
 
 <p>${i18n().publications_text_three}</p>
 
-    
+
diff --git a/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl b/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl
index e4ec72a1aa..5ed32b0733 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl
@@ -4,12 +4,12 @@
 The body map contains the orcidInfo structure, which is set up like this:
 
 orcidInfo
-    progress       - a string set to one of these values: START, DENIED_AUTHENTICATE, 
-                     FAILED_AUTHENTICATE, GOT_PROFILE, ID_ALREADY_PRESENT, DENIED_ID, 
+    progress       - a string set to one of these values: START, DENIED_AUTHENTICATE,
+                     FAILED_AUTHENTICATE, GOT_PROFILE, ID_ALREADY_PRESENT, DENIED_ID,
                      FAILED_ID, ADDED_ID
     individualUri  - the URI of the person
     profilePage    - the URL of the individual's profile page
-    orcid          - the confirmed ORCID (just xxxx-xxxx-xxxx-xxxx), 
+    orcid          - the confirmed ORCID (just xxxx-xxxx-xxxx-xxxx),
                      or the empty string.
     orcidUri       - the confirmed ORCID (full URI), or the empty string.
     externalIds    - empty if we haven't read their profile. Otherwise, a sequence
@@ -18,11 +18,11 @@ orcidInfo
                      commonName - e.g., "VIVO Cornell"
                      reference  - e.g., their VIVO localname
                      uri        - e.g., their VIVO URI
-    hasVivoId      - true, if we have read the profile and they already have 
+    hasVivoId      - true, if we have read the profile and they already have
                      their VIVO URI as an external ID. False otherwise.
-    existingOrcids - A sequence of the ORCIDs (full URI) that we already associate 
+    existingOrcids - A sequence of the ORCIDs (full URI) that we already associate
                      with this individual.
-    progressUrl    - The URL to go to, that will continue this process. If the 
+    progressUrl    - The URL to go to, that will continue this process. If the
                      process is complete or has failed, this is empty.
 
 -->
@@ -34,7 +34,7 @@ orcidInfo
     border-radius: 10px;
     padding: 0 1em 1em;
     margin: 12px
-} 
+}
 
 #orcid-offer .links {
 	text-align: left;
@@ -78,7 +78,7 @@ span.completed {
 
 <section id="orcid-offer" role="region">
     <h2>Do you want to ${orcidTextOne} ORCID iD?</h2>
-   
+
     <div class="step">
       <#if "START" == orcidInfo.progress>
         <h2>Step 1: ${orcidTextTwo} your ORCID iD</h2>
@@ -105,7 +105,7 @@ span.completed {
         <p><a href="${orcidInfo.orcidUri}" target="_blank">View your ORCID record.</a></p>
       </#if>
     </div>
-    
+
     <div class="step ${step2dimmed}">
       <#if "ID_ALREADY_PRESENT" == orcidInfo.progress>
         <h2>Step 2 (recommended): Linking your ORCID record to VIVO <span class="completed">(step completed)</span></h2>
@@ -131,13 +131,13 @@ span.completed {
         </ul>
       </#if>
     </div>
-    
+
     <div class=links>
       <form method="GET" action="${orcidInfo.progressUrl}">
         <p>
           <#if continueAppears>
             <input type="submit" name="submit" value="Continue <#if "START" == orcidInfo.progress>Step 1<#else>Step 2</#if>" class="submit"/>
-            or 
+            or
           </#if>
           <a class="cancel" href="${orcidInfo.profilePage}">Return to your VIVO profile page</a>
         </p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
index b2b8c03010..9fb4c7ac5b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
@@ -4,7 +4,7 @@
     <#assign urlForDetailsPage = "affiliatedDepartments" />
     <#assign headingText = "${i18n().affiliated_departments}" />
         <h2 id="facultyResearchAreas" class="mainPropGroup">
-            ${headingText} 
+            ${headingText}
         </h2>
         <ul id="individual-hasResearchArea" role="list">
             <#assign moreDisplayed = false>
@@ -15,7 +15,7 @@
 		            </a>
 		        </li>
             </#list>
-        </ul>    
+        </ul>
 </#if>
 <script>
 $('a#raMore').click(function() {
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl
index 2c5c3dd196..2a266defda 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl
@@ -19,7 +19,7 @@
 		        </li>
             </#list>
         </ul>
-    
+
     </section>
 </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
index 9c8411c2b3..656c3c62c9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
@@ -26,7 +26,7 @@
 		        </li>
             </#list>
         </ul>
-    
+
     </section>
 </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
index fce8af74a6..741c794230 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
@@ -9,7 +9,7 @@
         <#assign headingText = "${i18n().faculty_research_areas}" />
     </#if>
         <h2 id="facultyResearchAreas" class="mainPropGroup">
-            ${headingText} 
+            ${headingText}
         </h2>
         <#assign numberRows = researchAreaResults?size/>
         <ul id="individual-hasResearchArea" role="list">
@@ -24,7 +24,7 @@
 		            <li class="raLinkMore" style="display:none">
 		        <#else>
 		            <li class="raLink">
-		        </#if> 
+		        </#if>
 		            <a class="raLink" href="${urls.base}/deptResearchAreas?orgURI=${individual.uri?replace("#","%23")}&raURI=${resultRow["ra"]}">
 		                ${resultRow["raLabel"]}
 		            </a>
@@ -32,7 +32,7 @@
 		        <#assign totalLength = totalLength + resultRow["raLabel"]?length >
             </#list>
             <#if ( totalLength > 380 ) ><li id="raLessContainer" style="display:none">(<a id="raLess" href="javascript:">less</a>)</li></#if>
-        </ul>    
+        </ul>
 </#if>
 <script>
 $('a#raMore').click(function() {
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
index 7f74e8736e..bf8054f85e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
@@ -14,17 +14,17 @@
     <div id="contactOuterDiv">
         <div id="contactEmailDiv">
 </#if>
-<#-- Primary Email -->    
+<#-- Primary Email -->
 <@emailLinks "${core}primaryEmail" pEmail />
 
-<#-- Additional Emails --> 
-<@emailLinks "${core}email" email />   
+<#-- Additional Emails -->
+<@emailLinks "${core}email" email />
 <#if !editable>
         </div> <!-- contactEmailDiv -->
         <div id="contactPhoneDiv">
 </#if>
-<#-- Phone --> 
-<@phoneLinks phone /> 
+<#-- Phone -->
+<@phoneLinks phone />
 <#if !editable>
         </div> <!-- contactPhoneDiv -->
     </div> <!-- contactOuterDiv -->
@@ -38,7 +38,7 @@
     <#if phone.statements?has_content> <#-- if there are any statements -->
         <ul id="phone-list" role="list">
             <#list phone.statements as statement>
-                <li role="listitem" <#if editable>style="padding-left:10px;"</#if>>                           
+                <li role="listitem" <#if editable>style="padding-left:10px;"</#if>>
                     <span itemprop="telephone">${statement.number!}</span>
                     <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable phone.rangeUri />
                 </li>
@@ -47,14 +47,14 @@
     </#if>
 </#if>
 </#macro>
-<#macro emailLinks property email>        
+<#macro emailLinks property email>
     <#if property == "${core}primaryEmail">
         <#local listId = "primary-email">
         <#local label = "${i18n().primary_email}">
     <#else>
         <#local listId = "additional-emails">
         <#local label = "${i18n().additional_emails}">
-    </#if>     
+    </#if>
     <#if email?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
         <#if editable>
             <h3 id="contact" class="${listId}">${label}<@p.addLink email editable label/></h3>
@@ -64,7 +64,7 @@
             <ul id="${listId}" role="list">
                 <#list email.statements as statement>
                     <li role="listitem" <#if editable>style="padding-left:10px;"</#if>>
-                        
+
                         <a itemprop="email" class="email" href="mailto:${statement.emailAddress!}" title="${i18n().email}">${statement.emailAddress!}</a>
                         <@p.editingLinks "${email.localName}" "${email.name}" statement editable email.rangeUri />
                     </li>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
index ad0ce7a14f..f6d3ccddb5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
@@ -10,13 +10,13 @@
     <ul style="font-size:1em;padding-bottom:4px"><li><strong>${i18n().contact_info}</strong></li></ul>
 </#if>
 
-<#-- Primary Email -->    
+<#-- Primary Email -->
 <@emailLinks "primaryEmail" primaryEmail />
 
-<#-- Additional Emails --> 
-<@emailLinks "email" addlEmail />   
-  
-<#-- Phone --> 
+<#-- Additional Emails -->
+<@emailLinks "email" addlEmail />
+
+<#-- Phone -->
 
 <#if phone?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <@p.addLinkWithLabel phone editable />
@@ -39,7 +39,7 @@
     <#else>
         <#local listId = "additional-emails">
         <#local label = "${i18n().additional_emails_capitalized}">
-    </#if>     
+    </#if>
     <#if email?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
         <@p.addLinkWithLabel email editable label/>
         <#if email.statements?has_content> <#-- if there are any statements -->
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
index 872e318cf5..78d2396ea2 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
@@ -21,7 +21,7 @@
     </tr>
         <#list deptGrants as resultRow>
             <tr>
-		        <td><a href="${urls.base}/individual${resultRow["grant"]?substring(resultRow["grant"]?last_index_of("/"))}" title="${i18n().grant_name}">${resultRow["grantLabel"]}</a></td> 
+		        <td><a href="${urls.base}/individual${resultRow["grant"]?substring(resultRow["grant"]?last_index_of("/"))}" title="${i18n().grant_name}">${resultRow["grantLabel"]}</a></td>
 		        <td>${dt.formatXsdDateTimeShort(resultRow["dt"], "yearMonthDayPrecision")}</td>
 		    </tr>
 		</#list>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl
index 3b2aea05d1..23eca6ba33 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl
@@ -17,7 +17,7 @@
 		        </li>
             </#list>
         </ul>
-    
+
     </section>
 </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl
index 87e9656dd0..9b1359d9cb 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl
@@ -1,14 +1,14 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- List of research areas for the individual -->
-<#assign geographicFoci = propertyGroups.pullProperty("${core}geographicFocus")!> 
+<#assign geographicFoci = propertyGroups.pullProperty("${core}geographicFocus")!>
 <#if geographicFoci?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <#assign localName = geographicFoci.localName>
     <h2 id="${localName}" class="mainPropGroup" style="clear:left"  title="${geographicFoci.publicDescription!}">
-        ${geographicFoci.name?capitalize} 
+        ${geographicFoci.name?capitalize}
         <@p.addLink geographicFoci editable /> <@p.verboseDisplay geographicFoci />
     </h2>
     <ul id="individual-hasResearchArea" role="list" >
         <@p.objectProperty geographicFoci editable />
-    </ul> 
-</#if>   
+    </ul>
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl
index 1ed6e72cfe..405e9aeefc 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl
@@ -5,7 +5,7 @@
 <img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/share-uri-icon.png" alt="${i18n().share_the_uri}" />
 <#if checkNamesResult?has_content >
 	<img id="qrIcon"  src="${urls.images}/individual/qr-code-icon.png" alt="${i18n().qr_icon}" />
-	<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!} 
+	<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
 		<a class="qrCloseLink" href="#"  title="${i18n().qr_code}">${i18n().close_capitalized}</a>
 	</span>
 </#if>
@@ -13,9 +13,9 @@
 
 <#--
 
-Some contact information is displayed on the profile page by default; e.g., phone numbes and 
-email addresses. If an institution has an additional location for contact info, such as a 
-university directory, a third "contact" icon is available that can be used to direct users to 
+Some contact information is displayed on the profile page by default; e.g., phone numbes and
+email addresses. If an institution has an additional location for contact info, such as a
+university directory, a third "contact" icon is available that can be used to direct users to
 that directory. The <a> tag below shows an example using Cornell University's directory.
 
 <#assign netid = individual.selfEditingId()!>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl
index 64808e009c..f5777e9f08 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl
@@ -1,10 +1,10 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
     If authorized to confirm ORCID IDs, add the function that will replace the add link.
     The OrcidIdDataGetter is attached to this template; it sets the orcidInfo structure,
     which looks like this:
-    
+
     orcidInfo = map {
         authorizedToConfirm: boolean
         orcidUrl: link to the orcid controller
@@ -14,15 +14,15 @@
         ]
     }
 -->
-<#assign confirmThis = "" /> 
+<#assign confirmThis = "" />
 <#if orcidInfo??>
-    
+
     <#list orcidInfo.orcids?keys as key>
         <#if "no" == orcidInfo.orcids[key]?string("yes","no") >
             <#assign confirmThis = "Confirm the ID" />
             </#if>
     </#list>
-        
+
     <#if orcidInfo.authorizedToConfirm>
         <script>
             $(document).ready(function(){
@@ -31,4 +31,4 @@
         </script>
     </#if>
 </#if>
- 
+
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl
index 19dcc74f51..3262d5615f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl
@@ -2,7 +2,7 @@
 
 <#-- Overview on individual profile page -->
 
-<#assign overview = propertyGroups.pullProperty("${core}overview")!> 
+<#assign overview = propertyGroups.pullProperty("${core}overview")!>
 <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <@p.addLinkWithLabel overview editable />
     <#list overview.statements as statement>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl
index 0d80ebb396..7935d045de 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl
@@ -7,5 +7,5 @@
     <h2 id="${localName}" class="mainPropGroup" title="${positions.publicDescription!}">${positions.name?capitalize} <@p.addLink positions editable /> <@p.verboseDisplay positions /></h2>
     <ul id="individual-personInPosition" role="list">
         <@p.objectProperty positions editable />
-    </ul> 
-</#if> 
+    </ul>
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
index a75adaeea0..54c1162dd7 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
@@ -33,7 +33,7 @@
     <#if hasValidVCard()>
         <#local qrData = qrData>
         <#local qrCodeLinkedImage><a title="${i18n().export_qr_codes}" href="${qrData.exportQrCodeUrl}"><@qrCodeVCard qrCodeWidth=width /></a></#local>
-        
+
         <#if (display == "full")>
             <h5 class="qrCode">${i18n().vcard_qr}</h5>
             ${qrCodeLinkedImage}
@@ -43,7 +43,7 @@
         <#else>
             <p class="notice">${i18n().invalid_qr_code_parameter}</p>
         </#if>
-        
+
     </#if>
 </#macro>
 
@@ -66,7 +66,7 @@
     <#local url = individual.uri! >
     <#local photo = individual.thumbUrl! >
     <#local rev = "" >
-    
+
     <#if firstName != "" && lastName != "">
         <#local vCard><#t>
             BEGIN:VCARD<#lt>
@@ -101,8 +101,8 @@
 
     <#local qrCodeUrl = "">
     <#if externalUrl != "">
-    	<#local fullExternalUrl = externalUrl + individual.profileUrl> 
-    	<#local qrCodeContent = fullExternalUrl?url> 
+    	<#local fullExternalUrl = externalUrl + individual.profileUrl>
+    	<#local qrCodeContent = fullExternalUrl?url>
         <#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&amp;chs=${qrCodeWidth}x${qrCodeWidth}&amp;chl=${qrCodeContent}&amp;choe=UTF-8" >
     </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
index 2ce102b8d2..9c9c88be6b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
@@ -1,17 +1,17 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- List of research areas for the individual -->
-<#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!> 
-<#assign concepts = propertyGroups.pullProperty("${core}hasAssociatedConcept")!> 
+<#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!>
+<#assign concepts = propertyGroups.pullProperty("${core}hasAssociatedConcept")!>
 <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <#assign localName = researchAreas.localName>
     <h2 id="${localName}" class="mainPropGroup" title="${researchAreas.publicDescription!}">
-        ${researchAreas.name?capitalize} 
+        ${researchAreas.name?capitalize}
         <img id="researchAreaIcon" src="${urls.images}/individual/research-group-icon.png" alt="${i18n().research_areas}" />
         <@p.addLink researchAreas editable />
     </h2>
     <@p.verboseDisplay researchAreas />
     <ul id="individual-${localName}" role="list" >
         <@p.objectProperty researchAreas editable />
-    </ul> 
-</#if>   
+    </ul>
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
index 7e4a5de7fe..2b1144489b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
@@ -9,62 +9,62 @@
 <#assign obo_RO53 = "http://purl.obolibrary.org/obo/RO_0000053">
 
 <#assign isInvestigator = ( p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}InvestigatorRole") ||
-                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") || 
+                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") ||
                             p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}CoPrincipalInvestigatorRole") ) >
 
 <#if (isAuthor || isInvestigator)>
- 
+
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/visualization/visualization.css" />')}
     <#assign standardVisualizationURLRoot ="/visualization">
-        
+
         <#if isAuthor>
             <#assign coAuthorIcon = "${urls.images}/visualization/coauthorship/co_author_icon.png">
             <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/scimap_icon.png">
             <#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
             <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()>
-            
-            <#assign googleJSAPI = "https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22imagesparkline%22%5D%7D%5D%7D"> 
-            
-            <span id="sparklineHeading">${i18n().publications_in_vivo}</span>   
-            
+
+            <#assign googleJSAPI = "https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22imagesparkline%22%5D%7D%5D%7D">
+
+            <span id="sparklineHeading">${i18n().publications_in_vivo}</span>
+
             <div id="vis_container_coauthor">&nbsp;</div>
-            
+
             <div class="collaboratorship-link-separator"></div>
-            
+
             <div id="coauthorship_link_container" class="collaboratorship-link-container">
 				<div class="collaboratorship-icon">
                     <a href="${coAuthorVisUrl}" title="${i18n().co_author}"><img src="${coAuthorIcon}" alt="${i18n().co_author}" width="25px" height="25px" /></a>
                 </div>
                 <div class="collaboratorship-link"><a href="${coAuthorVisUrl}" title="${i18n().co_author_network}">${i18n().co_author_network}</a></div>
             </div>
-            
+
             <div class="collaboratorship-link-separator"></div>
-            
+
   	      	<div id="mapofscience_link_container" class="collaboratorship-link-container">
-            	<div class="collaboratorship-icon">	
+            	<div class="collaboratorship-icon">
                     <a href="${mapOfScienceVisUrl}" title="${i18n().map_of_science}"><img src="${mapOfScienceIcon}" alt="${i18n().map_of_science}" width="25px" height="25px" /></a>
                 </div>
                 <div class="collaboratorship-link"><a href="${mapOfScienceVisUrl}" title="${i18n().map_of_science}">${i18n().map_of_science_capitalized}</a></div>
             </div>
-            
+
             ${scripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>',
                           '<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>',
-                          '<script type="text/javascript" src="${urls.base}/js/visualization/sparkline.js"></script>')}           
-            
+                          '<script type="text/javascript" src="${urls.base}/js/visualization/sparkline.js"></script>')}
+
             <script type="text/javascript">
                 var visualizationUrl = '${urls.base}/visualizationAjax?uri=${individual.uri?url}&template=${visRequestingTemplate!}';
                 var infoIconSrc = '${urls.images}/iconInfo.png';
             </script>
-            
+
             <#if isInvestigator>
                 <div class="collaboratorship-link-separator"></div>
             </#if>
         </#if>
-        
+
         <#if isInvestigator>
             <#assign coInvestigatorVisUrl = individual.coInvestigatorVisUrl()>
             <#assign coInvestigatorIcon = "${urls.images}/visualization/coauthorship/co_investigator_icon.png">
-            
+
             <div id="coinvestigator_link_container" class="collaboratorship-link-container">
                 <div class="collaboratorship-icon">
                     <a href="${coInvestigatorVisUrl}" title="${i18n().co_investigator_network}"><img src="${coInvestigatorIcon}" alt="${i18n().co_investigator_network}" width="25px" height="25px" /></a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
index 249b2765dc..c21c6c05a7 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
@@ -9,11 +9,11 @@
 <#assign obo_RO53 = "http://purl.obolibrary.org/obo/RO_0000053">
 
 <#assign isInvestigator = ( p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}InvestigatorRole") ||
-                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") || 
+                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") ||
                             p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}CoPrincipalInvestigatorRole") ) >
 
 <#if (isAuthor || isInvestigator)>
- 
+
     <#assign standardVisualizationURLRoot ="/visualization">
     <#assign coauthor = "">
     <#assign coinvestigator = "">
@@ -24,25 +24,25 @@
             <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/scimap_icon.png">
             <#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
             <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()>
-            
+
             <#assign coauthor = "<li><a href='${coAuthorVisUrl}' title='${i18n().co_author}' style='vertical-align:top;'><img src='${coAuthorIcon}' alt='${i18n().co_author}' width='20px' height='20px' style='padding-right:8px'/></a><a href='${coAuthorVisUrl}' title='${i18n().co_author_network}'>${i18n().co_authors_capitalized}</a></li>" >
-             
+
             <#assign mapofscience = "<li><a href='${mapOfScienceVisUrl}' title='${i18n().map_of_science}' style='vertical-align:top;'><img src='${mapOfScienceIcon} ' alt='${i18n().map_of_science}' width='20px' height='20px' style='padding-right:8px'/></a><a href='${mapOfScienceVisUrl}' title='${i18n().map_of_science}'>${i18n().map_of_science_capitalized}</a></li>" >
-                
-         </#if>   
+
+         </#if>
             <#if isInvestigator>
                 <#assign coInvestigatorVisUrl = individual.coInvestigatorVisUrl()>
                 <#assign coInvestigatorIcon = "${urls.images}/visualization/coauthorship/co_investigator_icon.png">
-                <#assign coinvestigator = "<li><a href='${coInvestigatorVisUrl}' title='${i18n().co_investigator_network}' style='vertical-align:top;'><img src='${coInvestigatorIcon}' alt='${i18n().co_investigator_network}' width='20px' height='20px' style='padding-right:8px'/></a><a href='${coInvestigatorVisUrl}' title='${i18n().co_investigator_network}'>${i18n().co_investigator_network_capitalized}</a></li>">  
+                <#assign coinvestigator = "<li><a href='${coInvestigatorVisUrl}' title='${i18n().co_investigator_network}' style='vertical-align:top;'><img src='${coInvestigatorIcon}' alt='${i18n().co_investigator_network}' width='20px' height='20px' style='padding-right:8px'/></a><a href='${coInvestigatorVisUrl}' title='${i18n().co_investigator_network}'>${i18n().co_investigator_network_capitalized}</a></li>">
             </#if>
             <ul id="individual-visualization">
                 ${coauthor}
                 ${coinvestigator}
                 ${mapofscience}
-            </ul>  
+            </ul>
             <script type="text/javascript">
                 var visualizationUrl = '${urls.base}/visualizationAjax?uri=${individual.uri?url}';
                 var infoIconSrc = '${urls.images}/iconInfo.png';
             </script>
-            
+
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl
index 3c7f7169ae..ddca275998 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl
@@ -6,21 +6,21 @@
 	<ul>
 		<li>
 			<#switch vocabularyService[0]['vocabService']>
-				<#case "AGROVOC"> 
+				<#case "AGROVOC">
 					AGROVOC (Agricultural Vocabulary)
 					<#break>
 				<#case "GEMET">
-					GEMET  (GEneral Multilingual Environmental Thesaurus) 
+					GEMET  (GEneral Multilingual Environmental Thesaurus)
 					<#break>
 				<#case "LCSH">
-					LCSH  (Library of Congress Subject Headings) 
+					LCSH  (Library of Congress Subject Headings)
 					<#break>
 				<#case "UMLS">
-					UMLS  (Unified Medical Language System) 
+					UMLS  (Unified Medical Language System)
 					<#break>
 				<#default>
 					${vocabularyService[0]['vocabService']!}
-			</#switch> 
+			</#switch>
 		</li>
 	</ul>
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl
index 2127803db1..424b3440e3 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl
@@ -3,10 +3,10 @@
 
 <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
     <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-        <#if !editable && individual.person() > 
+        <#if !editable && individual.person() >
             <ul style="font-size:0.9em;padding-bottom:4px"><li><strong>${i18n().websites}</strong></li></ul>
         </#if>
-        <@p.addLinkWithLabel webpage editable i18n().websites/> 
+        <@p.addLinkWithLabel webpage editable i18n().websites/>
         <#assign localName = webpage.localName>
         <ul id="individual-${localName}" class="individual-urls" role="list" <#if individual.organization() && !editable>style="font-size:1.15em"</#if>>
             <@p.objectProperty webpage editable />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
index 30366587d7..30daa5f556 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "advisee of". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-datetime.ftl" as dt>
 <@showAdviseeIn statement />
@@ -21,7 +21,7 @@
                 <a href="${profileUrl(statement.uri("advisor"))}" title="${i18n().advisor_label}">${statement.advisorLabel!}</a>
             </#if>
             <#if statement.degreeLabel??>
-                ${statement.degreeAbbr!statement.degreeLabel!} 
+                ${statement.degreeAbbr!statement.degreeLabel!}
                 <#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidacy},<#else>&nbsp;${i18n().candidacy}</#if>
             </#if>
         <#elseif statement.advisingRelLabel??>
@@ -29,5 +29,5 @@
         </#if>
     </#local>
 
-    ${linkedIndividual}    <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> 
+    ${linkedIndividual}    <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
  </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
index 0a8764da7d..a1863eb3d2 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "advisees". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-datetime.ftl" as dt>
 <@showAdvisorIn statement />
@@ -21,7 +21,7 @@
                 <a href="${profileUrl(statement.uri("advisee"))}" title="${i18n().advisee_label}">${statement.adviseeLabel!}</a>
             </#if>
             <#if statement.degreeLabel??>
-                ${statement.degreeAbbr!statement.degreeLabel!} 
+                ${statement.degreeAbbr!statement.degreeLabel!}
                 <#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidate},<#else>&nbsp;${i18n().candidate}</#if>
             </#if>
         <#elseif statement.advisingRelLabel??>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
index 73a7b1bf98..63c547c46f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
@@ -1,11 +1,11 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "selected publications". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
- 
+
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
index aff0edef4f..c41dc67ddb 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
@@ -12,7 +12,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAward statement>
- 
+
     <#local linkedIndividual>
         <#if statement.award??>
             <a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!}</a>
@@ -23,7 +23,7 @@
 
     <#local dateTimeVal>
         <#if statement.dateTime??>
-            <@dt.yearSpan statement.dateTime! /> 
+            <@dt.yearSpan statement.dateTime! />
         <#else>
             <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
         </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl
index f172872a4f..143d17aa92 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
@@ -12,7 +12,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAward statement>
- 
+
     <#local linkedIndividual>
         <#if statement.award??>
             <a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!}</a>
@@ -23,7 +23,7 @@
 
     <#local dateTimeVal>
         <#if statement.dateTime??>
-            <@dt.yearSpan statement.dateTime! /> 
+            <@dt.yearSpan statement.dateTime! />
         <#else>
             <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
         </#if>
@@ -35,6 +35,6 @@
         </#if>
     </#local>
 
-    <@s.join [ linkedIndividual, conferredOn!,  dateTimeVal! ] /> 
+    <@s.join [ linkedIndividual, conferredOn!,  dateTimeVal! ] />
 
  </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
index 282ead2724..e019bc3981 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#dateTimeInterval. 
-    
+<#-- Custom object property statement view for http://vivoweb.org/ontology/core#dateTimeInterval.
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-datetime.ftl" as dt>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
index ee09cd7cee..0828855db5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#dateTimeValue. 
-    
+<#-- Custom object property statement view for http://vivoweb.org/ontology/core#dateTimeValue.
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-datetime.ftl" as dt>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl
index 792c8dca24..bfad10d956 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- VIVO-specific default object property statement template. 
-    
+<#-- VIVO-specific default object property statement template.
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
 -->
 
 <#import "lib-meta-tags.ftl" as lmt>
@@ -11,7 +11,7 @@
 <@showStatement statement />
 
 <#macro showStatement statement>
-    <#-- The query retrieves a type only for Persons. Post-processing will remove all but one. --> 
+    <#-- The query retrieves a type only for Persons. Post-processing will remove all but one. -->
   	<#if statement.subclass??>
 		<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>
 	<#else>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl
index 6bcc821e40..9ab6973609 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "education and training". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -17,13 +17,13 @@
 
     <#local degree>
         <#if statement.degreeName??>
-            ${statement.degreeAbbr!statement.degreeName} 
+            ${statement.degreeAbbr!statement.degreeName}
             <#if statement.majorField??> ${i18n().in} ${statement.majorField}</#if>
         <#elseif statement.typeName??>
             ${statement.typeName!}
         </#if>
     </#local>
-    
+
     <#local linkedIndividual>
         <#if statement.degree??>
             <a href="${profileUrl(statement.uri("degree"))}" title="${i18n().degree}">${statement.degreeAbbr!statement.degreeName}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl
index e3a5685395..04246a9e95 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- VIVO-specific default data property statement template. 
-    
+<#-- VIVO-specific default data property statement template.
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-meta-tags.ftl" as lmt>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
index e347be9916..fdf2de159c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
@@ -1,11 +1,11 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "editor of". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
- 
+
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
 
@@ -92,5 +92,5 @@
         </#if>
     </#local>
 
-    ${resourceTitle} ${citationDetails} <@dt.yearSpan "${statement.dateTime!}" /> 
+    ${resourceTitle} ${citationDetails} <@dt.yearSpan "${statement.dateTime!}" />
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index bbdbf8be65..ed0784e4ba 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "education and training". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -17,13 +17,13 @@
 
     <#local degree>
         <#if statement.degreeName??>
-            ${statement.degreeAbbr!statement.degreeName} 
+            ${statement.degreeAbbr!statement.degreeName}
             <#if statement.majorField??> ${i18n().in} ${statement.majorField}</#if>
         <#elseif statement.typeName??>
             ${statement.typeName!}
         </#if>
     </#local>
-    
+
     <#local linkedIndividual>
         <#if statement.org??>
 			<#assign schemaType = "http://schema.org/Organization" />
@@ -40,6 +40,6 @@
         </#if>
     </#local>
 
-    <@s.join [ degree, linkedIndividual!, statement.deptOrSchool!, statement.info! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/> 
+    <@s.join [ degree, linkedIndividual!, statement.deptOrSchool!, statement.info! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
 
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl
index 84706bdec6..7501f9f787 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl
@@ -1,17 +1,17 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#--  
+<#--
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <@showAdditionalEmail statement />
 
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAdditionalEmail statement>
- 
+
     <#if statement.emailAddress?has_content>
             ${statement.emailAddress}
-    </#if>    
-          
+    </#if>
+
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
index df666f6dbb..e56e250772 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
@@ -1,20 +1,20 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#--  
+<#--
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <@showFullName statement />
 
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showFullName statement>
- 
+
     <#if statement.fullName?has_content>
         <#if statement.prefix??><span itemprop="honorificPrefix">${statement.prefix!}</span></#if>
         <span itemprop="givenName">${statement.firstName!}</span>
         <span itemprop="additionalName">${statement.middleName!}</span>
         <span itemprop="familyName">${statement.lastName!}</span><#if statement.suffix??>, ${statement.suffix!}</#if>
-    </#if>    
-          
+    </#if>
+
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl
index ca5c9af0ef..ae6298c3fa 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
-    
+<#--
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
@@ -12,7 +12,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAdministrator statement>
- 
+
     <#local linkedIndividual>
         <#if statement.organization??>
             <a href="${profileUrl(statement.uri("organization"))}" title="${i18n().organization_name}">${statement.organizationLabel!""}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
index a06adb1081..dac0fa01e6 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
@@ -1,18 +1,18 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#hasAssociatedConcept. 
-    
-     This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
- -->
-<@showConcept statement />
-
-<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
-     next statement -->
-<#macro showConcept statement>
-      <#if statement.vocabularySourceName??>
-          <a href="${profileUrl(statement.uri("concept"))}" title="${i18n().concept_name}">${statement.conceptLabel!statement.conceptName}</a> (${statement.vocabularySourceName})
-      <#else>
-          <a href="${profileUrl(statement.uri("concept"))}" title="${i18n().concept_name}">${statement.conceptLabel!statement.conceptName}</a> 
-      </#if>
-</#macro>
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#-- Custom object property statement view for http://vivoweb.org/ontology/core#hasAssociatedConcept.
+
+     This template must be self-contained and not rely on other variables set for the individual page, because it
+     is also used to generate the property statement during a deletion.
+ -->
+<@showConcept statement />
+
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
+     next statement -->
+<#macro showConcept statement>
+      <#if statement.vocabularySourceName??>
+          <a href="${profileUrl(statement.uri("concept"))}" title="${i18n().concept_name}">${statement.conceptLabel!statement.conceptName}</a> (${statement.vocabularySourceName})
+      <#else>
+          <a href="${profileUrl(statement.uri("concept"))}" title="${i18n().concept_name}">${statement.conceptLabel!statement.conceptName}</a>
+      </#if>
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
index 79e19be018..d92c956233 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "attended". See the PropertyConfig.n3 file for details..
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -21,11 +21,11 @@
             <a href="${profileUrl(statement.uri("role"))}" title="${i18n().missing_event}">${i18n().missing_event}</a>
         </#if>
     </#local>
-    
+
     <#local dateTime>
-       <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> 
+       <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
     </#local>
-    
+
     <#local attendedEvent>
         <#if statement.event2?has_content && statement.event2Label?has_content>
             ${i18n().at} <a href="${profileUrl(statement.uri("event2"))}" title="${i18n().event_label}">${statement.event2Label}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
index addf027cf4..560f2fdd6f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "reviewer of". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
index 7c8670cab8..1de5f55d91 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
@@ -1,10 +1,10 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Custom object property statement view for faux property "investigator on," "principal investigator on" and 
+<#-- Custom object property statement view for faux property "investigator on," "principal investigator on" and
      "co-principal investigator on." See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-datetime.ftl" as dt>
@@ -31,7 +31,7 @@
             <a href="${profileUrl(statement.uri("role"))}" title="${i18n().missing_activity}">${i18n().missing_activity}</a>
         </#if>
     </#local>
-    
+
     <#local awardOrAdminBy>
         <#if statement.awardedByLabel??>
             &nbsp;${i18n().awarded_by}&nbsp;<a href="${profileUrl(statement.uri("awardedBy"))}" title="${i18n().awarded_by}">${statement.awardedByLabel!}</a>
@@ -39,7 +39,7 @@
             &nbsp;${i18n().administered_by}&nbsp;<a href="${profileUrl(statement.uri("adminedBy"))}" title="${i18n().administered_by}">${statement.adminedByLabel!}</a>
         </#if>
     </#local>
-        
+
     <#local dateTime>
         <#if statement.dateTimeStartRole?has_content || statement.dateTimeEndRole?has_content>
             <@dt.yearIntervalSpan "${statement.dateTimeStartRole!}" "${statement.dateTimeEndRole!}" />
@@ -47,7 +47,7 @@
             <@dt.yearIntervalSpan "${statement.dateTimeStartGrant!}" "${statement.dateTimeEndGrant!}" />
         </#if>
     </#local>
-    
-    ${linkedIndividual} ${awardOrAdminBy} ${dateTime!} 
+
+    ${linkedIndividual} ${awardOrAdminBy} ${dateTime!}
 </#if>
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
index 25a4f7c18a..87f16bed73 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "presentations". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -22,11 +22,11 @@
             <a href="${profileUrl(statement.uri("role"))}" title="${i18n().missing_presentation}">${i18n().missing_presentation}</a>
         </#if>
     </#local>
-    
+
     <#local dateTime>
-        <@dt.yearSpan statement.dateTime! /> 
+        <@dt.yearSpan statement.dateTime! />
     </#local>
-    
+
     <#local conference>
         <#if statement.conference?has_content && statement.conferenceLabel?has_content>
             <a href="${profileUrl(statement.uri("conference"))}" title="${i18n().conference}">${statement.conferenceLabel}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
index 196e989467..e444c72c44 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
@@ -1,10 +1,10 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Custom object property statement view for the roleRealizedIn, roleContributesTo, researchActivities, hasRole 
+<#-- Custom object property statement view for the roleRealizedIn, roleContributesTo, researchActivities, hasRole
      and hasClinicalActivities custom list views. See those list view and the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-datetime.ftl" as dt>
@@ -31,11 +31,11 @@
             <a href="${profileUrl(statement.uri("role"))}" title="${i18n().missing_activity}">${i18n().missing_activity}</a>
         </#if>
     </#local>
-    
+
     <#local dateTime>
         <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
     </#local>
-    
-    ${linkedIndividual} ${statement.roleLabel!} ${dateTime!} 
+
+    ${linkedIndividual} ${statement.roleLabel!} ${dateTime!}
 </#if>
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
index 0c34b8adec..22ded9cc5d 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "authors". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
index 15f2b92153..840484b566 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "editors". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
index 92c6151a8b..4292cd2d86 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#credentialOrHonor. 
-    
+<#-- Custom object property statement view for http://vivoweb.org/ontology/core#credentialOrHonor.
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
@@ -12,7 +12,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showCredential statement>
- 
+
     <#local linkedIndividual>
         <#if statement.credential??>
             <a href="${profileUrl(statement.uri("credential"))}" title="${i18n().credential_name}">${statement.credentialLabel!statement.issuedCredentialLabel!statement.credentialLocal!}</a>
@@ -23,7 +23,7 @@
 
     <#local dateTimeVal>
         <#if statement.dateTime??>
-            <@dt.yearSpan statement.dateTime! /> 
+            <@dt.yearSpan statement.dateTime! />
         <#else>
             <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
         </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
index 730c51c502..90a528d48b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "mailing address". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-sequence.ftl" as s>
 <@showAddress statement />
@@ -11,7 +11,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAddress statement>
- 
+
     <#if statement.street?has_content>
         <#if statement.street?contains(";") >
             <#list statement.street?split("; ") as lines>
@@ -24,36 +24,36 @@
                 ${statement.street}
             </p>
         </#if>
-    </#if>    
+    </#if>
 
     <#if ( statement.country?has_content && (statement.country == "US" || statement.country?contains("United States") || statement.country?contains("U.S.") || statement.country?contains("U.S.A.") || statement.country?contains("USA")))>
-        <#local cityState><@s.join [statement.locality!, statement.region!], ", " /></#local>                      
+        <#local cityState><@s.join [statement.locality!, statement.region!], ", " /></#local>
         <#local cityStateZip><@s.join [ cityState!, statement.postalCode!], "&nbsp;" /></#local>
         <#if cityStateZip?has_content>
             <p class="address-line">${cityStateZip}</p>
             <p class="address-line" style="float:left; padding-right:20px">${statement.country!}</p>
      	</#if>
-    <#else>        
+    <#else>
         <#if statement.locality?has_content>
             <p class="address-line">
                 ${statement.locality}
             </p>
-        </#if>    
+        </#if>
         <#if statement.region?has_content>
             <p class="address-line">
                 ${statement.region}
             </p>
-        </#if>    
+        </#if>
         <#if statement.postalCode?has_content>
-            <p class="address-line">   
+            <p class="address-line">
                 ${statement.postalCode}
             </p>
-        </#if>    
+        </#if>
         <#if statement.country?has_content>
             <p class="address-line" style="float:left; padding-right:20px">
                 ${statement.country}
             </p>
         </#if>
     </#if>
-          
+
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
index 6b4f57bdc7..677706c7fe 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- VIVO-specific default data property statement template. 
-    
+<#-- VIVO-specific default data property statement template.
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <@showStatement statement />
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl
index a6f1a86aec..0c3784eb72 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
-    
+<#--
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
@@ -12,7 +12,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAdministeredGrant statement>
- 
+
     <#local linkedIndividual>
         <#if statement.grant??>
             <a href="${profileUrl(statement.uri("grant"))}" title="${i18n().grant_name}">${statement.grantLabel!""}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl
index 7c62456324..1da00e4053 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl
@@ -1,16 +1,16 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
-    
+<#--
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <@showAwardsGrant statement />
 
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAwardsGrant statement>
- 
+
     <#local linkedIndividual>
         <#if statement.grantOrContract??>
             <a href="${profileUrl(statement.uri("grantOrContract"))}" title="${i18n().grant_name}">${statement.label!""}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
index 79965aa248..1b1c757d1c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "people". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -22,7 +22,7 @@
         }
         $('span.hideThis').parent().remove();
     </script>
-<#else>    
+<#else>
     <#local linkedIndividual>
         <#if statement.person??>
             <a href="${profileUrl(statement.uri("person"))}" title="${i18n().person_name}">${statement.personName}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
index b543f61b86..52a1943d85 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "organization for training". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -13,7 +13,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showTraining statement>
-    
+
     <#local linkedIndividual>
         <#if statement.person??>
             <a href="${profileUrl(statement.uri("person"))}" title="${i18n().person_name}">${statement.personName}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
index 0fc864d47c..a8cae35115 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "positions". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -14,7 +14,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showPosition statement>
-    
+
     <#local posTitle>
         <span itemprop="jobTitle">${statement.positionTitle!statement.hrJobTitle!}</span>
     </#local>
@@ -37,7 +37,7 @@
             </span>
         </#if>
     </#local>
-    
+
     <@s.join [ posTitle, linkedIndividual, middleOrganization! ]/>  <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
 
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl
index 653e4acd0c..9d374ad7c9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl
@@ -1,17 +1,17 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#--  
+<#--
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <@showTelephone statement />
 
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showTelephone statement>
- 
+
     <#if statement.number?has_content>
             ${statement.number}
-    </#if>    
-          
+    </#if>
+
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl
index 420e910814..ba1474e473 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl
@@ -1,15 +1,15 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#--  
+<#--
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <@showPreferredTitle statement />
 
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showPreferredTitle statement>
- 
+
      ${statement.preferredTitle!}
-          
+
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl
index ee701d63de..d524154f01 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl
@@ -1,11 +1,11 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "editor of". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
- 
+
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
 
@@ -45,5 +45,5 @@
         </#if>
     </#local>
 
-    ${resourceTitle} ${citationDetails!} <@dt.yearSpan "${statement.dateTime!}" /> 
+    ${resourceTitle} ${citationDetails!} <@dt.yearSpan "${statement.dateTime!}" />
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl
index f2cebe2a77..f9955b7695 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl
@@ -1,11 +1,11 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Custom object property statement view for faux property "editor of". See the PropertyConfig.n3 file for details.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
- 
+
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
 
@@ -90,5 +90,5 @@
         </#if>
     </#local>
 
-    ${resourceTitle} ${citationDetails} <@dt.yearSpan "${statement.dateTime!}" /> 
+    ${resourceTitle} ${citationDetails} <@dt.yearSpan "${statement.dateTime!}" />
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
index 820345cdd1..d07da7d106 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
@@ -1,8 +1,8 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
@@ -13,7 +13,7 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showRole statement property >
-  
+
     <#local linkedIndividual>
         <#if statement.indivInRole??>
     		<#if statement.vSubclass?? && statement.vSubclass?contains("vcard")>
@@ -31,12 +31,12 @@
         </#if>
     </#local>
 
-    <#-- 
+    <#--
          Generally roles are assigned a label when entered through a custom form. Investigator and its subclasses do not,
          so use the type label instead if not collated by subclass.
     -->
     <#local roleLabel>
-       
+
         <#if statement.roleTypeLabel?has_content>
             <#assign roleTypeLabel = statement.roleTypeLabel!"" >
 		<#else>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
index 1e012ef70d..9072761d21 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
@@ -1,8 +1,8 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#--     
+<#--
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#import "lib-sequence.ftl" as s>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
index b2654c1859..6b9c3f0d2d 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- VIVO-specific default data property statement template. 
-    
+<#-- VIVO-specific default data property statement template.
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 <@showStatement statement />
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
index c1132d09ba..e72cf418c6 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- "Quick view" template for core:webpage 
-    
+<#-- "Quick view" template for core:webpage
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
 -->
 
 <#--  *** Use of the quick view template requires that a web service provide snap shots of the web sites that  ***
@@ -12,13 +12,13 @@
       *** element that contains the web page snap shot, as shown below in the template. Note that this code is ***
       *** currently commented out and a placeholder is displayed instead.                                      ***
 -->
-<#assign count = property.statements?size!> 
+<#assign count = property.statements?size!>
 
 <#assign identifier>
     <#if statement.url?has_content>${statement.url?replace("[^\\p{L}\\p{N}]","","r")}<#t>
     <#else>
         "noUrl"<#t>
-    </#if>    
+    </#if>
 </#assign>
 
 
@@ -28,7 +28,7 @@
 <#local linkText>
     <#if statement.label?has_content>${statement.label}<#t>
     <#elseif statement.url?has_content>${statement.url}<#t>
-    </#if>    
+    </#if>
 </#local>
 <#local imgSize = "&thumbnail=true" >
 
@@ -37,10 +37,10 @@
 </#if>
 <#if statement.url?has_content>
 
-<#-- This section commented out until the web service for the web page snapshot is implemented. 
+<#-- This section commented out until the web service for the web page snapshot is implemented.
       The assumption is made that the service will require the url of the web page and possibly
       an image size as well.
-      
+
 <span id="span-${identifier}" class="webpage-indicator-qv">${strings.loading_website_image}. . .&nbsp;&nbsp;&nbsp;<img  src="${urls.images}/indicatorWhite.gif"></span>
         <a title="${i18n().click_to_view_web_page(linkText)}" href="${statement.url}">
             <img id="img-${identifier}" class="org-webThumbnail" src="http://your.web.service/getsTheImage?url=${statement.url}${imgSize}" alt="${i18n().screenshot_of_webpage(statement.url)}" style="display:none"/>
@@ -48,15 +48,15 @@
         </a>
         <#if imgSize == "" >
             </li>
-            <li class="weblinkLarge">  
+            <li class="weblinkLarge">
             <a title="${i18n().click_to_view_web_page(linkText)}" href="${statement.url}">
-                <img id="icon-${identifier}" src="${urls.images}/individual/weblinkIconLarge.png"  alt="${i18n().click_webpage_icon}" style="display:none"/>  
+                <img id="icon-${identifier}" src="${urls.images}/individual/weblinkIconLarge.png"  alt="${i18n().click_webpage_icon}" style="display:none"/>
             </a>
         <#else>
             </li>
-            <li class="weblinkSmall">  
+            <li class="weblinkSmall">
             <a title="${i18n().click_to_view_web_page(linkText)}" href="${statement.url}">
-                <img id="icon-${identifier}" src="${urls.images}/individual/weblinkIconSmall.png"  alt="${i18n().click_webpage_icon}" style="display:none"/>  
+                <img id="icon-${identifier}" src="${urls.images}/individual/weblinkIconSmall.png"  alt="${i18n().click_webpage_icon}" style="display:none"/>
             </a>
         </#if>
 -->
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
index caced2b2d6..64fb8fa1e4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
@@ -1,20 +1,20 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Template for core:webpage.
-    
+
      This template must be self-contained and not rely on other variables set for the individual page, because it
-     is also used to generate the property statement during a deletion.  
+     is also used to generate the property statement during a deletion.
  -->
 
 <#assign linkText>
     <#if statement.label?has_content>${statement.label}<#t>
     <#elseif statement.url?has_content>${statement.url}<#t>
-    </#if>    
+    </#if>
 </#assign>
 
 
 <#if statement.url?has_content>
-    <a href="${statement.url}" title="${i18n().link_text}">${linkText}</a> 
+    <a href="${statement.url}" title="${i18n().link_text}">${linkText}</a>
 <#else>
     <a href="${profileUrl(statement.uri("link"))}" title="${i18n().link_name}">${statement.linkName}</a> (${i18n().no_url_provided})
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl
index fdb717bbe2..34949b3629 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl
@@ -4,6 +4,6 @@
 Results from ${siteName} for ${querytext} on ${todayDate}
 
 Name, Title, Email, URI, VIVO Profile URL
-<#list individuals as individual>                 
+<#list individuals as individual>
 "${individual.name}",<#if individual.preferredTitle?has_content>"${individual.preferredTitle}"</#if>,<#if individual.email?has_content>"${individual.email}"</#if>,"${individual.uri}","${individual.profileUrl}"
 </#list>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl
index 95993fb174..9bb05df774 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl
@@ -6,13 +6,13 @@
     <str name="q">${querytext?xml}</str>
     <#if nextPage??>
       <str name="nextPage">${nextPage?xml}</str>
-    </#if>   
+    </#if>
   </lst>
-  
+
   <result name="response" numFound="${hitCount}" start="${startIndex}" >
-    <#list individuals as individual>                 
+    <#list individuals as individual>
         <doc>
-          <str name="uri">${individual.uri?xml}</str>                      
+          <str name="uri">${individual.uri?xml}</str>
           <str name="name">${individual.name?xml}</str>
           <#if individual.preferredTitle?has_content>
           <str name="title">${individual.preferredTitle?xml}</str>
@@ -24,5 +24,5 @@
         </doc>
     </#list>
   </result>
-  
+
 </response>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index b1a2c8a909..32e4770179 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -13,7 +13,7 @@
 
 
 <h2>${i18n().manage_concepts}</h2>
-    
+
 
 <#if submissionErrors?has_content>
     <section id="error-alert" role="alert">
@@ -23,8 +23,8 @@
         <#list submissionErrors?keys as errorFieldName>
         	${errorFieldName} :  ${submissionErrors[errorFieldName]}
         </#list>
-       
-        
+
+
         </p>
     </section>
 </#if>
@@ -33,10 +33,10 @@
 
 <div class="noIE67">
 
-    
-    
+
+
 <ul id="existingConcepts">
-      
+
     <script type="text/javascript">
         var existingConceptsData = [];
     </script>
@@ -58,7 +58,7 @@
              </div>
     	 </li>
     </#if>
-    
+
     <#list existingConcepts as existingConcept>
         <li class="existingConcept conceptsListContainer">
             <div class="container">
@@ -84,31 +84,31 @@
                     </div>
                 </div>
             </div>
-        </li>    
-        
+        </li>
+
         <script type="text/javascript">
             existingConceptsData.push({
                 "conceptNodeUri": "${existingConcept.conceptURI}",
-                "conceptLabel": "${existingConcept.conceptLabel}"      
+                "conceptLabel": "${existingConcept.conceptLabel}"
             });
-        </script>         
+        </script>
 
-      </#list>    
+      </#list>
 
 </ul>
-       
 
-<#if (existingConcepts?size = 0) >   
+
+<#if (existingConcepts?size = 0) >
         <p>${i18n().no_concepts_specified}</p>
 <#else>
         &nbsp;
 </#if>
 
 <div id="showAddForm">
-    
-    <input type="submit" value="${i18n().add_concept}" id="showAddFormButton" name="showAddFormButton">  ${i18n().or} 
+
+    <input type="submit" value="${i18n().add_concept}" id="showAddFormButton" name="showAddFormButton">  ${i18n().or}
     <a class="cancel" href="${cancelUrl}&url=/individual" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
-</div> 
+</div>
     <form id="addConceptForm" class="customForm" action="${submitUrl}">
 		<#assign checkedSource = false />
 	<h4 class="services">${i18n().external_vocabulary_services}</h4>
@@ -133,9 +133,9 @@
     </div>
     <div id="selectedConcept" name="selectedConcept" class="acSelection">
         <p class="inline">
-         
+
         </p>
-        
+
         <!-- Search results populated by JavaScript -->
     </div>
     <div id="showHideResults" name="showHideResults">
@@ -143,16 +143,16 @@
     	&nbsp;</a>
     </div>
     <div id="errors" name="errors"></div>
-    
+
     <input type="hidden" name="editKey" id="editKey" value="${editKey}"/>
     <p class="submit">
         <input type="submit" id="submit" name="submit" value="${i18n().add_selected_concept}" />
-        
+
     </p>
     <div id="createOwnTwo"><br />
         <a href="${userDefinedConceptUrl}" > ${i18n().cannot_find_concept}</a>
-        
-    </div>	
+
+    </div>
         <p>
             <span class="or"> ${i18n().or} </span><a class="cancel" href="${cancelUrl}&url=/individual" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
         </p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
index 9fb2ad224b..46cf53be66 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
@@ -1,32 +1,32 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#--Two stage form for service provider role-->
-
-<#--
-Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
-roleDescriptor.
-The other required values (roleType, optionsType, objectClassUri, and literalOptions are
-set in the JAVA class corresponding to the form, e.g. AddAttendeeRoleToPersonGenerator.java.
-
-Optional values can be set, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-showRoleLAbelField
-roleExamples-->
-
-
-<#--Variable assignments-->
-<#assign roleDescriptor = "${i18n().attended}" />
-<#assign typeSelectorLabel = "${i18n().event_type}" />
-<#assign genericLabel = "${i18n().event_capitalized}" />
-<#assign acMultipleTypes = "'true'" />
-<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}" />
-
-<#assign editTitle = "${i18n().edit_entry_for_attendee_role}"/>
-
-<#assign createTitle = "${i18n().create_entry_for_attendee_role}"/>
-
-<#include "addRoleToPersonTwoStage.ftl">
-
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#--Two stage form for service provider role-->
+
+<#--
+Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
+roleDescriptor.
+The other required values (roleType, optionsType, objectClassUri, and literalOptions are
+set in the JAVA class corresponding to the form, e.g. AddAttendeeRoleToPersonGenerator.java.
+
+Optional values can be set, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+showRoleLAbelField
+roleExamples-->
+
+
+<#--Variable assignments-->
+<#assign roleDescriptor = "${i18n().attended}" />
+<#assign typeSelectorLabel = "${i18n().event_type}" />
+<#assign genericLabel = "${i18n().event_capitalized}" />
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}" />
+
+<#assign editTitle = "${i18n().edit_entry_for_attendee_role}"/>
+
+<#assign createTitle = "${i18n().create_entry_for_attendee_role}"/>
+
+<#include "addRoleToPersonTwoStage.ftl">
+
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
index 077cda468d..a75408a236 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
@@ -44,7 +44,7 @@
         <#list submissionErrors?keys as errorFieldName>
         		  ${submissionErrors[errorFieldName]} <br/>
         </#list>
-        
+
         </p>
     </section>
 </#if>
@@ -66,14 +66,14 @@
 
 	<li class="authorship">
 			<#-- span.author will be used in the next phase, when we display a message that the author has been
-			removed. That text will replace the a.authorName, which will be removed. -->    
+			removed. That text will replace the a.authorName, which will be removed. -->
 			<span class="authorship">
 					<#-- This span is here to assign a width to. We can't assign directly to the a.authorName,
 					for the case when it's followed by an em tag - we want the width to apply to the whole thing. -->
 					<span class="itemName">
 							<#if (authorUri?length > 0)>
 									<span class="authorName">${authorName}</span>
-								<#else>      
+								<#else>
 									<span class="authorName">${authorship.authorshipName}</span><em> (${i18n().no_linked_author})</em>
 							</#if>
 					</span>
@@ -86,12 +86,12 @@
 			authorshipData.push({
 					"authorshipUri": "${authorship.authorshipUri}",
 					"authorUri": "${authorUri}",
-					"authorName": "${authorName}"                
+					"authorName": "${authorName}"
 			});
 	</script>
 </#list>
 
-   
+
 
 </ul>
 
@@ -102,7 +102,7 @@
     <span class="or"> ${i18n().or} </span>
     <a id="returnLink" class="cancel" href="${cancelUrl}&url=/individual" title="${i18n().cancel_title}">${i18n().return_to_publication}</a>
     <img id="indicatorOne" class="indicator hidden" alt="${i18n().processing_indicator}" src="${urls.base}/images/indicatorWhite.gif" />
-</section> 
+</section>
 
 <form id="addAuthorForm" action ="${submitUrl}" class="customForm noIE67">
     <h3>${i18n().add_an_author}</h3>
@@ -121,17 +121,17 @@
         <label for="lastName">${i18n().last_name} <span class='requiredHint'> *</span></label>
         <input class="acSelector" size="35"  type="text" id="lastName" name="lastName" value="${lastNameValue}" role="input" />
         </p>
-				
+
 				<p class="inline">
         <label for="firstName">${i18n().first_name} ${requiredHint} ${initialHint}</label>
         <input  size="20"  type="text" id="firstName" name="firstName" value="${firstNameValue}"  role="input" />
         </p>
-        
+
 				<p class="inline">
 				<label for="middleName">${i18n().middle_name} <span class='hint'>(${i18n().initial_okay})</span></label>
         <input  size="20"  type="text" id="middleName" name="middleName" value="${middleNameValue}"  role="input" />
         </p>
-      
+
         <div id="selectedAuthor" class="acSelection">
             <p class="inline">
                 <label>${i18n().selected_author}:&nbsp;</label>
@@ -146,7 +146,7 @@
         <label for="orgName">${i18n().organization_name_capitalized} <span class='requiredHint'> *</span></label>
         <input size="38"  type="text" id="orgName" name="orgName" value="${orgNameValue}" role="input" />
         </p>
-				      
+
         <div id="selectedOrg" class="acSelection">
             <p class="inline">
                 <label>${i18n().selected_organization}:&nbsp;</label>
@@ -161,13 +161,13 @@
 
 
         <input type="hidden" name="rank" id="rank" value="${newRank}" role="input" />
-    
+
         <p class="submit">
             <input type="hidden" name = "editKey" value="${editKey}" role="input" />
             <input type="submit" id="submit" value="${i18n().add_author}" role="button" role="input" />
-            
+
             <span class="or"> ${i18n().or} </span>
-            
+
             <a id="returnLink" class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
             <img id="indicatorTwo" alt="${i18n().processing_indicator}" class="indicator hidden" src="${urls.base}/images/indicatorWhite.gif" />
         </p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
index c5a137c679..98bc000f5e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
@@ -15,7 +15,7 @@ typeSelectorLabel
 numDateFields
 roleExamples
 
-Optional values set in JAVA include 
+Optional values set in JAVA include
 ShowRoleLabelField
 ActivityToRolePredicate
 RoleToActivityPredicate
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
index 59efe227f1..ae71bbb00e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
@@ -1,14 +1,14 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 <#--Assign variables from editConfig-->
 <#assign rangeOptions = editConfiguration.pageData.objectVar />
-<#-- 
-<#assign rangeOptionsExist = false /> 
+<#--
+<#assign rangeOptionsExist = false />
 <#if (rangeOptions?keys?size > 0)>
 	<#assign rangeOptionsExist = true/>
 </#if>
  -->
- 
-<#assign rangeOptionsExist = true /> 
+
+<#assign rangeOptionsExist = true />
 
 <#assign objectTypes = editConfiguration.pageData.objectTypes />
 <#assign objectTypesSize = objectTypes?length />
@@ -54,35 +54,35 @@
             <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
             <#if editConfiguration.propertyPublicDescription?has_content>
                 <p>${editConfiguration.propertyPublicDescription}</p>
-             </#if>     
-             
-            <#---This section should become autocomplete instead--> 
+             </#if>
+
+            <#---This section should become autocomplete instead-->
             <p>
 				<label for="object"> ${propertyNameForDisplay?capitalize} ${i18n().name_capitalized}<span class='requiredHint'> *</span></label>
 				<input class="acSelector" size="50"  type="text" id="object" name="objectLabel" acGroupName="object" value="${objectLabel}" />
 			</p>
-								
-			<div class="acSelection" acGroupName="object" > 
+
+			<div class="acSelection" acGroupName="object" >
 				<p class="inline">
-					<label>${i18n().selected}:</label> 
+					<label>${i18n().selected}:</label>
 					<span class="acSelectionInfo"></span>
-					<a href="" class="verifyMatch"  title="${i18n().verify_this_match}">(${i18n().verify_this_match}</a> ${i18n().or} 
+					<a href="" class="verifyMatch"  title="${i18n().verify_this_match}">(${i18n().verify_this_match}</a> ${i18n().or}
                     <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
                 </p>
                 <input class="acUriReceiver" type="hidden" id="objectVar" name="objectVar" value="${selectedObjectUri}" />
 			</div>
 
             <#--The above section should be autocomplete-->
-            
+
             <p>
                 <input type="submit" id="submit" value="${submitButtonText}" role="button" disabled="disabled"/>
-           
+
                 <span class="or"> or </span>
                 <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
             </p>
         </form>
     <#else>
-        <p> ${i18n().there_are_no_entries_for_selection}  </p>  
+        <p> ${i18n().there_are_no_entries_for_selection}  </p>
     </#if>
 </#if>
 <p>&nbsp;</p>
@@ -105,7 +105,7 @@
 <#--Passing in object types only if there are any types returned, otherwise
 the parameter should not be passed at all to the search.
 Also multiple types parameter set to true only if more than one type returned-->
-    <script type="text/javascript">	
+    <script type="text/javascript">
     var customFormData  = {
         acUrl: '${urls.base}/autocomplete?tokenize=true',
         <#if objectTypesExist = true>
@@ -141,5 +141,5 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
 
  ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',             
+              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
               '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl
index f85fa193fa..f6b34efa99 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl
@@ -1,35 +1,35 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 <#--Overriding default form here to allow just concepts to show in the list-->
-	 
+
 	 <#if rangeOptionsExist  = true >
 	        <p>${i18n().no_appropriate_entry}:</p>
 	 <#else>
-	        <p>${i18n().create_new_entry}</p>           
+	        <p>${i18n().create_new_entry}</p>
 	 </#if>
-	 
+
 	 <#if editConfiguration.objectUri?has_content>
 	    <#assign objectUri = editConfiguration.objectUri>
 	 <#else>
 	    <#assign objectUri = ""/>
 	 </#if>
-	 
+
 	<#assign typesList = editConfiguration.pageData.createNewTypes/>
-	<form class="editForm" action="${editConfiguration.mainEditUrl}" role="input" />        
-	    <input type="hidden" value="${editConfiguration.subjectUri}" name="subjectUri" role="input" />  
-	    <input type="hidden" value="${editConfiguration.predicateUri}" name="predicateUri" role="input" />  
-	    <input type="hidden" value="${objectUri}" name="objectUri" role="input" />      
-	    <input type="hidden" value="create" name="cmd" role="input" />     
-	        
+	<form class="editForm" action="${editConfiguration.mainEditUrl}" role="input" />
+	    <input type="hidden" value="${editConfiguration.subjectUri}" name="subjectUri" role="input" />
+	    <input type="hidden" value="${editConfiguration.predicateUri}" name="predicateUri" role="input" />
+	    <input type="hidden" value="${objectUri}" name="objectUri" role="input" />
+	    <input type="hidden" value="create" name="cmd" role="input" />
+
 	    <select id="typeOfNew" name="typeOfNew" role="selection">
 	    <#assign typeKeys = typesList?keys />
 	    <#list typeKeys as typeKey>
 	        <option value="${typeKey}" role="option"> ${typesList[typeKey]} </option>
 	    </#list>
 	    </select>
-	    
-	    <input type="submit" id="offerCreate" class="submit"  value="${i18n().add_new_of_type}" role="button" />  
+
+	    <input type="submit" id="offerCreate" class="submit"  value="${i18n().add_new_of_type}" role="button" />
 	    <#if rangeOptionsExist  = false >
 	        <span class="or"> ${i18n().or} </span>
 	        <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
 	    </#if>
-	</form>          
+	</form>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl
index 1443f1f500..215ed262fd 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl
@@ -16,13 +16,13 @@
             <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
             <#if editConfiguration.propertyPublicDescription?has_content>
                 <p>${editConfiguration.propertyPublicDescription}</p>
-             </#if>     
+             </#if>
             <select id="objectVar" name="objectVar" role="select">
                 <#list rangeOptionKeys as key>
                  <option value="${key}" <#if editConfiguration.objectUri?has_content && editConfiguration.objectUri = key>selected</#if> role="option">${rangeOptions[key]}</option>
                 </#list>
             </select>
-            
+
             <p>
                 <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button "/>
                 <span class="or"> ${i18n().or} </span>
@@ -30,12 +30,12 @@
             </p>
         </form>
     <#else>
-        <p> ${i18n().there_are_no_entries_for_selection}  </p>  
+        <p> ${i18n().there_are_no_entries_for_selection}  </p>
     </#if>
 </#if>
 
 <#if editConfiguration.propertyOfferCreateNewOption = true>
-<#include "addConceptThroughObjectPropertyCreateNew.ftl">      
+<#include "addConceptThroughObjectPropertyCreateNew.ftl">
 </#if>
 
 <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl
index 2c5c69427c..95ddffe6b0 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl
@@ -22,8 +22,8 @@
     <#assign editMode = "add">
 </#if>
 
-<#if editMode == "edit">        
-        <#assign titleVerb="${i18n().edit_wbpage_of}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_wbpage_of}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
@@ -39,14 +39,14 @@
 <#if submissionErrors??>
 <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
-        <p>       
+        <p>
         <#list submissionErrors?keys as errorFieldName>
-            ${errorFieldName}: ${submissionErrors[errorFieldName]}  <br/>           
+            ${errorFieldName}: ${submissionErrors[errorFieldName]}  <br/>
         </#list>
         </p>
 </section>
-</#if>    
-    
+</#if>
+
 <form class="customForm" action ="${submitUrl}">
 	<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}">
 	<input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}">
@@ -54,7 +54,7 @@
     <label for="urlType">${i18n().url_type}${requiredHint}</label>
     <#assign urlTypeOpts = editConfiguration.pageData.urlType />
     <select name="urlType" style="margin-top:-2px" >
-        <#list urlTypeOpts?keys as key>             
+        <#list urlTypeOpts?keys as key>
             <option value="${key}"  <#if editMode == "add" && urlTypeOpts[key] == "Other">selected<#elseif urlTypeValue == key>selected</#if> >
                 <#if urlTypeOpts[key] == "F1000 Link">
                     ${i18n().faculty_of_1000}
@@ -63,24 +63,24 @@
                 <#else>
                     ${urlTypeOpts[key]}
                 </#if>
-            </option>         
+            </option>
         </#list>
     </select>
     <label for="url">URL ${requiredHint}</label>
     <input  size="70"  type="text" id="url" name="url" value="${url}" role="input" />
-   
+
     <label for="label">${i18n().webpage_name}</label>
     <input  size="70"  type="text" id="label" name="label" value="${label?html}" role="input" />
 
     <#if editMode="add">
         <input type="hidden" name="rank" value="${newRank}" />
     </#if>
-    
+
     <input type="hidden" id="editKey" name="editKey" value="${editConfiguration.editKey}"/>
     <p class="submit">
         <input type="submit" id="submit" value="${submitButtonText}"/><span class="or"> ${i18n().or} </span>
         <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
-    </p>    
+    </p>
 </form>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
index 265823b126..0f519adc43 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
@@ -1,33 +1,33 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#--Two stage form for service provider role-->
-
-<#--
-Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
-roleDescriptor.
-The other required values (roleType, optionsType, objectClassUri, and literalOptions are
-set in the JAVA class corresponding to the form, e.g. AddEditorRoleToPersonGenerator.java.
-
-Optional values can be set, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-showRoleLAbelField
-roleExamples-->
-
-
-<#--Variable assignments for Add Clinical Role To Person-->
-<#assign roleDescriptor = "${i18n().collection_series_editor_role}" />
-<#assign typeSelectorLabel = "${i18n().editor_role_in}" />
-<#assign genericLabel = "Collection or Series" />
-
-<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Collection'}" />
-
-
-<#assign editTitle = "${i18n().edit_entry_for_editor_role}"/>
-
-<#assign createTitle = "${i18n().create_entry_for_editor_role}"/>
-
-<#--Each of the two stage forms will include the form below-->
-<#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#--Two stage form for service provider role-->
+
+<#--
+Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
+roleDescriptor.
+The other required values (roleType, optionsType, objectClassUri, and literalOptions are
+set in the JAVA class corresponding to the form, e.g. AddEditorRoleToPersonGenerator.java.
+
+Optional values can be set, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+showRoleLAbelField
+roleExamples-->
+
+
+<#--Variable assignments for Add Clinical Role To Person-->
+<#assign roleDescriptor = "${i18n().collection_series_editor_role}" />
+<#assign typeSelectorLabel = "${i18n().editor_role_in}" />
+<#assign genericLabel = "Collection or Series" />
+
+<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Collection'}" />
+
+
+<#assign editTitle = "${i18n().edit_entry_for_editor_role}"/>
+
+<#assign createTitle = "${i18n().create_entry_for_editor_role}"/>
+
+<#--Each of the two stage forms will include the form below-->
+<#include "addRoleToPersonTwoStage.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl
index 344242b9d8..f271b2b998 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl
@@ -41,7 +41,7 @@
         <#list submissionErrors?keys as errorFieldName>
         		  ${submissionErrors[errorFieldName]} <br/>
         </#list>
-        
+
         </p>
     </section>
 </#if>
@@ -63,14 +63,14 @@
 
 	<li class="editorship">
 			<#-- span.editor will be used in the next phase, when we display a message that the editor has been
-			removed. That text will replace the a.editorName, which will be removed. -->    
+			removed. That text will replace the a.editorName, which will be removed. -->
 			<span class="editor">
 					<#-- This span is here to assign a width to. We can't assign directly to the a.editorName,
 					for the case when it's followed by an em tag - we want the width to apply to the whole thing. -->
 					<span class="itemName">
 							<#if (editorUri?length > 0)>
 									<span class="editorName">${editorName}</span>
-								<#else>      
+								<#else>
 									<span class="editorName">${editorship.editorshipName}</span><em> (${i18n().no_linked_editor})</em>
 							</#if>
 					</span>
@@ -83,7 +83,7 @@
 			editorshipData.push({
 					"editorshipUri": "${editorship.editorshipUri}",
 					"editorUri": "${editorUri}",
-					"editorName": "${editorName}"                
+					"editorName": "${editorName}"
 			});
 	</script>
 </#list>
@@ -96,7 +96,7 @@
     <span class="or"> ${i18n().or} </span>
     <a id="returnLink" class="cancel" href="${cancelUrl}&url=/individual" title="${i18n().cancel_title}">${i18n().return_to_publication}</a>
     <img id="indicatorOne" class="indicator hidden" alt="${i18n().processing_indicator}" src="${urls.base}/images/indicatorWhite.gif" />
-</section> 
+</section>
 
 <form id="addEditorForm" action ="${submitUrl}" class="customForm noIE67">
     <h3>${i18n().add_an_editor}</h3>
@@ -108,17 +108,17 @@
         <label for="lastName">${i18n().last_name} <span class='requiredHint'> *</span></label>
         <input class="acSelector" size="35"  type="text" id="lastName" name="lastName" value="${lastNameValue}" role="input" />
         </p>
-				
+
 				<p class="inline">
         <label for="firstName">${i18n().first_name} ${requiredHint} ${initialHint}</label>
         <input  size="20"  type="text" id="firstName" name="firstName" value="${firstNameValue}"  role="input" />
         </p>
-        
+
 				<p class="inline">
 				<label for="middleName">${i18n().middle_name} <span class='hint'>(${i18n().initial_okay})</span></label>
         <input  size="20"  type="text" id="middleName" name="middleName" value="${middleNameValue}"  role="input" />
         </p>
-      
+
         <div id="selectedEditor" class="acSelection">
             <p class="inline">
                 <label>${i18n().selected_editor}:&nbsp;</label>
@@ -133,13 +133,13 @@
 
 
         <input type="hidden" name="rank" id="rank" value="${newRank}" role="input" />
-    
+
         <p class="submit">
             <input type="hidden" name = "editKey" value="${editKey}" role="input" />
             <input type="submit" id="submit" value="${i18n().add_editor}" role="button" role="input" />
-            
+
             <span class="or"> ${i18n().or} </span>
-            
+
             <a id="returnLink" class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
             <img id="indicatorTwo" alt="${i18n().processing_indicator}" class="indicator hidden" src="${urls.base}/images/indicatorWhite.gif" />
         </p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
index 88c9ac760c..8758ecb45c 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
@@ -36,12 +36,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit" || editMode == "repair">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit" || editMode == "repair">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -73,45 +73,45 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="addEditorshipToPerson" role="region">
 
-<section id="addEditorshipToPerson" role="region">        
-    
     <form id="addEditorshipToPerson" class="customForm noIE67" action="${submitUrl}"  role="add/edit editorship">
 
-    
-    <p class="inline">    
+
+    <p class="inline">
         <label for="orgType">${i18n().document_type_capitalized} ${requiredHint}</label>
         <#assign docTypeOpts = editConfiguration.pageData.documentType />
         <select id="typeSelector" name="documentType" acGroupName="document">
-            <option value="" selected="selected">${i18n().select_one}</option>                
-            <#list docTypeOpts?keys as key>             
+            <option value="" selected="selected">${i18n().select_one}</option>
+            <#list docTypeOpts?keys as key>
                 <#if documentTypeValue = key>
-                    <option value="${key}"  selected >${docTypeOpts[key]}</option>     
+                    <option value="${key}"  selected >${docTypeOpts[key]}</option>
                 <#else>
                     <option value="${key}">${docTypeOpts[key]}</option>
                 </#if>
             </#list>
         </select>
-    </p>     
-    
+    </p>
+
     <p>
         <label for="relatedIndLabel">${i18n().document_name_capitalized} ${requiredHint}</label>
         <input class="acSelector" size="50"  type="text" id="relatedIndLabel" name="documentLabel" acGroupName="document" value="${documentLabelValue}"  />
         <input class="display" type="hidden" id="documentDisplay" acGroupName="document" name="documentLabelDisplay" value="${documentLabelDisplayValue}">
     </p>
-        
+
     <div class="acSelection" acGroupName="document">
         <p class="inline">
             <label>${i18n().selected_document}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="documentUri" name="existingDocument" value="${existingDocumentValue}" ${flagClearLabelForExisting}="true" />
     </div>
-    
-                                    
+
+
   	<#--End draw elements-->
     <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
     <p class="submit">
@@ -144,7 +144,7 @@ var i18nStrings = {
 </script>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl
index 459ed48399..6a5b4b4165 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl
@@ -28,12 +28,12 @@
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${titleVerb}" + " ${i18n().full_name}">
         <#assign disabledVal=""/>
 </#if>
@@ -50,18 +50,18 @@
             <#--Checking if any required fields are empty-->
             <#if lvf.submissionErrorExists(editSubmission, "firstName")>
  	            ${i18n().enter_first_name}<br />
-            </#if>        
+            </#if>
             <#if lvf.submissionErrorExists(editSubmission, "lastName")>
  	            ${i18n().enter_last_name}<br />
-            </#if>        
+            </#if>
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="addFullNameToPerson" role="region">
 
-<section id="addFullNameToPerson" role="region">        
-    
     <form id="addFullNameToPerson" class="customForm noIE67" action="${submitUrl}"  role="add/edit name">
 
         <p>
@@ -93,7 +93,7 @@
     </form>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
index 8245ce41ea..b26ae445e1 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
@@ -67,7 +67,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 <#assign yearHint     = "<span class='hint'>(${i18n().year_hint_format})</span>" />
 
 <#if editMode = "error">
- <div>${i18n().unable_to_handle_position_editing}</div>      
+ <div>${i18n().unable_to_handle_position_editing}</div>
 <#else>
 
 <h2>${formHeading} ${editConfiguration.subjectName}</h2>
@@ -102,18 +102,18 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
          <#if lvf.submissionErrorExists(editSubmission, "grantLabel")>
  	        ${i18n().enter_or_select_grant}
         </#if>
-        
+
         </p>
     </section>
 </#if>
 
-<section id="addGrantRoleToPerson" role="region">        
-    
+<section id="addGrantRoleToPerson" role="region">
+
 <@lvf.unsupportedBrowser  urls.base />
 
 
     <form id="addGrantRoleToPerson" class="customForm noIE67" action="${submitUrl}"  role="add/edit grant role">
-        
+
         <p>
             <label for="grant">${i18n().grant_name} ${requiredHint}</label>
             <input class="acSelector" size="50"  type="text" id="grant" acGroupName="grant" name="grantLabel"  value="${grantLabelValue}" />
@@ -124,13 +124,13 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <p class="inline">
                 <label>${i18n().selected_grant}:</label>
                 <span class="acSelectionInfo"></span>
-                <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+                <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
                 <a href="#" class="changeSelection" id="changeSelection" title="${i18n().change_selection}">${i18n().change_selection})</a>
             </p>
             <input class="acUriReceiver" type="hidden" id="grantUri" name="existingGrant" value="${existingGrantValue}" ${flagClearLabelForExisting}="true" />
         </div>
 
-        <h4>${i18n().years_of_grant_participation}</h4>							 
+        <h4>${i18n().years_of_grant_participation}</h4>
 			 						<#if htmlForElements?keys?seq_contains("startField")>
 			 							 <label class="dateTime" for="startField">${i18n().start_capitalized}</label>
 			 							${htmlForElements["startField"]} ${yearHint}
@@ -140,7 +140,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 			 							<label class="dateTime" for="endField">${i18n().end_capitalized}</label>
 			 							${htmlForElements["endField"]} ${yearHint}
 					 	</#if>
-					 
+
             <p class="submit">
                 <input type="hidden" name = "editKey" value="${editKey}"/>
                 <input type="submit" id="submit" value="${submitButtonLabel}"/><span class="or"> ${i18n().or} </span><a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
@@ -153,7 +153,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 <#assign acUrl="/autocomplete?tokenize=true" />
 <#assign sparqlQueryUrl ="/ajax/sparqlQuery" />
 
-    
+
 <script type="text/javascript">
 var customFormData  = {
     sparqlForAcFilter: '${sparqlForAcFilter}',
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl
index 2b67fa9f4d..49a2d63a81 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl
@@ -1,32 +1,32 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#--Two stage form for service provider role-->
-
-<#--
-Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
-roleDescriptor.
-The other required values (roleType, optionsType, objectClassUri, and literalOptions are
-set in the JAVA class corresponding to the form, e.g. AddHeadOfRoleToPersonGenerator.java.
-
-Optional values can be set, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-showRoleLAbelField
-roleExamples-->
-
-
-<#--Variable assignments for Add Head Role To Person-->
-<#assign roleDescriptor = "${i18n().leadership}" />
-<#assign typeSelectorLabel = "${i18n().organization_type}" />
-<#assign genericLabel = "${i18n().organization_capitalized}" />
-
-<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization'}" />
-
-<#assign editTitle = "${i18n().edit_entry_for_head_role}"/>
-
-<#assign createTitle = "${i18n().create_entry_for_head_role}"/>
-
-<#--Each of the two stage forms will include the form below-->
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#--Two stage form for service provider role-->
+
+<#--
+Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
+roleDescriptor.
+The other required values (roleType, optionsType, objectClassUri, and literalOptions are
+set in the JAVA class corresponding to the form, e.g. AddHeadOfRoleToPersonGenerator.java.
+
+Optional values can be set, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+showRoleLAbelField
+roleExamples-->
+
+
+<#--Variable assignments for Add Head Role To Person-->
+<#assign roleDescriptor = "${i18n().leadership}" />
+<#assign typeSelectorLabel = "${i18n().organization_type}" />
+<#assign genericLabel = "${i18n().organization_capitalized}" />
+
+<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization'}" />
+
+<#assign editTitle = "${i18n().edit_entry_for_head_role}"/>
+
+<#assign createTitle = "${i18n().create_entry_for_head_role}"/>
+
+<#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl
index ff29b43839..afe529c4f9 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl
@@ -30,4 +30,4 @@ roleExamples-->
 <#assign createTitle = "${i18n().create_entry_for_member_role}"/>
 
 <#--Each of the two stage forms will include the form below-->
-<#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
+<#include "addRoleToPersonTwoStage.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
index f9833e9989..27a454f71f 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
@@ -23,12 +23,12 @@
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${titleVerb}" + " ORCID iD">
         <#assign disabledVal=""/>
 </#if>
@@ -45,15 +45,15 @@
             <#--Checking if any required fields are empty-->
             <#if lvf.submissionErrorExists(editSubmission, "orcidId")>
  	            ${i18n().required_fields}: ORCID iD<br />
-            </#if>        
+            </#if>
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasOrcidId" role="region">
 
-<section id="personHasOrcidId" role="region">        
-    
     <form id="personHasOrcidId" class="customForm noIE67" action="${submitUrl}"  role="add/edit orcidId">
 
         <p>
@@ -74,7 +74,7 @@
     </form>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
index 06b8a287ec..507568b572 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
@@ -1,203 +1,203 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#-- this is in request.subject.name -->
-
-<#-- leaving this edit/add mode code in for reference in case we decide we need it -->
-
-<#import "lib-vivo-form.ftl" as lvf>
-
-<#--Retrieve certain edit configuration information-->
-<#if editConfiguration.objectUri?has_content>
-    <#assign editMode = "edit">
-<#else>
-    <#assign editMode = "add">
-</#if>
-
-<#assign blankSentinel = "" />
-<#if editConfigurationConstants?has_content && editConfigurationConstants?keys?seq_contains("BLANK_SENTINEL")>
-	<#assign blankSentinel = editConfigurationConstants["BLANK_SENTINEL"] />
-</#if>
-
-<#--This flag is for clearing the label field on submission for an existing object being selected from autocomplete.
-Set this flag on the input acUriReceiver where you would like this behavior to occur. -->
-<#assign flagClearLabelForExisting = "flagClearLabelForExisting" />
-
-
-<#assign htmlForElements = editConfiguration.pageData.htmlForElements />
-
-<#--Retrieve variables needed-->
-<#assign existingPresentationValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingPresentation") />
-<#assign presentationLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "presentationLabel") />
-<#assign presentationLabelDisplayValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "presentationLabelDisplay") />
-<#assign presentationTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "presentationType") />
-<#assign roleLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "roleLabel") />
-<#assign conferenceValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingConference") />
-<#assign conferenceLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "conferenceLabel") />
-<#assign conferenceLabelDisplayValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "conferenceLabelDisplay") />
-
-<#--If edit submission exists, then retrieve validation errors if they exist-->
-<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
-	<#assign submissionErrors = editSubmission.validationErrors/>
-</#if>
-
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
-        <#assign submitButtonText="${i18n().save_changes}">
-        <#assign disabledVal="disabled">
-<#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
-        <#assign submitButtonText="${i18n().create_entry}">
-        <#assign disabledVal=""/>
-</#if>
-
-<#assign requiredHint = "<span class='requiredHint'> *</span>" />
-<#assign yearHint     = "<span class='hint'>(${i18n().year_hint_format})</span>" />
-
-<h2>${titleVerb}&nbsp;${i18n().presentation_entry_for} ${editConfiguration.subjectName}</h2>
-
-<#--Display error messages if any-->
-<#if submissionErrors?has_content>
-    <#if conferenceLabelDisplayValue?has_content >
-        <#assign conferenceLabelValue = conferenceLabelDisplayValue />
-    </#if>
-    <#if presentationLabelDisplayValue?has_content >
-        <#assign presentationLabelValue = presentationLabelDisplayValue />
-    </#if>
-    <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
-        <p>
-        <#--Checking if any required fields are empty-->
-        <#if lvf.submissionErrorExists(editSubmission, "presentationType")>
- 	        Please select a presentation type.
-        </#if> 
-        <#if lvf.submissionErrorExists(editSubmission, "presentationLabel")>
- 	        ${i18n().select_or_enter_name}
-        </#if> 
-        <#list submissionErrors?keys as errorFieldName>
-        	<#if errorFieldName == "startField">
-        	    <#if submissionErrors[errorFieldName]?contains("before")>
-        	        ${i18n().start_year_must_precede_end}
-        	    <#else>
-        	        ${submissionErrors[errorFieldName]}
-        	    </#if>
-        	    
-        	<#elseif errorFieldName == "endField">
-    	        <#if submissionErrors[errorFieldName]?contains("after")>
-    	            ${i18n().end_year_must_be_later}
-    	        <#else>
-    	            ${submissionErrors[errorFieldName]}
-    	        </#if>
-	        </#if><br />
-        </#list>
-        </p>
-    </section>
-</#if>
-
-<@lvf.unsupportedBrowser urls.base /> 
-
-<section id="addPresenterRoleToPerson" role="region">        
-    
-    <form id="addPresenterRoleToPerson" class="customForm noIE67" action="${submitUrl}"  role="add/edit Presentation">
-    <p class="inline">    
-      <label for="presentationType">${i18n().presentation_type}<#if editMode != "edit"> ${requiredHint}<#else>:</#if></label>
-      <#assign presentationTypeOpts = editConfiguration.pageData.presentationType />
-      <select id="typeSelector" name="presentationType" acGroupName="presentation">
-        <option value="" selected="selected">${i18n().select_one}</option>                
-        <#list presentationTypeOpts?keys as key>             
-            <option value="${key}" <#if presentationTypeValue = key>selected</#if>><#if presentationTypeOpts[key] == "Other">${i18n().presentation_capitalized}<#else>${presentationTypeOpts[key]}</#if></option>            
-        </#list>
-    </select>
-    </p>
-
-    <p>
-        <label for="presentation">${i18n().presentation_name_capitalized} ${requiredHint}</label>
-            <input class="acSelector" size="50"  type="text" id="presentation" acGroupName="presentation" name="presentationLabel" value="${presentationLabelValue}">
-            <input class="display" type="hidden" id="presentationDisplay" acGroupName="presentation" name="presentationLabelDisplay" value="${presentationLabelDisplayValue}">
-    </p>
-
-    <div class="acSelection" acGroupName="presentation">
-        <p class="inline">
-            <label>${i18n().selected_presentation}:</label>
-            <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
-            <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
-        </p>
-        <input class="acUriReceiver" type="hidden" id="presentationUri" name="existingPresentation" value="${existingPresentationValue}" ${flagClearLabelForExisting}="true" />
-    </div>
-     
-    <p><label for="roleLabel">${i18n().role_in_presentation_capitalized} <span class="hint">(${i18n().presentation_hint})</span></label>
-        <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabelValue}" />
-    </p>
-  <p>
-      <label for="org">${i18n().presented_at}</label>
-      <input  class="acSelector" size="50" acGroupName="conference" type="text" id="conference" name="conferenceLabel" value="${conferenceLabelValue}" />
-      <input  class="display" acGroupName="conference" type="hidden" id="conferenceDisplay" name="conferenceLabelDisplay" value="${conferenceLabelDisplayValue}" />
-  </p>
-  <div class="acSelection" acGroupName="conference">
-      <p class="inline">
-          <label>${i18n().selected_conference}:</label>
-          <span class="acSelectionInfo"></span>
-          <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
-          <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
-      </p>
-      <input class="acUriReceiver" type="hidden" id="conferenceUri" name="existingConference" value="${conferenceValue}" ${flagClearLabelForExisting}="true" />
-  </div>
-    <p>
-        <h4 class="label">${i18n().years_participating}</h4>
-    </p>
-    <#--Need to draw edit elements for dates here-->
-    <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
-    <#if htmlForElements?keys?seq_contains("startField")>
-        <label class="dateTime" for="startField">${i18n().start_capitalized}</label>
-		${htmlForElements["startField"]} ${yearHint}
-    </#if>
-    <br/>
-    <#if htmlForElements?keys?seq_contains("endField")>
-		<label class="dateTime" for="endField">${i18n().end_capitalized}</label>
-	 	${htmlForElements["endField"]} ${yearHint}
-    </#if>
-	<#--End draw elements-->
-
-    <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
-
-    <p class="submit">
-        <input type="submit" class="submit" value="${submitButtonText}"/><span class="or"> ${i18n().or} </span>
-        <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
-    </p>
-
-    <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
-
-</form>
-
-</section>
-
-
-<script type="text/javascript">
-var customFormData  = {
-    acUrl: '${urls.base}/autocomplete?tokenize=true&stem=true',
-    acTypes: {presentation: 'http://vivoweb.org/ontology/core#Presentation', conference: 'http://purl.org/ontology/bibo/Conference'},
-    editMode: '${editMode}',
-    defaultTypeName: 'presentation',
-    multipleTypeNames: {presentation: 'presentation', conference: 'conference'},
-    baseHref: '${urls.base}/individual?uri=',
-    blankSentinel: '${blankSentinel}',
-    flagClearLabelForExisting: '${flagClearLabelForExisting}'
-};
-var i18nStrings = {
-    selectAnExisting: '${i18n().select_an_existing}',
-    orCreateNewOne: '${i18n().or_create_new_one}',
-    selectedString: '${i18n().selected}'
-};
-</script>
-
- 
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
-             '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
-             '<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>',
-             '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
-             '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.bgiframe.pack.js"></script>',
-             '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#-- this is in request.subject.name -->
+
+<#-- leaving this edit/add mode code in for reference in case we decide we need it -->
+
+<#import "lib-vivo-form.ftl" as lvf>
+
+<#--Retrieve certain edit configuration information-->
+<#if editConfiguration.objectUri?has_content>
+    <#assign editMode = "edit">
+<#else>
+    <#assign editMode = "add">
+</#if>
+
+<#assign blankSentinel = "" />
+<#if editConfigurationConstants?has_content && editConfigurationConstants?keys?seq_contains("BLANK_SENTINEL")>
+	<#assign blankSentinel = editConfigurationConstants["BLANK_SENTINEL"] />
+</#if>
+
+<#--This flag is for clearing the label field on submission for an existing object being selected from autocomplete.
+Set this flag on the input acUriReceiver where you would like this behavior to occur. -->
+<#assign flagClearLabelForExisting = "flagClearLabelForExisting" />
+
+
+<#assign htmlForElements = editConfiguration.pageData.htmlForElements />
+
+<#--Retrieve variables needed-->
+<#assign existingPresentationValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingPresentation") />
+<#assign presentationLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "presentationLabel") />
+<#assign presentationLabelDisplayValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "presentationLabelDisplay") />
+<#assign presentationTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "presentationType") />
+<#assign roleLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "roleLabel") />
+<#assign conferenceValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingConference") />
+<#assign conferenceLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "conferenceLabel") />
+<#assign conferenceLabelDisplayValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "conferenceLabelDisplay") />
+
+<#--If edit submission exists, then retrieve validation errors if they exist-->
+<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
+	<#assign submissionErrors = editSubmission.validationErrors/>
+</#if>
+
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
+        <#assign submitButtonText="${i18n().save_changes}">
+        <#assign disabledVal="disabled">
+<#else>
+        <#assign titleVerb="${i18n().create_capitalized}">
+        <#assign submitButtonText="${i18n().create_entry}">
+        <#assign disabledVal=""/>
+</#if>
+
+<#assign requiredHint = "<span class='requiredHint'> *</span>" />
+<#assign yearHint     = "<span class='hint'>(${i18n().year_hint_format})</span>" />
+
+<h2>${titleVerb}&nbsp;${i18n().presentation_entry_for} ${editConfiguration.subjectName}</h2>
+
+<#--Display error messages if any-->
+<#if submissionErrors?has_content>
+    <#if conferenceLabelDisplayValue?has_content >
+        <#assign conferenceLabelValue = conferenceLabelDisplayValue />
+    </#if>
+    <#if presentationLabelDisplayValue?has_content >
+        <#assign presentationLabelValue = presentationLabelDisplayValue />
+    </#if>
+    <section id="error-alert" role="alert">
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
+        <p>
+        <#--Checking if any required fields are empty-->
+        <#if lvf.submissionErrorExists(editSubmission, "presentationType")>
+ 	        Please select a presentation type.
+        </#if>
+        <#if lvf.submissionErrorExists(editSubmission, "presentationLabel")>
+ 	        ${i18n().select_or_enter_name}
+        </#if>
+        <#list submissionErrors?keys as errorFieldName>
+        	<#if errorFieldName == "startField">
+        	    <#if submissionErrors[errorFieldName]?contains("before")>
+        	        ${i18n().start_year_must_precede_end}
+        	    <#else>
+        	        ${submissionErrors[errorFieldName]}
+        	    </#if>
+
+        	<#elseif errorFieldName == "endField">
+    	        <#if submissionErrors[errorFieldName]?contains("after")>
+    	            ${i18n().end_year_must_be_later}
+    	        <#else>
+    	            ${submissionErrors[errorFieldName]}
+    	        </#if>
+	        </#if><br />
+        </#list>
+        </p>
+    </section>
+</#if>
+
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="addPresenterRoleToPerson" role="region">
+
+    <form id="addPresenterRoleToPerson" class="customForm noIE67" action="${submitUrl}"  role="add/edit Presentation">
+    <p class="inline">
+      <label for="presentationType">${i18n().presentation_type}<#if editMode != "edit"> ${requiredHint}<#else>:</#if></label>
+      <#assign presentationTypeOpts = editConfiguration.pageData.presentationType />
+      <select id="typeSelector" name="presentationType" acGroupName="presentation">
+        <option value="" selected="selected">${i18n().select_one}</option>
+        <#list presentationTypeOpts?keys as key>
+            <option value="${key}" <#if presentationTypeValue = key>selected</#if>><#if presentationTypeOpts[key] == "Other">${i18n().presentation_capitalized}<#else>${presentationTypeOpts[key]}</#if></option>
+        </#list>
+    </select>
+    </p>
+
+    <p>
+        <label for="presentation">${i18n().presentation_name_capitalized} ${requiredHint}</label>
+            <input class="acSelector" size="50"  type="text" id="presentation" acGroupName="presentation" name="presentationLabel" value="${presentationLabelValue}">
+            <input class="display" type="hidden" id="presentationDisplay" acGroupName="presentation" name="presentationLabelDisplay" value="${presentationLabelDisplayValue}">
+    </p>
+
+    <div class="acSelection" acGroupName="presentation">
+        <p class="inline">
+            <label>${i18n().selected_presentation}:</label>
+            <span class="acSelectionInfo"></span>
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
+            <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
+        </p>
+        <input class="acUriReceiver" type="hidden" id="presentationUri" name="existingPresentation" value="${existingPresentationValue}" ${flagClearLabelForExisting}="true" />
+    </div>
+
+    <p><label for="roleLabel">${i18n().role_in_presentation_capitalized} <span class="hint">(${i18n().presentation_hint})</span></label>
+        <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabelValue}" />
+    </p>
+  <p>
+      <label for="org">${i18n().presented_at}</label>
+      <input  class="acSelector" size="50" acGroupName="conference" type="text" id="conference" name="conferenceLabel" value="${conferenceLabelValue}" />
+      <input  class="display" acGroupName="conference" type="hidden" id="conferenceDisplay" name="conferenceLabelDisplay" value="${conferenceLabelDisplayValue}" />
+  </p>
+  <div class="acSelection" acGroupName="conference">
+      <p class="inline">
+          <label>${i18n().selected_conference}:</label>
+          <span class="acSelectionInfo"></span>
+          <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
+          <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
+      </p>
+      <input class="acUriReceiver" type="hidden" id="conferenceUri" name="existingConference" value="${conferenceValue}" ${flagClearLabelForExisting}="true" />
+  </div>
+    <p>
+        <h4 class="label">${i18n().years_participating}</h4>
+    </p>
+    <#--Need to draw edit elements for dates here-->
+    <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
+    <#if htmlForElements?keys?seq_contains("startField")>
+        <label class="dateTime" for="startField">${i18n().start_capitalized}</label>
+		${htmlForElements["startField"]} ${yearHint}
+    </#if>
+    <br/>
+    <#if htmlForElements?keys?seq_contains("endField")>
+		<label class="dateTime" for="endField">${i18n().end_capitalized}</label>
+	 	${htmlForElements["endField"]} ${yearHint}
+    </#if>
+	<#--End draw elements-->
+
+    <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
+
+    <p class="submit">
+        <input type="submit" class="submit" value="${submitButtonText}"/><span class="or"> ${i18n().or} </span>
+        <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
+    </p>
+
+    <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
+
+</form>
+
+</section>
+
+
+<script type="text/javascript">
+var customFormData  = {
+    acUrl: '${urls.base}/autocomplete?tokenize=true&stem=true',
+    acTypes: {presentation: 'http://vivoweb.org/ontology/core#Presentation', conference: 'http://purl.org/ontology/bibo/Conference'},
+    editMode: '${editMode}',
+    defaultTypeName: 'presentation',
+    multipleTypeNames: {presentation: 'presentation', conference: 'conference'},
+    baseHref: '${urls.base}/individual?uri=',
+    blankSentinel: '${blankSentinel}',
+    flagClearLabelForExisting: '${flagClearLabelForExisting}'
+};
+var i18nStrings = {
+    selectAnExisting: '${i18n().select_an_existing}',
+    orCreateNewOne: '${i18n().or_create_new_one}',
+    selectedString: '${i18n().selected}'
+};
+</script>
+
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+             '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
+             '<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>',
+             '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
+             '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.bgiframe.pack.js"></script>',
+             '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl
index 69340cfb30..52f65caff5 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl
@@ -68,12 +68,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 <#assign startPageValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "startPage") />
 <#assign endPageValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "endPage") />
 
-<#if editMode == "edit">        
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -107,7 +107,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <#--below shows examples of both printing out all error messages and checking the error message for a specific field-->
         <#if lvf.submissionErrorExists(editSubmission, "title")>
  	        ${i18n().select_existing_pub_or_enter_new}<br />
-        <#else> 
+        <#else>
             <#list submissionErrors?keys as errorFieldName>
         	    ${submissionErrors[errorFieldName]} <br/>
             </#list>
@@ -121,14 +121,14 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 <#assign yearHint     = "<span class='hint'>(${i18n().year_hint_format})</span>" />
 
 <#if editMode = "error">
- <div>${i18n().unable_to_handle_publication_editing}</div>      
+ <div>${i18n().unable_to_handle_publication_editing}</div>
 <#else>
 
-<section id="addPublicationToPerson" role="region">        
-    
+<section id="addPublicationToPerson" role="region">
+
 <@lvf.unsupportedBrowser urls.base/>
 <form id="addpublicationToPerson" class="customForm noIE67" action="${submitUrl}"  role="add/edit publication">
-        
+
         <#--TODO: Check if possible to have existing publication options here in order to select-->
     <p class="inline"><label for="typeSelector">${i18n().publication_type}<#if editMode != "edit"> ${requiredHint}<#else>:</#if></label>
         <select id="typeSelector" name="pubType" acGroupName="publication" >
@@ -147,7 +147,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <p class="inline">
                 <label>${i18n().selected_publication}:</label>
                 <span class="acSelectionInfo"></span>
-                <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+                <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
                 <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
             </p>
             <input class="acUriReceiver" type="hidden" id="pubUri" name="pubUri" value="${pubUriValue}"  ${flagClearLabelForExisting}="true" />
@@ -164,7 +164,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_journal}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="collectionUri" name="collectionUri" value="${collectionUriValue}" ${flagClearLabelForExisting}="true" />
@@ -175,13 +175,13 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <label for="book">${i18n().published_in}</label>
         <input class="acSelector" size="50"  type="text" id="book" name="book" acGroupName="book"  value="${bookValue}" />
         <input class="display" type="hidden"  id="bookDisplay" name="bookDisplay" acGroupName="book"  value="${bookDisplayValue}" />
-    </p> 
+    </p>
 
     <div class="acSelection" acGroupName="book" >
         <p class="inline">
             <label>${i18n().selected_book}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="bookUri" name="bookUri" value="${bookUriValue}" ${flagClearLabelForExisting}="true" />
@@ -198,12 +198,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_event}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="conferenceUri" name="conferenceUri" value="${conferenceUriValue}" ${flagClearLabelForExisting}="true" />
     </div>
-        
+
     <#-- Proceedings of -->
     <p>
         <label for="event">${i18n().proceedings_of}</label>
@@ -215,7 +215,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_organization}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="eventUri" name="eventUri" value="${eventUriValue}" ${flagClearLabelForExisting}="true" />
@@ -237,7 +237,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_editor}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="editorUri" name="editorUri" value="${editorUriValue}" ${flagClearLabelForExisting}="true" />
@@ -254,18 +254,18 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_publisher}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="publisherUri" name="publisherUri" value="${publisherUriValue}" ${flagClearLabelForExisting}="true" />
     </div>
-    
+
     <#-- Place of Publication -->
     <p>
         <label for="locale">${i18n().place_of_publication}</label>
         <input  size="30"  type="text" id="locale" name="locale" acGroupName="locale"  value="${localeValue}" />
     </p>
-    
+
     <#-- Volume, Number and Issue -->
     <p class="inline">
         <label for="volume" id="volLabel">${i18n().volume_capitalized}</label>
@@ -330,11 +330,11 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         selectedString: '${i18n().selected}'
     };
     </script>
-    
+
     <script type="text/javascript">
      $(document).ready(function(){
         publicationToPersonUtils.onLoad('${urls.base}/individual?uri=', '${blankSentinel}');
-    }); 
+    });
     </script>
 </section>
 </#if>
@@ -346,6 +346,6 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
 
  ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',             
-              '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/publicationToPersonUtils.js"></script>',             
+              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/publicationToPersonUtils.js"></script>',
               '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl
index c757616b36..5c9a8c5b89 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl
@@ -1,35 +1,35 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#--Two stage form for service provider role-->
-
-<#--
-Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
-roleDescriptor.
-The other required values (roleType, optionsType, objectClassUri, and literalOptions are
-set in the JAVA class corresponding to the form, e.g. AddResearcherRoleToPersonGenerator.java.
-
-Optional values can be set, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-showRoleLAbelField
-roleExamples-->
-
-
-<#--Variable assignments for Add Clinical Role To Person-->
-<#assign roleDescriptor = "${i18n().research_activity}" />
-<#assign typeSelectorLabel = "${i18n().research_activity_type}" />
-<#assign genericLabel = "${i18n().research_activity?capitalize}" />
-
-<#assign acMultipleTypes = "'true'" />
-
-<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://vivoweb.org/ontology/core#Grant'}" />
-
-
-<#assign editTitle = "${i18n().edit_entry_for_researcher_role}"/>
-
-<#assign createTitle = "${i18n().create_entry_for_researcher_role}"/>
-
-<#--Each of the two stage forms will include the form below-->
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#--Two stage form for service provider role-->
+
+<#--
+Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
+roleDescriptor.
+The other required values (roleType, optionsType, objectClassUri, and literalOptions are
+set in the JAVA class corresponding to the form, e.g. AddResearcherRoleToPersonGenerator.java.
+
+Optional values can be set, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+showRoleLAbelField
+roleExamples-->
+
+
+<#--Variable assignments for Add Clinical Role To Person-->
+<#assign roleDescriptor = "${i18n().research_activity}" />
+<#assign typeSelectorLabel = "${i18n().research_activity_type}" />
+<#assign genericLabel = "${i18n().research_activity?capitalize}" />
+
+<#assign acMultipleTypes = "'true'" />
+
+<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://vivoweb.org/ontology/core#Grant'}" />
+
+
+<#assign editTitle = "${i18n().edit_entry_for_researcher_role}"/>
+
+<#assign createTitle = "${i18n().create_entry_for_researcher_role}"/>
+
+<#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index 65f39cb247..b19235ec60 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -119,15 +119,15 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
     	    ${i18n().specify_role_for_activity}
         </#if>
-        
+
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="add${roleDescriptor?capitalize}RoleToPersonTwoStage" role="region">
 
-<section id="add${roleDescriptor?capitalize}RoleToPersonTwoStage" role="region">        
-    
     <form id="add${roleDescriptor?capitalize}RoleToPersonTwoStage" class="customForm noIE67" action="${submitUrl}"  role="add/edit grant role">
 
        <p class="inline">
@@ -148,23 +148,23 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
                 </#list>
             </select>
         <#else>
-           <#list roleActivityTypeKeys as key>             
+           <#list roleActivityTypeKeys as key>
                <#if selectedActivityType = key >
-                 <span class="readOnly" id="typeSelectorSpan">${roleActivityTypeSelect[key]}</span> 
+                 <span class="readOnly" id="typeSelectorSpan">${roleActivityTypeSelect[key]}</span>
                  <input type="hidden" id="typeSelectorInput" name="roleActivityType" acGroupName="activity" value="${activityTypeValue}" >
-               </#if>           
+               </#if>
            </#list>
         </#if>
        </p>
-       
-       
+
+
 <#--   <div class="fullViewOnly"> -->
             <p>
                 <label for="activity">${genericLabel?capitalize} ${i18n().name_capitalized} ${requiredHint}</label>
                 <input class="acSelector" size="50"  type="text" id="activity" name="activityLabel"  acGroupName="activity" value="${activityLabelValue}" />
                 <input class="display" type="hidden" id="activityDisplay" acGroupName="activity" name="activityLabelDisplay" value="${activityLabelDisplayValue}">
             </p>
-            
+
             <input type="hidden" id="roleToActivityPredicate" name="roleToActivityPredicate" value="" />
             <!--Populated or modified by JavaScript based on type of activity, type returned from AJAX request-->
 
@@ -172,7 +172,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
                 <p class="inline">
                     <label></label>
                     <span class="acSelectionInfo"></span>
-                    <a href="/vivo/individual?uri=" class="verifyMatch" title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+                    <a href="/vivo/individual?uri=" class="verifyMatch" title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
                     <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
 
                     </p>
@@ -185,7 +185,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
                 <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabel}" />
             </p>
         	</#if>
-        	
+
             <#if numDateFields == 1 >
                <#--Generated html is a map with key name mapping to html string-->
                <#if htmlForElements?keys?seq_contains("startField")>
@@ -213,8 +213,8 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
     </form>
 
-<#--Specifying form-specific script and adding stylesheets and scripts-->    
-    
+<#--Specifying form-specific script and adding stylesheets and scripts-->
+
  <script type="text/javascript">
 	var customFormData  = {
 	    acUrl: '${urls.base}/autocomplete?tokenize=true',
@@ -222,7 +222,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	    acTypes: ${acTypes!},
 	    <#if acMultipleTypes??>acMultipleTypes: ${acMultipleTypes!},</#if>
 	    // used in repair mode: button text and org name label
-	    defaultTypeName: <#if genericLabel??>'${genericLabel}'<#else>'activity'</#if>, 
+	    defaultTypeName: <#if genericLabel??>'${genericLabel}'<#else>'activity'</#if>,
 	    baseHref: '${urls.base}/individual?uri=',
         blankSentinel: '${blankSentinel}',
         flagClearLabelForExisting: '${flagClearLabelForExisting}'
@@ -243,4 +243,4 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}
 
-</section>   
+</section>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl
index d35b10d075..90cff22d59 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl
@@ -1,36 +1,36 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#--Two stage form for teacher role-->
-
-<#--
-Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
-roleDescriptor.
-The other required values (roleType, optionsType, objectClassUri, and literalOptions are
-set in the JAVA class corresponding to the form, e.g. AddTeacherRoleToPersonGenerator.java.
-
-Optional values can be set, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-showRoleLAbelField
-roleExamples-->
-
-
-<#--Variable assignments for Add Clinical Role To Person-->
-<#assign roleDescriptor = "${i18n().teaching_activity}" />
-<#assign typeSelectorLabel = "${i18n().teaching_activity_type}" />
-<#assign roleExamples = "<span class='hint'>&nbsp;(${i18n().teaching_role_hint})</span>" />
-
-<#assign genericLabel = "${i18n().teaching_activity?capitalize}" />
-
-<#assign acMultipleTypes = "'true'" />
-
-<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Conference,http://vivoweb.org/ontology/core#Course,http://purl.org/ontology/bibo/Workshop'}" />
-
-<#assign editTitle = "${i18n().edit_entry_for_teacher_role}"/>
-
-<#assign createTitle = "${i18n().create_entry_for_teacher_role}"/>
-
-<#--Each of the two stage forms will include the form below-->
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#--Two stage form for teacher role-->
+
+<#--
+Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
+roleDescriptor.
+The other required values (roleType, optionsType, objectClassUri, and literalOptions are
+set in the JAVA class corresponding to the form, e.g. AddTeacherRoleToPersonGenerator.java.
+
+Optional values can be set, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+showRoleLAbelField
+roleExamples-->
+
+
+<#--Variable assignments for Add Clinical Role To Person-->
+<#assign roleDescriptor = "${i18n().teaching_activity}" />
+<#assign typeSelectorLabel = "${i18n().teaching_activity_type}" />
+<#assign roleExamples = "<span class='hint'>&nbsp;(${i18n().teaching_role_hint})</span>" />
+
+<#assign genericLabel = "${i18n().teaching_activity?capitalize}" />
+
+<#assign acMultipleTypes = "'true'" />
+
+<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Conference,http://vivoweb.org/ontology/core#Course,http://purl.org/ontology/bibo/Workshop'}" />
+
+<#assign editTitle = "${i18n().edit_entry_for_teacher_role}"/>
+
+<#assign createTitle = "${i18n().create_entry_for_teacher_role}"/>
+
+<#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
index 3b1fdf0a94..1ea3028325 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
@@ -1,79 +1,79 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#import "lib-vivo-form.ftl" as lvf>
-<#--If edit submission exists, then retrieve validation errors if they exist-->
-<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
-	<#assign submissionErrors = editSubmission.validationErrors/>
-</#if>
-
-<#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter />
-
-<#--This flag is for clearing the label field on submission for an existing object being selected from autocomplete.
-Set this flag on the input acUriReceiver where you would like this behavior to occur. -->
-<#assign flagClearLabelForExisting = "flagClearLabelForExisting" />
-
-<h2>${i18n().create_own_concept_all_caps}</h2>
-
-<@lvf.unsupportedBrowser urls.base /> 
-
-<form id="addUserDefinedConceptForm" class="customForm noIE67" action = "${submitUrl}" method="post">
-    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
-   <#--Autocomplete for looking up existing skos concepts -->
-						<p>
-		            <label for="relatedIndLabel">${i18n().concept_capitalized} <span class='requiredHint'> *</span></label>
-		            <input class="acSelector" size="50"  type="text" id="relatedIndLabel" acGroupName="concept" name="conceptLabel" value="" />
-		        </p>
-		
-		        <div class="acSelection" acGroupName="concept">
-		            <p class="inline">
-		                <label>${i18n().selected_concept}:</label>
-		                <span class="acSelectionInfo"></span>
-                        <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
-                        <a href="#" class="changeSelection" id="changeSelection" title="${i18n().change_selection}">${i18n().change_selection})</a>
-		            </p>
-		            <input class="acUriReceiver" type="hidden" id="conceptNode" name="conceptNode" value="" ${flagClearLabelForExisting}="true"/>
-        </div>
-
-    <br />
-    
-    
-    
-		<p class="submit">
-				<input type="hidden" name = "editKey" value="${editKey}"/>
-				<input type="submit" id="submit" value="${i18n().create_concept}"/><span class="or"> ${i18n().or} </span><a class="cancel" href="${cancelUrl}">${i18n().return_to_manage_concepts}</a>
-		</p>
-		
-		<p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
-    
-</form>
-
-<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
-
-    <script type="text/javascript">
-    var customFormData  = {
-        sparqlForAcFilter: '${sparqlForAcFilter}',
-        sparqlQueryUrl: '${sparqlQueryUrl}',
-        acUrl: '${urls.base}/autocomplete?tokenize=true',
-        acTypes: {concept: 'http://www.w3.org/2004/02/skos/core#Concept'},
-        editMode: 'add',
-        typeName: 'Concept',
-        defaultTypeName: 'concept', // used in repair mode to generate button text
-        baseHref: '${urls.base}/individual?uri=',
-        limitToConceptClasses:["http://www.w3.org/2004/02/skos/core#Concept"],
-        flagClearLabelForExisting: '${flagClearLabelForExisting}'
-    };
-    var i18nStrings = {
-        selectAnExisting: '${i18n().select_an_existing}',
-        orCreateNewOne: '${i18n().or_create_new_one}',
-        selectedString: '${i18n().selected}'
-    };
-    </script>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
- ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
- ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
-
-
- ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',             
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#import "lib-vivo-form.ftl" as lvf>
+<#--If edit submission exists, then retrieve validation errors if they exist-->
+<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
+	<#assign submissionErrors = editSubmission.validationErrors/>
+</#if>
+
+<#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter />
+
+<#--This flag is for clearing the label field on submission for an existing object being selected from autocomplete.
+Set this flag on the input acUriReceiver where you would like this behavior to occur. -->
+<#assign flagClearLabelForExisting = "flagClearLabelForExisting" />
+
+<h2>${i18n().create_own_concept_all_caps}</h2>
+
+<@lvf.unsupportedBrowser urls.base />
+
+<form id="addUserDefinedConceptForm" class="customForm noIE67" action = "${submitUrl}" method="post">
+    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
+   <#--Autocomplete for looking up existing skos concepts -->
+						<p>
+		            <label for="relatedIndLabel">${i18n().concept_capitalized} <span class='requiredHint'> *</span></label>
+		            <input class="acSelector" size="50"  type="text" id="relatedIndLabel" acGroupName="concept" name="conceptLabel" value="" />
+		        </p>
+
+		        <div class="acSelection" acGroupName="concept">
+		            <p class="inline">
+		                <label>${i18n().selected_concept}:</label>
+		                <span class="acSelectionInfo"></span>
+                        <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
+                        <a href="#" class="changeSelection" id="changeSelection" title="${i18n().change_selection}">${i18n().change_selection})</a>
+		            </p>
+		            <input class="acUriReceiver" type="hidden" id="conceptNode" name="conceptNode" value="" ${flagClearLabelForExisting}="true"/>
+        </div>
+
+    <br />
+
+
+
+		<p class="submit">
+				<input type="hidden" name = "editKey" value="${editKey}"/>
+				<input type="submit" id="submit" value="${i18n().create_concept}"/><span class="or"> ${i18n().or} </span><a class="cancel" href="${cancelUrl}">${i18n().return_to_manage_concepts}</a>
+		</p>
+
+		<p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
+
+</form>
+
+<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
+
+    <script type="text/javascript">
+    var customFormData  = {
+        sparqlForAcFilter: '${sparqlForAcFilter}',
+        sparqlQueryUrl: '${sparqlQueryUrl}',
+        acUrl: '${urls.base}/autocomplete?tokenize=true',
+        acTypes: {concept: 'http://www.w3.org/2004/02/skos/core#Concept'},
+        editMode: 'add',
+        typeName: 'Concept',
+        defaultTypeName: 'concept', // used in repair mode to generate button text
+        baseHref: '${urls.base}/individual?uri=',
+        limitToConceptClasses:["http://www.w3.org/2004/02/skos/core#Concept"],
+        flagClearLabelForExisting: '${flagClearLabelForExisting}'
+    };
+    var i18nStrings = {
+        selectAnExisting: '${i18n().select_an_existing}',
+        orCreateNewOne: '${i18n().or_create_new_one}',
+        selectedString: '${i18n().selected}'
+    };
+    </script>
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
+ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
+ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
+
+
+ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
               '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
index 1a8d0c51a1..6ea33e89b8 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
@@ -1,87 +1,87 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#--If edit submission exists, then retrieve validation errors if they exist-->
-<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
-    <#assign submissionErrors = editSubmission.validationErrors/>
-</#if>
-
-<#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter />
-<#assign editMode = editConfiguration.pageData.editMode />
-<#assign propertyPublicName = editConfiguration.propertyPublicName/>
-<h2>${editConfiguration.formTitle}</h2>
-
-<#--Display error messages if any-->
-<#if submissionErrors?has_content>
-    <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
-        <p>
-        
-        <#list submissionErrors?keys as errorFieldName>
-            ${submissionErrors[errorFieldName]}
-        </#list>
-                        
-        </p>
-    </section>
-</#if>
-
-<#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
-
-<form class="customForm" action = "${submitUrl}" method="post">
-    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
-    <#if editConfiguration.dataPredicatePublicDescription?has_content>
-       <label for="${editConfiguration.dataLiteral}"><p class="propEntryHelpText">${editConfiguration.dataPredicatePublicDescription}</p></label>
-    </#if>   
-	
-    <p>
-		<input class="acSelector" size="50"  type="text" id="literal" name="literal" value="${literalValues}" />
-	</p>
-								
-	<div class="acSelection"> 
-	<p class="inline">
-	<label>${i18n().selected}:</label> 
-	<span class="acSelectionInfo"></span> 
-	
-	<a href="#" class="cancel">(${i18n().change_selection})</a> 
-	</p>
-	</div>
-    <br />
-
-    <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button"/>
-    <span class="or"> ${i18n().or} </span>
-    <a title="${i18n().cancel_title}" href="${cancelUrl}">${i18n().cancel_link}</a>
-
-</form>
-
-<#if editConfiguration.includeDeletionForm = true>
-<#include "defaultDeletePropertyForm.ftl">
-</#if>
-<#--Not including defaultFormScripts.ftl which would trigger tinyMce-->
-<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
-<#--Passing in object types only if there are any types returned, otherwise
-the parameter should not be passed at all to the search.
-Also multiple types parameter set to true only if more than one type returned-->
-    <script type="text/javascript">	
-    var customFormData  = {
-        acUrl: '${urls.base}/dataautocomplete?',
-      	property: '${editConfiguration.predicateUri}',
-        submitButtonTextType: 'simple',
-        editMode: '${editMode}', //Change this to check whether adding or editing
-        sparqlForAcFilter: '${sparqlForAcFilter}',
-        sparqlQueryUrl: '${sparqlQueryUrl}',
-        defaultTypeName: '${propertyPublicName}'
-    };
-    var i18nStrings = {
-        selectExisting: '${i18n().select_an_existing}',
-        orCreateNewOne: '${i18n().or_create_new_one}',
-        selectedString: '${i18n().selected}'
-    };
-    </script>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
- ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
- ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',             
-              '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js"></script>')}
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#--If edit submission exists, then retrieve validation errors if they exist-->
+<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
+    <#assign submissionErrors = editSubmission.validationErrors/>
+</#if>
+
+<#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter />
+<#assign editMode = editConfiguration.pageData.editMode />
+<#assign propertyPublicName = editConfiguration.propertyPublicName/>
+<h2>${editConfiguration.formTitle}</h2>
+
+<#--Display error messages if any-->
+<#if submissionErrors?has_content>
+    <section id="error-alert" role="alert">
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
+        <p>
+
+        <#list submissionErrors?keys as errorFieldName>
+            ${submissionErrors[errorFieldName]}
+        </#list>
+
+        </p>
+    </section>
+</#if>
+
+<#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
+
+<form class="customForm" action = "${submitUrl}" method="post">
+    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
+    <#if editConfiguration.dataPredicatePublicDescription?has_content>
+       <label for="${editConfiguration.dataLiteral}"><p class="propEntryHelpText">${editConfiguration.dataPredicatePublicDescription}</p></label>
+    </#if>
+
+    <p>
+		<input class="acSelector" size="50"  type="text" id="literal" name="literal" value="${literalValues}" />
+	</p>
+
+	<div class="acSelection">
+	<p class="inline">
+	<label>${i18n().selected}:</label>
+	<span class="acSelectionInfo"></span>
+
+	<a href="#" class="cancel">(${i18n().change_selection})</a>
+	</p>
+	</div>
+    <br />
+
+    <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button"/>
+    <span class="or"> ${i18n().or} </span>
+    <a title="${i18n().cancel_title}" href="${cancelUrl}">${i18n().cancel_link}</a>
+
+</form>
+
+<#if editConfiguration.includeDeletionForm = true>
+<#include "defaultDeletePropertyForm.ftl">
+</#if>
+<#--Not including defaultFormScripts.ftl which would trigger tinyMce-->
+<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
+<#--Passing in object types only if there are any types returned, otherwise
+the parameter should not be passed at all to the search.
+Also multiple types parameter set to true only if more than one type returned-->
+    <script type="text/javascript">
+    var customFormData  = {
+        acUrl: '${urls.base}/dataautocomplete?',
+      	property: '${editConfiguration.predicateUri}',
+        submitButtonTextType: 'simple',
+        editMode: '${editMode}', //Change this to check whether adding or editing
+        sparqlForAcFilter: '${sparqlForAcFilter}',
+        sparqlQueryUrl: '${sparqlQueryUrl}',
+        defaultTypeName: '${propertyPublicName}'
+    };
+    var i18nStrings = {
+        selectExisting: '${i18n().select_an_existing}',
+        orCreateNewOne: '${i18n().or_create_new_one}',
+        selectedString: '${i18n().selected}'
+    };
+    </script>
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
+ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
+ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
index 4c43e117be..82227de9ec 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
@@ -24,14 +24,14 @@
 .emptyColumn {
 	width:67px;
 	height:18px;
-	background: url("../images/conceptSpacer.png") no-repeat left center;  
+	background: url("../images/conceptSpacer.png") no-repeat left center;
 }
 
 /*For adding the checkmark under the best match column*/
 .bestMatchFlag {
 	width:67px;
 	height:18px;
-	background: url("../images/conceptCheckMark.png") no-repeat left center;  
+	background: url("../images/conceptCheckMark.png") no-repeat left center;
 }
 
 form#addConceptForm {
@@ -50,7 +50,7 @@ form#addConceptForm span#createOwnOne{
 	float:left;
 }
 
-.existingConcept .column, 
+.existingConcept .column,
 .conceptHeadings .column,
 .concepts .column {
 	float:left;
@@ -59,9 +59,9 @@ form#addConceptForm span#createOwnOne{
 }
 /*label and semantic type if it exists*/
 .conceptLabel,
-.existingConcept .conceptLabelInfo, 
+.existingConcept .conceptLabelInfo,
 .conceptHeadings .conceptLabelInfo,
-existingConcept .conceptVocabSource, 
+existingConcept .conceptVocabSource,
 .conceptHeadings .conceptVocabSource {
 	width:220px;
 }
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css
index aaf63b8e27..3c232c3c76 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css
@@ -20,5 +20,5 @@ li.ui-menu-item a.ui-corner-all {
 }
 .acSelectorWithHelpText{
     font-style: italic;
-    color: #555;	
+    color: #555;
 }
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css
index d34c8be095..ab422d19c8 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css
@@ -7,13 +7,13 @@
     list-style: none;
     margin-bottom: .75em;
 }
-/* Use class dd rather than jQuery UI's class ui-sortable, so that we can remove 
+/* Use class dd rather than jQuery UI's class ui-sortable, so that we can remove
 the class if there's fewer than one author. We don't want to remove the ui-sortable
 class, in case we want to re-enable DD without a page reload. */
 #dragDropList.dd li {
     padding-left: 1em;
-    background: url("../images/sortable_icon.png") no-repeat left center;  
-    cursor: move;  
+    background: url("../images/sortable_icon.png") no-repeat left center;
+    cursor: move;
 }
 #dragDropList .itemName {
     display: inline-block;
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl
index 5d9791c32b..f58f34d2ac 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl
@@ -7,25 +7,25 @@
 <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 <#assign domainUri = editConfiguration.pageData.domainUri!"" />
 
-<#if editMode == "edit">        
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign disabledVal="disabled">
         <#assign submitButtonText="${i18n().save_changes}">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_date_time_value}">
         <#assign disabledVal=""/>
 </#if>
-<#if domainUri?contains("IAO_0000030")>        
-    <#assign titleObject="${i18n().publication_date_for}">  
-    <#if editMode == "edit">  
+<#if domainUri?contains("IAO_0000030")>
+    <#assign titleObject="${i18n().publication_date_for}">
+    <#if editMode == "edit">
         <#assign submitButtonText="${i18n().edit_publication_date}">
     <#else>
         <#assign submitButtonText="${i18n().create_publication_date}">
     </#if>
 <#elseif domainUri?contains("AwardReceipt")>
     <#assign titleObject="${i18n().year_awarded_for}">
-    <#if editMode == "edit">  
+    <#if editMode == "edit">
         <#assign submitButtonText="${i18n().edit_year_awarded}">
     <#else>
         <#assign submitButtonText="${i18n().create_year_awarded}">
@@ -45,9 +45,9 @@
     <p class="submit">
         <input type="hidden" name="editKey" value="${editKey}" />
         <input type="submit" id="submit" value="${submitButtonText}" role="button" />
-    
+
         <span class="or"> ${i18n().or} </span>
-    
+
         <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
 </form>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
index 9fbf2c1927..02f12b6b73 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
@@ -47,12 +47,12 @@
 </#if>
 
 <form id="editForm" class="editForm" action="${submitUrl}">
-<#if isPersonType = "true">       
+<#if isPersonType = "true">
     <p>
         <label for="firstName">${i18n().first_name} ${requiredHint}</label>
         <input size="30"  type="text" id="firstName" name="firstName" value="${firstNameValue}" />
     </p>
-    
+
     <p>
         <label for="lastName">${i18n().middle_name} </label>
         <input size="30"  type="text" id="middleName" name="middleName" value="${middleNameValue}" />
@@ -62,21 +62,21 @@
         <label for="lastName">${i18n().last_name} ${requiredHint}</label>
         <input size="30"  type="text" id="lastName" name="lastName" value="${lastNameValue}" />
     </p>
-    
+
     <input type="hidden" id="label" name="label" value="${labelValue}" />
-<#else>       
+<#else>
     <p>
         <label for="name">${i18n().name_capitalized} ${requiredHint}</label>
         <input size="30"  type="text" id="label" name="label" value="${labelValue}" />
     </p>
 </#if>
     <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
-    
+
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="submit" />
         <span class="or"> or </span>
         <a class="cancel" title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
-    </p>     
+    </p>
 </form>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl
index 61325ba3a9..f32004658e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl
@@ -37,12 +37,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-<#assign titleVerb="${i18n().create_capitalized}">        
+<#assign titleVerb="${i18n().create_capitalized}">
 <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -56,22 +56,22 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#if orgLabelDisplayValue?has_content >
         <#assign orgLabelValue = orgLabelDisplayValue />
     </#if>
-        
+
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--Checking if any required fields are empty-->
         <#if lvf.submissionErrorExists(editSubmission, "orgLabel")>
  	        ${i18n().select_or_create_organization}
-        </#if> 
+        </#if>
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="grantAdministeredBy" role="region">
 
-<section id="grantAdministeredBy" role="region">        
-    
     <form id="grantAdministeredBy" class="customForm noIE67" action="${submitUrl}"  role="add/edit AdministeredGrant">
     <p>
         <label for="relatedIndLabel">${i18n().organization_capitalized} ${requiredHint}</label>
@@ -83,7 +83,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_organization}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="orgUri" name="existingOrganization" value="${existingOrgValue}" ${flagClearLabelForExisting}="true" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl
index 33ac469533..962e90123e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl
@@ -39,12 +39,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit" || editMode == "repair">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit" || editMode == "repair">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().add_capitalized}">        
+        <#assign titleVerb="${i18n().add_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -94,16 +94,16 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
          <#if lvf.submissionErrorExists(editSubmission, "roleType")>
  	        ${i18n().select_educational_training_value}<br />
         </#if>
-        
-        
+
+
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="grantHasContributorSection" role="region">
 
-<section id="grantHasContributorSection" role="region">        
-    
     <form id="grantHasContributor" class="customForm noIE67" action="${submitUrl}"  role="add/edit organizational training">
     <p >
         <label for="person">${i18n().person_capitalized}: ${i18n().last_name}  ${requiredHint}<span style="padding-left:322px">${i18n().first_name}  ${requiredHint}</span></label>
@@ -113,26 +113,26 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <input type="hidden" id="lastName" name="lastName" value="">
             <input class="display" type="hidden" acGroupName="person" id="personDisplay" name="personLabelDisplay" value="${personLabelDisplayValue}" >
     </p>
-        
+
     <div class="acSelection" acGroupName="person">
         <p class="inline">
             <label>${i18n().selected_person}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="personUri" name="existingPerson" value="${existingPersonValue}" ${flagClearLabelForExisting}="true" />
     </div>
-                                    
+
     <label for="roleType">${i18n().role_type} ${requiredHint}</label>
     <#assign roleTypeOpts = editConfiguration.pageData.roleType />
     <select name="roleType" style="margin-top:-2px" >
-        <option value="" <#if roleTypeValue == "">selected</#if>>${i18n().select_one}</option>                
-        <#list roleTypeOpts?keys as key>             
-            <option value="${key}"  <#if roleTypeValue == key>selected</#if>><#if roleTypeOpts[key] == "Other">${i18n().researcher_role}<#else>${roleTypeOpts[key]}</#if></option>         
+        <option value="" <#if roleTypeValue == "">selected</#if>>${i18n().select_one}</option>
+        <#list roleTypeOpts?keys as key>
+            <option value="${key}"  <#if roleTypeValue == key>selected</#if>><#if roleTypeOpts[key] == "Other">${i18n().researcher_role}<#else>${roleTypeOpts[key]}</#if></option>
         </#list>
     </select>
-    
+
   	<#--End draw elements-->
     <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
     <p class="submit">
@@ -168,7 +168,7 @@ $(document).ready(function() {
 </script>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl
index c2023b4ae5..bc5c197803 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl
@@ -1,8 +1,8 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
-Institutional Internal Class Form 
-To be associated later (upon completion of N3 Refactoring) with 
+<#--
+Institutional Internal Class Form
+To be associated later (upon completion of N3 Refactoring) with
 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.InstitutionalInternalClassForm.
 -->
 
@@ -16,7 +16,7 @@ edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.Institu
 <section role="region">
     <form method="POST" action="${formUrl}" class="customForm">
         <input type="hidden" name="submitForm" id="submitForm" value="true" />
-        
+
         <#--If no local ontologies, display message for user to create a local ontology-->
         <#if ontologiesExist = false>
         <section id="noLocalOntologyExists" role="region">
@@ -28,23 +28,23 @@ edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.Institu
             </#if>
             <p>${i18n().please_create} <a href='${urls.base}/editForm?controller=Ontology' title="${i18n().new_local_ontology}">${i18n().new_local_oncology}</a> ${i18n().return_here_to_define_class}</p>
         </section>
-        
+
         <#--else if local ontologies exist and local classes exist, show drop-down of local classes-->
-        <#elseif useExistingLocalClass?has_content> 
+        <#elseif useExistingLocalClass?has_content>
         <section id="existingLocalClass" role="region">
             <#--Populated based on class list returned-->
             <label for="existingLocalClasses">${i18n().select_existing_local_class}</label>
-       
+
             <select id="existingLocalClasses" name="existingLocalClasses" role="combobox"<strong></strong>>
                 <#assign classUris = existingLocalClasses?keys />
-                
+
                 <#--If internal class exists, check against value in drop-down and select option-->
                 <#--<option value="" role="option">${i18n().select_one}</option>-->
                 <#list classUris as localClassUri>
                     <option value="${localClassUri}" role="option" <#if existingInternalClass = localClassUri>selected</#if> >${existingLocalClasses[localClassUri]}</option>
                 </#list>
             </select>
-            
+
             <p>${i18n().cannot_find_class} <a href="${formUrl}?cmd=createClass" title="${i18n().create_new_class}">${i18n().create_new_one}</a>.</p>
         </section>
 
@@ -52,17 +52,17 @@ edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.Institu
         <#elseif createNewClass?has_content>
         <section id="createNewLocalClass" role="region">
             <h3>${i18n().create_new_class}</h3>
-        
+
             <label for="localClassName">${i18n().name_capitalized}<span class="requiredHint"> *</span></label>
             <input type="text" id="localClassName" name="localClassName" value="" role="input" />
             <p class="note">${i18n().use_capitals_each_word}</p>
-    
+
             <#--If more than one local namespace, generate select-->
             <#if multipleLocalNamespaces = true>
                 <label for="existingLocalNamespace">${i18n().local_namespace}<span class="requiredHint"> *</span></label>
-                
+
                 <select id="existingLocalNamespaces" name="existingLocalNamespaces" role="combobox">
-                    <#assign namespaceUris = existingLocalNamespaces?keys /> 
+                    <#assign namespaceUris = existingLocalNamespaces?keys />
                     <#list namespaceUris as existingNamespace>
                         <option value="${existingNamespace}" role="option">${existingLocalNamespaces[existingNamespace]}</option>
                     </#list>
@@ -71,7 +71,7 @@ edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.Institu
             <input type="hidden" id="existingLocalNamespaces" name="existingLocalNamespaces" value="${existingLocalNamespace}" />
             </#if>
         </section>
-    
+
         <#--this case is an error case-->
         <#else>
             <p>${i18n().problematic_section_error}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
index 9592842ae3..e711821351 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
@@ -3,20 +3,20 @@
 var addAuthorForm = {
 
     /* *** Initial page setup *** */
-   
+
     onLoad: function() {
-        
+
         if (this.disableFormInUnsupportedBrowsers()) {
             return;
-        }        
+        }
         this.mixIn();
-        this.initObjects();                 
-        this.initPage();       
+        this.initObjects();
+        this.initPage();
     },
 
-    disableFormInUnsupportedBrowsers: function() {       
+    disableFormInUnsupportedBrowsers: function() {
         var disableWrapper = $('#ie67DisableWrapper');
-        
+
         // Check for unsupported browsers only if the element exists on the page
         if (disableWrapper.length) {
             if (vitro.browserUtils.isIELessThan8()) {
@@ -24,32 +24,32 @@ var addAuthorForm = {
                 $('.noIE67').hide();
                 return true;
             }
-        }            
-        return false;      
+        }
+        return false;
     },
-        
+
     mixIn: function() {
         // Mix in the custom form utility methods
         $.extend(this, vitro.customFormUtils);
-        
+
         // Get the custom form data from the page
         $.extend(this, customFormData);
 
         // Get the i18n variables from the page
         $.extend(this, i18nStrings);
     },
-    
+
     // On page load, create references for easy access to form elements.
     // NB These must be assigned after the elements have been loaded onto the page.
     initObjects: function() {
-        
+
         this.form = $('#addAuthorForm');
         this.showFormButtonWrapper = $('#showAddForm');
         this.showFormButton = $('#showAddFormButton');
         this.removeAuthorshipLinks = $('a.remove');
         //this.undoLinks = $('a.undo');
         this.submit = this.form.find(':submit');
-        this.cancel = this.form.find('.cancel'); 
+        this.cancel = this.form.find('.cancel');
         this.acSelector = this.form.find('.acSelector');
         this.labelField = $('#label');
         this.firstNameField = $('#firstName');
@@ -63,11 +63,11 @@ var addAuthorForm = {
         this.selectedAuthor = $('#selectedAuthor');
         this.selectedAuthorName = $('#selectedAuthorName');
         this.acHelpTextClass = 'acSelectorWithHelpText';
-        this.verifyMatch = this.form.find('.verifyMatch');  
-        this.personRadio = $('input.person-radio');  
+        this.verifyMatch = this.form.find('.verifyMatch');
+        this.personRadio = $('input.person-radio');
         this.orgRadio = $('input.org-radio');
-        this.personSection = $('section#personFields');  
-        this.orgSection = $('section#organizationFields');  
+        this.personSection = $('section#personFields');
+        this.orgSection = $('section#organizationFields');
         this.orgName = $('input#orgName');
         this.orgNameWrapper = this.orgName.parent();
         this.orgUriField = $('input#orgUri');
@@ -76,52 +76,52 @@ var addAuthorForm = {
         this.orgLink = $('a#orgLink');
         this.personLink = $('a#personLink');
         this.returnLink = $('a#returnLink');
-        
+
         this.orgSection.hide();
     },
-    
+
     // Initial page setup. Called only at page load.
     initPage: function() {
 
         this.initAuthorshipData();
-            
+
         // Show elements hidden by CSS for the non-JavaScript-enabled version.
         // NB The non-JavaScript version of this form is currently not functional.
         this.removeAuthorshipLinks.show();
-        
+
         //this.undoLinks.hide();
-        
+
         this.bindEventListeners();
-        
+
         this.initAutocomplete();
-        
+
         this.initElementData();
 
         this.initAuthorDD();
-        
+
         if (this.findValidationErrors()) {
             this.initFormAfterInvalidSubmission();
         } else {
             this.initAuthorListOnlyView();
         }
     },
-    
-    
+
+
     /* *** Set up the various page views *** */
-   
-   // This initialization is done only on page load, not when returning to author list only view 
+
+   // This initialization is done only on page load, not when returning to author list only view
    // after hitting 'cancel.'
    initAuthorListOnlyView: function() {
-       
+
         if ($('li.authorship').length) {  // make sure we have at least one author
             // Reorder authors on page load so that previously unranked authors get a rank. Otherwise,
             // when we add a new author, it will get put ahead of any previously unranked authors, instead
-            // of at the end of the list. (It is also helpful to normalize the data before we get started.)            
+            // of at the end of the list. (It is also helpful to normalize the data before we get started.)
             this.reorderAuthors();
-        }        
-        this.showAuthorListOnlyView();       
+        }
+        this.showAuthorListOnlyView();
    },
-    
+
     // This view shows the list of existing authors and hides the form.
     // There is a button to show the form. We do this on page load, and after
     // hitting 'cancel' from full view.
@@ -141,9 +141,9 @@ var addAuthorForm = {
     // Initial view of add author form. We get here by clicking the show form button,
     // or by cancelling out of an autocomplete selection.
     initFormView: function() {
-        
+
         this.initForm();
-        
+
         // There's a conflict bewteen the last name fields .blur event and the cancel
         // button's click. So display the middle and first names along with the last name tlw72
         //this.hideFieldsForNewPerson();
@@ -152,20 +152,20 @@ var addAuthorForm = {
         // from showSelectedAuthor should do it. However, it doesn't work from there,
         // or in the cancel action, or if referring to this.lastNameField. None of those work,
         // however.
-        $('#lastName').val(''); 
+        $('#lastName').val('');
         // Set the initial autocomplete help text in the acSelector field.
         this.addAcHelpText(this.acSelector);
-        
-        return false; 
-        
+
+        return false;
+
     },
-    
+
     // Form initialization common to both a 'clean' form view and when
     // returning from an invalid submission.
     initForm: function() {
-        
+
         // Hide the button that shows the form
-        this.showFormButtonWrapper.hide(); 
+        this.showFormButtonWrapper.hide();
 
         this.hideSelectedPerson();
         this.hideSelectedOrg();
@@ -176,17 +176,17 @@ var addAuthorForm = {
             addAuthorForm.setAuthorType("person");
             return false;
         });
-        
+
         // Reset the last name field. It had been hidden if we selected an author from
         // the autocomplete field.
-        this.lastNameWrapper.show(); 
-        this.showFieldsForNewPerson();        
+        this.lastNameWrapper.show();
+        this.showFieldsForNewPerson();
 
         // Show the form
-        this.form.show();                 
+        this.form.show();
         //this.lastNameField.focus();
-    },   
-    
+    },
+
     hideSelectedPerson: function() {
         this.selectedAuthor.hide();
         this.selectedAuthorName.html('');
@@ -199,29 +199,29 @@ var addAuthorForm = {
         this.orgUriField.val('');
     },
 
-    showFieldsForNewPerson: function() {    
+    showFieldsForNewPerson: function() {
         this.firstNameWrapper.show();
         this.middleNameWrapper.show();
     },
 
-    hideFieldsForNewPerson: function() {   
-        this.hideFields(this.firstNameWrapper); 
-        this.hideFields(this.middleNameWrapper); 
+    hideFieldsForNewPerson: function() {
+        this.hideFields(this.firstNameWrapper);
+        this.hideFields(this.middleNameWrapper);
     },
-        
+
     /* *** Ajax initializations *** */
 
     /* Autocomplete */
     initAutocomplete: function() {
 
-        // Make cache a property of this so we can access it after removing 
+        // Make cache a property of this so we can access it after removing
         // an author.
-        this.acCache = {};  
+        this.acCache = {};
         this.setAcFilter();
         var $acField;
         var urlString;
         var authType;
-        
+
         if  ( this.personRadio.prop("checked") ) {
             $acField = this.lastNameField;
             urlString = addAuthorForm.acUrl + addAuthorForm.personUrl + addAuthorForm.tokenize;
@@ -231,7 +231,7 @@ var addAuthorForm = {
             $acField = this.orgName;
             urlString = addAuthorForm.acUrl + addAuthorForm.orgUrl + addAuthorForm.tokenize;
             authType = "org";
-        }  
+        }
         $acField.autocomplete({
             minLength: 2,
             source: function(request, response) {
@@ -241,7 +241,7 @@ var addAuthorForm = {
                     return;
                 }
                 // console.log('not getting term from cache');
-                
+
                 // If the url query params are too long, we could do a post
                 // here instead of a get. Add the exclude uris to the data
                 // rather than to the url.
@@ -250,13 +250,13 @@ var addAuthorForm = {
                     dataType: 'json',
                     data: {
                         term: request.term
-                    }, 
+                    },
                     complete: function(xhr, status) {
                         // Not sure why, but we need an explicit json parse here. jQuery
                         // should parse the response text and return a json object.
                         var results = jQuery.parseJSON(xhr.responseText),
                             filteredResults = addAuthorForm.filterAcResults(results);
-                        addAuthorForm.acCache[request.term] = filteredResults;  
+                        addAuthorForm.acCache[request.term] = filteredResults;
                         response(filteredResults);
                     }
 
@@ -269,32 +269,32 @@ var addAuthorForm = {
             // select event has been triggered. To trigger a select, the user must hit enter
             // or click on the selection with the mouse. This appears to confuse some users.
             select: function(event, ui) {
-                addAuthorForm.showSelectedAuthor(ui,authType); 
+                addAuthorForm.showSelectedAuthor(ui,authType);
             }
         });
 
     },
 
-    initElementData: function() {   
+    initElementData: function() {
         this.verifyMatch.data('baseHref', this.verifyMatch.attr('href'));
     },
 
     setAcFilter: function() {
         this.acFilter = [];
-        
+
         $('li.authorship').each(function() {
             var uri = $(this).data('authorUri');
             addAuthorForm.acFilter.push(uri);
          });
     },
-    
+
     removeAuthorFromAcFilter: function(author) {
         var index = $.inArray(author, this.acFilter);
         if (index > -1) { // this should always be true
             this.acFilter.splice(index, 1);
-        }   
+        }
     },
-    
+
     filterAcResults: function(results) {
         var filteredResults = [];
         if (!this.acFilter.length) {
@@ -311,9 +311,9 @@ var addAuthorForm = {
         });
         return filteredResults;
     },
-    
+
     // After removing an authorship, selectively clear matching autocomplete
-    // cache entries, else the associated author will not be included in 
+    // cache entries, else the associated author will not be included in
     // subsequent autocomplete suggestions.
     clearAcCacheEntries: function(name) {
         name = name.toLowerCase();
@@ -323,7 +323,7 @@ var addAuthorForm = {
             }
         });
     },
-    
+
     // Action taken after selecting an author from the autocomplete list
     showSelectedAuthor: function(ui,authType) {
 
@@ -340,17 +340,17 @@ var addAuthorForm = {
             // These get displayed if the selection was made through an enter keystroke,
             // since the keydown event on the last name field is also triggered (and
             // executes first). So re-hide them here.
-            this.hideFieldsForNewPerson(); 
+            this.hideFieldsForNewPerson();
             this.personLink.attr('href', this.verifyMatch.data('baseHref') + ui.item.uri);
         }
         else {
             // do the same as above but for the organization fields
-            this.orgUriField.val(ui.item.uri); 
+            this.orgUriField.val(ui.item.uri);
             this.selectedOrg.show();
 
             this.selectedOrgName.html(ui.item.label);
 
-            this.hideFields(this.orgNameWrapper); 
+            this.hideFields(this.orgNameWrapper);
 
             this.orgLink.attr('href', this.verifyMatch.data('baseHref') + ui.item.uri);
         }
@@ -363,29 +363,29 @@ var addAuthorForm = {
             return false;
         });
     },
-        
+
     /* Drag-and-drop */
     initAuthorDD: function() {
-        
+
         var authorshipList = $('#dragDropList'),
             authorships = authorshipList.children('li');
-        
+
         if (authorships.length < 2) {
             return;
         }
-        
+
         $('.authorNameWrapper').each(function() {
             $(this).attr('title', addAuthorForm.authorNameWrapperTitle);
         });
-        
+
         authorshipList.sortable({
             cursor: 'move',
             update: function(event, ui) {
                 addAuthorForm.reorderAuthors(event, ui);
             }
-        });     
+        });
     },
-    
+
     // Reorder authors. Called on page load and after author drag-and-drop and remove.
     // Event and ui parameters are defined only in the case of drag-and-drop.
     reorderAuthors: function(event, ui) {
@@ -406,83 +406,83 @@ var addAuthorForm = {
                 var pos;
                 $('li.authorship').each(function(index){
                     pos = index + 1;
-                    // Set the new position for this element. The only function of this value 
+                    // Set the new position for this element. The only function of this value
                     // is so we can reset an element to its original position in case reordering fails.
-                    addAuthorForm.setPosition(this, pos);                
+                    addAuthorForm.setPosition(this, pos);
                 });
                 // Set the form rank field value.
-                $('#rank').val(pos + 1);        
+                $('#rank').val(pos + 1);
             },
             error: function(request, status, error) {
                 // ui is undefined on page load and after an authorship removal.
                 if (ui) {
                     // Put the moved item back to its original position.
                     // Seems we need to do this by hand. Can't see any way to do it with jQuery UI. ??
-                    var pos = addAuthorForm.getPosition(ui.item),                       
-                        nextpos = pos + 1, 
-                        authorships = $('#dragDropList'), 
+                    var pos = addAuthorForm.getPosition(ui.item),
+                        nextpos = pos + 1,
+                        authorships = $('#dragDropList'),
                         next = addAuthorForm.findAuthorship('position', nextpos);
-                    
+
                     if (next.length) {
                         ui.item.insertBefore(next);
                     }
                     else {
                         ui.item.appendTo(authorships);
                     }
-                    
-                    alert(addAuthorForm.reorderAuthorsAlert);                                 
-                }      
+
+                    alert(addAuthorForm.reorderAuthorsAlert);
+                }
             }
-        });           
+        });
     },
-    
+
     // On page load, associate data with each authorship element. Then we don't
     // have to keep retrieving data from or modifying the DOM as we manipulate the
     // authorships.
     initAuthorshipData: function() {
         $('li.authorship').each(function(index) {
-            $(this).data(authorshipData[index]);    
-            
+            $(this).data(authorshipData[index]);
+
             // RY We might still need position to put back an element after reordering
             // failure. Rank might already have been reset? Check.
             // We also may need position to implement undo links: we want the removed authorship
             // to show up in the list, but it has no rank.
-            $(this).data('position', index+1);      
+            $(this).data('position', index+1);
         });
     },
 
     getPosition: function(authorship) {
         return $(authorship).data('position');
     },
-    
+
     setPosition: function(authorship, pos) {
         $(authorship).data('position', pos);
     },
-    
+
     findAuthorship: function(key, value) {
         var matchingAuthorship = $(); // if we don't find one, return an empty jQuery set
-        
+
         $('li.authorship').each(function() {
             var authorship = $(this);
             if ( authorship.data(key) === value ) {
-                matchingAuthorship = authorship; 
+                matchingAuthorship = authorship;
                 return false; // stop the loop
             }
         });
-         
-        return matchingAuthorship;       
+
+        return matchingAuthorship;
     },
-    
-               
-    /* *** Event listeners *** */ 
-   
+
+
+    /* *** Event listeners *** */
+
     bindEventListeners: function() {
-        
+
         this.showFormButton.click(function() {
             addAuthorForm.initFormView();
             return false;
         });
-        
+
         this.orgRadio.click(function() {
             addAuthorForm.setAuthorType("org");
         });
@@ -492,13 +492,13 @@ var addAuthorForm = {
         });
 
         this.form.submit(function() {
-            // NB Important JavaScript scope issue: if we call it this way, this = addAuthorForm 
+            // NB Important JavaScript scope issue: if we call it this way, this = addAuthorForm
             // in prepareSubmit. If we do this.form.submit(this.prepareSubmit); then
             // this != addAuthorForm in prepareSubmit.
             $selectedObj = addAuthorForm.form.find('input.acSelector');
             addAuthorForm.deleteAcHelpText($selectedObj);
-			addAuthorForm.prepareSubmit(); 
-        });     
+			addAuthorForm.prepareSubmit();
+        });
 
         this.lastNameField.blur(function() {
             // Cases where this event should be ignored:
@@ -514,29 +514,29 @@ var addAuthorForm = {
         this.personLink.click(function() {
             window.open($(this).attr('href'), 'verifyMatchWindow', 'width=640,height=640,scrollbars=yes,resizable=yes,status=yes,toolbar=no,menubar=no,location=no');
             return false;
-        });   
+        });
 
         this.orgLink.click(function() {
             window.open($(this).attr('href'), 'verifyMatchWindow', 'width=640,height=640,scrollbars=yes,resizable=yes,status=yes,toolbar=no,menubar=no,location=no');
             return false;
-        });   
+        });
 
     	this.acSelector.focus(function() {
         	addAuthorForm.deleteAcHelpText(this);
-    	});   
+    	});
 
     	this.acSelector.blur(function() {
         	addAuthorForm.addAcHelpText(this);
-    	}); 
-                
+    	});
+
     	this.orgName.focus(function() {
         	addAuthorForm.deleteAcHelpText(this);
-    	});   
+    	});
 
     	this.orgName.blur(function() {
         	addAuthorForm.addAcHelpText(this);
-    	}); 
-                
+    	});
+
         // When hitting enter in last name field, show first and middle name fields.
         // NB This event fires when selecting an autocomplete suggestion with the enter
         // key. Since it fires first, we undo its effects in the ac select event listener.
@@ -546,12 +546,12 @@ var addAuthorForm = {
                 return false; // don't submit form
             }
         });
-        
+
         this.removeAuthorshipLinks.click(function() {
             addAuthorForm.removeAuthorship(this);
             return false;
         });
-        
+
     },
 
     prepareSubmit: function() {
@@ -559,18 +559,18 @@ var addAuthorForm = {
             middleName,
             lastName,
             name;
-        
+
         // If selecting an existing person, don't submit name fields
         if (this.personUriField.val() != '' || this.orgUriField.val() != '' || this.orgName.val() != '' ) {
             this.firstNameField.attr('disabled', 'disabled');
             this.middleNameField.attr('disabled', 'disabled');
             this.lastNameField.attr('disabled', 'disabled');
-        } 
+        }
         else {
             firstName = this.firstNameField.val();
             middleName = this.middleNameField.val();
             lastName = this.lastNameField.val();
-            
+
             name = lastName;
             if (firstName) {
                 name += ', ' + firstName;
@@ -578,7 +578,7 @@ var addAuthorForm = {
             if (middleName) {
                 name += ' ' + middleName;
             }
-            
+
             this.labelField.val(name);
         }
 		// If user selected org via autocomplete, clear the org name field
@@ -586,32 +586,32 @@ var addAuthorForm = {
 			this.orgName.val("");
 		}
 
-    },    
-    
+    },
+
     onLastNameChange: function() {
         this.showFieldsForNewPerson();
         this.firstNameField.focus();
         // this.fixNames();
     },
-    
+
     // User may have typed first name as well as last name into last name field.
     // If so, when showing first and middle name fields, move anything after a comma
     // or space into the first name field.
     // RY Space is problematic because they may be entering "<firstname> <lastname>", but
-    // comma is a clear case. 
+    // comma is a clear case.
 //    fixNames: function() {
 //        var lastNameInput = this.lastNameField.val(),
-//            names = lastNameInput.split(/[, ]+/), 
+//            names = lastNameInput.split(/[, ]+/),
 //            lastName = names[0];
-// 
+//
 //        this.lastNameField.val(lastName);
-//        
+//
 //        if (names.length > 1) {
 //            //firstName = names[1].replace(/^[, ]+/, '');
 //            this.firstNameField.val(names[1]);
-//        } 
+//        }
 //    },
-     
+
     removeAuthorship: function(link) {
         // RY Upgrade this to a modal window
 
@@ -631,18 +631,18 @@ var addAuthorForm = {
         }
         else {
             addAuthorForm.cancel.hide();
-            $('img#indicatorTwo').removeClass('hidden');            
+            $('img#indicatorTwo').removeClass('hidden');
             addAuthorForm.submit.addClass('disabledSubmit');
             addAuthorForm.submit.attr('disabled','disabled');
         }
-              
+
         if ($(link)[0] === $('.remove:last')[0]) {
             removeLast = true;
-        } 
-        
+        }
+
         $.ajax({
             url: $(link).attr('href'),
-            type: 'POST', 
+            type: 'POST',
             data: {
                 deletion: $(link).parents('li.authorship').data('authorshipUri')
             },
@@ -651,39 +651,39 @@ var addAuthorForm = {
             complete: function(request, status) {
                 var authorship,
                     authorUri;
-            
+
                 if (status === 'success') {
-                    
+
                     authorship = $(this).parents('li.authorship');
-                
+
                     // Clear autocomplete cache entries matching this author's name, else
                     // autocomplete will be retrieved from the cache, which excludes the removed author.
                     addAuthorForm.clearAcCacheEntries(authorship.data('authorName'));
-                    
+
                     // Remove this author from the acFilter so it is included in autocomplete
                     // results again.
                     addAuthorForm.removeAuthorFromAcFilter(authorship.data('authorUri'));
-                    
+
                     authorship.fadeOut(400, function() {
                         var numAuthors;
- 
+
                         // For undo link: add to a deletedAuthorships array
-                        
-                        // Remove from the DOM                       
+
+                        // Remove from the DOM
                         $(this).remove();
-                        
+
                         // Actions that depend on the author having been removed from the DOM:
                         numAuthors = $('li.authorship').length; // retrieve the length after removing authorship from the DOM
-                        
+
                         // If removed item not last, reorder to remove any gaps
                         if (numAuthors > 0 && ! removeLast) {
                             addAuthorForm.reorderAuthors();
                         }
-                            
+
                         // If fewer than two authors remaining, disable drag-drop
                         if (numAuthors < 2) {
                             addAuthorForm.disableAuthorDD();
-                        }                           
+                        }
 
                         if ( $('img#indicatorOne').is(':visible') ) {
                             $('img#indicatorOne').fadeOut(100, function() {
@@ -711,25 +711,25 @@ var addAuthorForm = {
 
                 } else {
                     alert(addAuthorForm.removeAuthorshipAlert);
-                    
+
                 }
             }
-        });        
+        });
     },
-    
+
     // Disable DD and associated cues if only one author remains
     disableAuthorDD: function() {
         var authorships = $('#dragDropList'),
             authorNameWrapper = $('.authorNameWrapper');
-            
+
         authorships.sortable({ disable: true } );
-        
+
         // Use class dd rather than jQuery UI's class ui-sortable, so that we can remove
         // the class if there's fewer than one author. We don't want to remove the ui-sortable
         // class, in case we want to re-enable DD without a page reload (e.g., if implementing
-        // adding an author via Ajax request). 
+        // adding an author via Ajax request).
         authorships.removeClass('dd');
-              
+
         authorNameWrapper.removeAttr('title');
     },
 
@@ -748,13 +748,13 @@ var addAuthorForm = {
         else {
             typeText = addAuthorForm.organizationTypeText;
         }
-        
+
         if (!$(selectedObj).val()) {
 			$(selectedObj).val(addAuthorForm.helpTextSelect + " " + typeText + " " + addAuthorForm.helpTextAdd)
 						   .addClass(this.acHelpTextClass);
 		}
 	},
-	
+
 	deleteAcHelpText: function(selectedObj) {
 	    if ($(selectedObj).hasClass(this.acHelpTextClass)) {
 	            $(selectedObj).val('')
@@ -826,11 +826,11 @@ var addAuthorForm = {
 	        addAuthorForm.addAcHelpText(this.acSelector);
 	        addAuthorForm.initAutocomplete();
 	        addAuthorForm.hideSelectedOrg();
-	        
+
 	    }
     }
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     addAuthorForm.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js
index 78851c2c2d..1443d70300 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js
@@ -3,20 +3,20 @@
 var addConceptForm = {
 
     /* *** Initial page setup *** */
-   
+
     onLoad: function() {
-        
+
         if (this.disableFormInUnsupportedBrowsers()) {
             return;
-        }        
+        }
         this.mixIn();
-        this.initObjects();    
+        this.initObjects();
         this.initPage();
     },
 
-    disableFormInUnsupportedBrowsers: function() {       
+    disableFormInUnsupportedBrowsers: function() {
         var disableWrapper = $('#ie67DisableWrapper');
-        
+
         // Check for unsupported browsers only if the element exists on the page
         if (disableWrapper.length) {
             if (vitro.browserUtils.isIELessThan8()) {
@@ -24,8 +24,8 @@ var addConceptForm = {
                 $('.noIE67').hide();
                 return true;
             }
-        }            
-        return false;      
+        }
+        return false;
     },
 
     mixIn: function() {
@@ -38,11 +38,11 @@ var addConceptForm = {
     },
     // On page load, create references for easy access to form elements.
     initObjects: function() {
-        
+
         this.form = $('#addConceptForm');
         this.showFormButtonWrapper = $('#showAddForm');
         this.submit = this.form.find(':submit');
-        this.cancel = this.form.find('.cancel'); 
+        this.cancel = this.form.find('.cancel');
         //Add term
         this.addConceptButton = $('#showAddFormButton');
         //section where results should be displayed
@@ -69,11 +69,11 @@ var addConceptForm = {
         this.maxNumberAlternateLabels = 4;
         this.numberOfMaxInitialSearchResults = 7;
     },
-    
+
     initPage: function() {
     	this.initConceptData();
         this.bindEventListeners();
-              
+
     },
     bindEventListeners: function() {
     	this.searchSubmit.click(function() {
@@ -81,14 +81,14 @@ var addConceptForm = {
             addConceptForm.submitSearchTerm();
             return false;
          });
-    	
+
     	this.form.submit(function() {
-			return addConceptForm.prepareSubmit(); 
-        });     
-    	
+			return addConceptForm.prepareSubmit();
+        });
+
     	this.addConceptButton.click(function() {
     		addConceptForm.initForm();
-    		
+
     	});
     	 this.removeConceptLinks.click(function() {
              addConceptForm.removeExistingConcept(this);
@@ -101,7 +101,7 @@ var addConceptForm = {
     },
     initForm: function() {
         // Hide the button that shows the form
-        this.showFormButtonWrapper.hide(); 
+        this.showFormButtonWrapper.hide();
         this.clearSearchResults();
         // Hide the create own link, add selected button and "or"" span
         this.orSpan.hide();
@@ -114,15 +114,15 @@ var addConceptForm = {
         this.loadingIndicator.addClass("hidden");
         this.showHideSearchResults.hide();
         // Show the form
-        this.form.show();                 
-    },   
+        this.form.show();
+    },
  // On page load, associate data with each existing term  element. Then we don't
     // have to keep retrieving data from or modifying the DOM as we manipulate the
     // authorships.
     initConceptData: function() {
         $('.existingConcept').each(function(index) {
-            $(this).data(existingConceptsData[index]);    
-            $(this).data('position', index+1);      
+            $(this).data(existingConceptsData[index]);
+            $(this).data('position', index+1);
         });
     },
     clearSearchResults:function() {
@@ -221,7 +221,7 @@ var addConceptForm = {
                 } else {
                 	htmlAdd+= "<p>" + addConceptForm.noResultsFound + "</p>";
                 }
-            	
+
             }
             if(htmlAdd.length) {
             	//hide the loading icon again
@@ -303,7 +303,7 @@ var addConceptForm = {
     	var conceptSemanticTypes = [];
     	var conceptBroaderUris = []; //each array element can be a string which is comma delimited for multiple uris
     	var conceptNarrowerUris = [];//same as above
-    	
+
     	checkedElements.each(function() {
     		checkedConceptElement = $(this);
     		checkedConcept = checkedConceptElement.val();
@@ -328,25 +328,25 @@ var addConceptForm = {
     	//would belong to which concept
     	this.externalConceptBroaderUris.val(JSON.stringify(conceptBroaderUris));
     	this.externalConceptNarrowerUris.val(JSON.stringify(conceptNarrowerUris));
-    	
+
     	return true;
-    }, 
+    },
     generateIndividualConceptDisplay: function(cuiURI, label, altLabels, definition, type, definedBy, isBestMatch, broaderUris, narrowerUris) {
-    	var htmlAdd = "<li class='concepts'>" + 
+    	var htmlAdd = "<li class='concepts'>" +
     	"<div class='row'>" +
         "<div class='col-12'>" +
     	"<div class='column conceptLabel'>" +
-    	addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy, broaderUris, narrowerUris) +  
-    	addConceptForm.generateIndividualLabelsDisplay(label, altLabels) + addConceptForm.generateIndividualTypeDisplay(type) + "</div>" + 
-    	addConceptForm.generateIndividualDefinitionDisplay(definition) + 
+    	addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy, broaderUris, narrowerUris) +
+    	addConceptForm.generateIndividualLabelsDisplay(label, altLabels) + addConceptForm.generateIndividualTypeDisplay(type) + "</div>" +
+    	addConceptForm.generateIndividualDefinitionDisplay(definition) +
     	addConceptForm.generateBestOrAlternate(isBestMatch) +
     	"</div>" +
         "</div>" +
         "</li>";
     	return htmlAdd;
-    }, 
+    },
     generateIndividualCUIInput:function(cuiURI, label, type, definedBy, broaderUris, narrowerUris) {
-    	return 	"<input type='checkbox'  name='CUI' value='" + cuiURI + "' label='" + 
+    	return 	"<input type='checkbox'  name='CUI' value='" + cuiURI + "' label='" +
     		label + "' conceptType='" + type + "' conceptDefinedBy='" + definedBy + "' " +
     		"broaderUris='" + broaderUris + "' narrowerUris='" + narrowerUris + "'/>";
     },
@@ -355,7 +355,7 @@ var addConceptForm = {
     	var labelDisplay = label;
     	var displayAltLabels = altLabels;
     	if(altLabels != null && altLabels.length > 0) {
-    		//Certain vocabulary services might return a long list of alternate labels, in which case we will show fewer 
+    		//Certain vocabulary services might return a long list of alternate labels, in which case we will show fewer
     		//display only upto a certain number of alternate labels and use an ellipsis to signify there
     		//are additional terms
     		if(altLabels.length > addConceptForm.maxNumberAlternateLabels) {
@@ -373,7 +373,7 @@ var addConceptForm = {
     },
     generateIndividualDefinitionDisplay:function(definition) {
     	//The definition in some cases may be an empty string, so to prevent the div
-    	//from not appearing, we are replacing with 
+    	//from not appearing, we are replacing with
     	if(definition == null || definition.length == 0) {
     		//definition = "&nbsp;";
     		definition = "No definition provided.";
@@ -386,7 +386,7 @@ var addConceptForm = {
     	if(isBestMatch) {
     		className = "bestMatchFlag";
     	}
-    	return "<div class='column'><div class='" + className + "'>&nbsp;</div></div>";	
+    	return "<div class='column'><div class='" + className + "'>&nbsp;</div></div>";
     },
     //Certain vocabulary services return a great number of results, we would like the ability to show more or less of those results
     displayUptoMaxResults:function() {
@@ -398,7 +398,7 @@ var addConceptForm = {
             addConceptForm.showHideSearchResults.find("a#showHideLink").html(addConceptForm.displayMoreEllipsis);
             addConceptForm.showHideSearchResults.find("a#showHideLink").addClass("showmore");
     	}
-    	
+
     },
     validateConceptSelection:function(checkedElements) {
     	var numberElements = checkedElements.length;
@@ -407,27 +407,27 @@ var addConceptForm = {
     		return false;
     	}
     	return true;
-    }, 
+    },
     showUncheckedSourceError:function() {
 		addConceptForm.errors.html("<p class='validationError'>" + addConceptForm.selectVocSource + "</p>");
     },
     removeExistingConcept: function(link) {
         var removeLast = false,
             message = addConceptForm.confirmTermDelete;
-            
+
         if (!confirm(message)) {
             return false;
         }
-        
+
         if ($(link)[0] === $('.remove:last')[0]) {
             removeLast = true;
-        } 
+        }
         //Using primitive rdf edit which expects an n3 string for deletion
         $.ajax({
             url: $(link).attr('href'),
-            type: 'POST', 
+            type: 'POST',
             data: {
-        		additions: '', 
+        		additions: '',
                 retractions: addConceptForm.generateDeletionN3($(link).parents('.existingConcept').data('conceptNodeUri'))
             },
             dataType: 'json',
@@ -435,24 +435,24 @@ var addConceptForm = {
             complete: function(request, status) {
                 var existingConcept,
                     conceptNodeUri;
-            
+
                 if (status === 'success') {
-                    
+
                     existingConcept = $(this).parents('.existingConcept');
                     existingConcept.fadeOut(400, function() {
                         var numConcepts;
                         // For undo link: add to a deletedAuthorships array
-                        // Remove from the DOM                       
+                        // Remove from the DOM
                         $(this).remove();
                         // Actions that depend on the author having been removed from the DOM:
-                        numConcepts = $('.existingConcept').length; // retrieve the length after removing authorship from the DOM        
+                        numConcepts = $('.existingConcept').length; // retrieve the length after removing authorship from the DOM
                     });
 
                 } else {
                     alert(addConceptForm.errorTernNotRemoved);
                 }
             }
-        });        
+        });
     },
     generateDeletionN3: function(conceptNodeUri) {
     	var n3String = "<" + addConceptForm.subjectUri + "> <" + addConceptForm.predicateUri + "> <" + conceptNodeUri + "> .";
@@ -464,6 +464,6 @@ var addConceptForm = {
     }
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     addConceptForm.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js
index e39c64fd7b..ebc103399e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js
@@ -3,20 +3,20 @@
 var addEditorForm = {
 
     /* *** Initial page setup *** */
-   
+
     onLoad: function() {
-        
+
         if (this.disableFormInUnsupportedBrowsers()) {
             return;
-        }        
+        }
         this.mixIn();
-        this.initObjects();                 
-        this.initPage();       
+        this.initObjects();
+        this.initPage();
     },
 
-    disableFormInUnsupportedBrowsers: function() {       
+    disableFormInUnsupportedBrowsers: function() {
         var disableWrapper = $('#ie67DisableWrapper');
-        
+
         // Check for unsupported browsers only if the element exists on the page
         if (disableWrapper.length) {
             if (vitro.browserUtils.isIELessThan8()) {
@@ -24,32 +24,32 @@ var addEditorForm = {
                 $('.noIE67').hide();
                 return true;
             }
-        }            
-        return false;      
+        }
+        return false;
     },
-        
+
     mixIn: function() {
         // Mix in the custom form utility methods
         $.extend(this, vitro.customFormUtils);
-        
+
         // Get the custom form data from the page
         $.extend(this, customFormData);
 
         // Get the i18n variables from the page
         $.extend(this, i18nStrings);
     },
-    
+
     // On page load, create references for easy access to form elements.
     // NB These must be assigned after the elements have been loaded onto the page.
     initObjects: function() {
-        
+
         this.form = $('#addEditorForm');
         this.showFormButtonWrapper = $('#showAddForm');
         this.showFormButton = $('#showAddFormButton');
         this.removeEditorshipLinks = $('a.remove');
         //this.undoLinks = $('a.undo');
         this.submit = this.form.find(':submit');
-        this.cancel = this.form.find('.cancel'); 
+        this.cancel = this.form.find('.cancel');
         this.acSelector = this.form.find('.acSelector');
         this.labelField = $('#label');
         this.firstNameField = $('#firstName');
@@ -63,54 +63,54 @@ var addEditorForm = {
         this.selectedEditor = $('#selectedEditor');
         this.selectedEditorName = $('#selectedEditorName');
         this.acHelpTextClass = 'acSelectorWithHelpText';
-        this.verifyMatch = this.form.find('.verifyMatch');  
-        this.personSection = $('section#personFields');  
+        this.verifyMatch = this.form.find('.verifyMatch');
+        this.personSection = $('section#personFields');
         this.personLink = $('a#personLink');
         this.returnLink = $('a#returnLink');
     },
-    
+
     // Initial page setup. Called only at page load.
     initPage: function() {
 
         this.initEditorshipData();
-            
+
         // Show elements hidden by CSS for the non-JavaScript-enabled version.
         // NB The non-JavaScript version of this form is currently not functional.
         this.removeEditorshipLinks.show();
-        
+
         //this.undoLinks.hide();
-        
+
         this.bindEventListeners();
-        
+
         this.initAutocomplete();
-        
+
         this.initElementData();
 
         this.initEditorDD();
-        
+
         if (this.findValidationErrors()) {
             this.initFormAfterInvalidSubmission();
         } else {
             this.initEditorListOnlyView();
         }
     },
-    
-    
+
+
     /* *** Set up the various page views *** */
-   
-   // This initialization is done only on page load, not when returning to editor list only view 
+
+   // This initialization is done only on page load, not when returning to editor list only view
    // after hitting 'cancel.'
    initEditorListOnlyView: function() {
-       
+
         if ($('.editorship').length) {  // make sure we have at least one editor
             // Reorder editors on page load so that previously unranked editors get a rank. Otherwise,
             // when we add a new editor, it will get put ahead of any previously unranked editors, instead
-            // of at the end of the list. (It is also helpful to normalize the data before we get started.)            
+            // of at the end of the list. (It is also helpful to normalize the data before we get started.)
             this.reorderEditors();
-        }        
-        this.showEditorListOnlyView();       
+        }
+        this.showEditorListOnlyView();
    },
-    
+
     // This view shows the list of existing editors and hides the form.
     // There is a button to show the form. We do this on page load, and after
     // hitting 'cancel' from full view.
@@ -130,9 +130,9 @@ var addEditorForm = {
     // Initial view of add editor form. We get here by clicking the show form button,
     // or by cancelling out of an autocomplete selection.
     initFormView: function() {
-        
+
         this.initForm();
-        
+
         // There's a conflict bewteen the last name fields .blur event and the cancel
         // button's click. So display the middle and first names along with the last name tlw72
         //this.hideFieldsForNewPerson();
@@ -141,20 +141,20 @@ var addEditorForm = {
         // from showSelectedEditor should do it. However, it doesn't work from there,
         // or in the cancel action, or if referring to this.lastNameField. None of those work,
         // however.
-        $('#lastName').val(''); 
+        $('#lastName').val('');
         // Set the initial autocomplete help text in the acSelector field.
         this.addAcHelpText(this.acSelector);
-        
-        return false; 
-        
+
+        return false;
+
     },
-    
+
     // Form initialization common to both a 'clean' form view and when
     // returning from an invalid submission.
     initForm: function() {
-        
+
         // Hide the button that shows the form
-        this.showFormButtonWrapper.hide(); 
+        this.showFormButtonWrapper.hide();
 
         this.hideSelectedPerson();
 
@@ -164,46 +164,46 @@ var addEditorForm = {
             addEditorForm.setEditorType("person");
             return false;
         });
-        
+
         // Reset the last name field. It had been hidden if we selected an editor from
         // the autocomplete field.
-        this.lastNameWrapper.show(); 
-        this.showFieldsForNewPerson();        
+        this.lastNameWrapper.show();
+        this.showFieldsForNewPerson();
 
         // Show the form
-        this.form.show();                 
+        this.form.show();
         //this.lastNameField.focus();
-    },   
-    
+    },
+
     hideSelectedPerson: function() {
         this.selectedEditor.hide();
         this.selectedEditorName.html('');
         this.personUriField.val('');
     },
 
-    showFieldsForNewPerson: function() {    
+    showFieldsForNewPerson: function() {
         this.firstNameWrapper.show();
         this.middleNameWrapper.show();
     },
 
-    hideFieldsForNewPerson: function() {   
-        this.hideFields(this.firstNameWrapper); 
-        this.hideFields(this.middleNameWrapper); 
+    hideFieldsForNewPerson: function() {
+        this.hideFields(this.firstNameWrapper);
+        this.hideFields(this.middleNameWrapper);
     },
-        
+
     /* *** Ajax initializations *** */
 
     /* Autocomplete */
     initAutocomplete: function() {
 
-        // Make cache a property of this so we can access it after removing 
+        // Make cache a property of this so we can access it after removing
         // an editor.
-        this.acCache = {};  
+        this.acCache = {};
         this.setAcFilter();
         var $acField = this.lastNameField;
         var urlString = addEditorForm.acUrl + addEditorForm.personUrl + addEditorForm.tokenize;
         var authType = "person";
-        
+
         $acField.autocomplete({
             minLength: 2,
             source: function(request, response) {
@@ -213,7 +213,7 @@ var addEditorForm = {
                     return;
                 }
                 // console.log('not getting term from cache');
-                
+
                 // If the url query params are too long, we could do a post
                 // here instead of a get. Add the exclude uris to the data
                 // rather than to the url.
@@ -222,13 +222,13 @@ var addEditorForm = {
                     dataType: 'json',
                     data: {
                         term: request.term
-                    }, 
+                    },
                     complete: function(xhr, status) {
                         // Not sure why, but we need an explicit json parse here. jQuery
                         // should parse the response text and return a json object.
                         var results = jQuery.parseJSON(xhr.responseText),
                             filteredResults = addEditorForm.filterAcResults(results);
-                        addEditorForm.acCache[request.term] = filteredResults;  
+                        addEditorForm.acCache[request.term] = filteredResults;
                         response(filteredResults);
                     }
 
@@ -241,32 +241,32 @@ var addEditorForm = {
             // select event has been triggered. To trigger a select, the user must hit enter
             // or click on the selection with the mouse. This appears to confuse some users.
             select: function(event, ui) {
-                addEditorForm.showSelectedEditor(ui,authType); 
+                addEditorForm.showSelectedEditor(ui,authType);
             }
         });
 
     },
 
-    initElementData: function() {   
+    initElementData: function() {
         this.verifyMatch.data('baseHref', this.verifyMatch.attr('href'));
     },
 
     setAcFilter: function() {
         this.acFilter = [];
-        
+
         $('.editorship').each(function() {
             var uri = $(this).data('editorUri');
             addEditorForm.acFilter.push(uri);
          });
     },
-    
+
     removeEditorFromAcFilter: function(editor) {
         var index = $.inArray(editor, this.acFilter);
         if (index > -1) { // this should always be true
             this.acFilter.splice(index, 1);
-        }   
+        }
     },
-    
+
     filterAcResults: function(results) {
         var filteredResults = [];
         if (!this.acFilter.length) {
@@ -283,9 +283,9 @@ var addEditorForm = {
         });
         return filteredResults;
     },
-    
+
     // After removing an editorship, selectively clear matching autocomplete
-    // cache entries, else the associated editor will not be included in 
+    // cache entries, else the associated editor will not be included in
     // subsequent autocomplete suggestions.
     clearAcCacheEntries: function(name) {
         name = name.toLowerCase();
@@ -295,7 +295,7 @@ var addEditorForm = {
             }
         });
     },
-    
+
     // Action taken after selecting an editor from the autocomplete list
     showSelectedEditor: function(ui,authType) {
 
@@ -312,7 +312,7 @@ var addEditorForm = {
             // These get displayed if the selection was made through an enter keystroke,
             // since the keydown event on the last name field is also triggered (and
             // executes first). So re-hide them here.
-            this.hideFieldsForNewPerson(); 
+            this.hideFieldsForNewPerson();
             this.personLink.attr('href', this.verifyMatch.data('baseHref') + ui.item.uri);
         }
 
@@ -324,29 +324,29 @@ var addEditorForm = {
             return false;
         });
     },
-        
+
     /* Drag-and-drop */
     initEditorDD: function() {
-        
+
         var editorshipList = $('#dragDropList'),
             editorships = editorshipList.children('li');
-        
+
         if (editorships.length < 2) {
             return;
         }
-        
+
         $('.editorNameWrapper').each(function() {
             $(this).attr('title', addEditorForm.editorNameWrapperTitle);
         });
-        
+
         editorshipList.sortable({
             cursor: 'move',
             update: function(event, ui) {
                 addEditorForm.reorderEditors(event, ui);
             }
-        });     
+        });
     },
-    
+
     // Reorder editors. Called on page load and after editor drag-and-drop and remove.
     // Event and ui parameters are defined only in the case of drag-and-drop.
     reorderEditors: function(event, ui) {
@@ -367,91 +367,91 @@ var addEditorForm = {
                 var pos;
                 $('.editorship').each(function(index){
                     pos = index + 1;
-                    // Set the new position for this element. The only function of this value 
+                    // Set the new position for this element. The only function of this value
                     // is so we can reset an element to its original position in case reordering fails.
-                    addEditorForm.setPosition(this, pos);                
+                    addEditorForm.setPosition(this, pos);
                 });
                 // Set the form rank field value.
-                $('#rank').val(pos + 1);        
+                $('#rank').val(pos + 1);
             },
             error: function(request, status, error) {
                 // ui is undefined on page load and after an editorship removal.
                 if (ui) {
                     // Put the moved item back to its original position.
                     // Seems we need to do this by hand. Can't see any way to do it with jQuery UI. ??
-                    var pos = addEditorForm.getPosition(ui.item),                       
-                        nextpos = pos + 1, 
-                        editorships = $('#dragDropList'), 
+                    var pos = addEditorForm.getPosition(ui.item),
+                        nextpos = pos + 1,
+                        editorships = $('#dragDropList'),
                         next = addEditorForm.findEditorship('position', nextpos);
-                    
+
                     if (next.length) {
                         ui.item.insertBefore(next);
                     }
                     else {
                         ui.item.appendTo(editorships);
                     }
-                    
-                    alert(addEditorForm.reorderEditorsAlert);                                 
-                }      
+
+                    alert(addEditorForm.reorderEditorsAlert);
+                }
             }
-        });           
+        });
     },
-    
+
     // On page load, associate data with each editorship element. Then we don't
     // have to keep retrieving data from or modifying the DOM as we manipulate the
     // editorships.
     initEditorshipData: function() {
         $('.editorship').each(function(index) {
-            $(this).data(editorshipData[index]);    
-            
+            $(this).data(editorshipData[index]);
+
             // RY We might still need position to put back an element after reordering
             // failure. Rank might already have been reset? Check.
             // We also may need position to implement undo links: we want the removed editorship
             // to show up in the list, but it has no rank.
-            $(this).data('position', index+1);      
+            $(this).data('position', index+1);
         });
     },
 
     getPosition: function(editorship) {
         return $(editorship).data('position');
     },
-    
+
     setPosition: function(editorship, pos) {
         $(editorship).data('position', pos);
     },
-    
+
     findEditorship: function(key, value) {
         var matchingEditorship = $(); // if we don't find one, return an empty jQuery set
-        
+
         $('.editorship').each(function() {
             var editorship = $(this);
             if ( editorship.data(key) === value ) {
-                matchingEditorship = editorship; 
+                matchingEditorship = editorship;
                 return false; // stop the loop
             }
         });
-         
-        return matchingEditorship;       
+
+        return matchingEditorship;
     },
-    
-               
-    /* *** Event listeners *** */ 
-   
+
+
+    /* *** Event listeners *** */
+
     bindEventListeners: function() {
-        
+
         this.showFormButton.click(function() {
             addEditorForm.initFormView();
             return false;
         });
-        
+
         this.form.submit(function() {
-            // NB Important JavaScript scope issue: if we call it this way, this = addEditorForm 
+            // NB Important JavaScript scope issue: if we call it this way, this = addEditorForm
             // in prepareSubmit. If we do this.form.submit(this.prepareSubmit); then
             // this != addEditorForm in prepareSubmit.
             $selectedObj = addEditorForm.form.find('input.acSelector');
             addEditorForm.deleteAcHelpText($selectedObj);
-			addEditorForm.prepareSubmit(); 
-        });     
+			addEditorForm.prepareSubmit();
+        });
 
         this.lastNameField.blur(function() {
             // Cases where this event should be ignored:
@@ -467,16 +467,16 @@ var addEditorForm = {
         this.personLink.click(function() {
             window.open($(this).attr('href'), 'verifyMatchWindow', 'width=640,height=640,scrollbars=yes,resizable=yes,status=yes,toolbar=no,menubar=no,location=no');
             return false;
-        });   
+        });
 
     	this.acSelector.focus(function() {
         	addEditorForm.deleteAcHelpText(this);
-    	});   
+    	});
 
     	this.acSelector.blur(function() {
         	addEditorForm.addAcHelpText(this);
-    	}); 
-                                
+    	});
+
         // When hitting enter in last name field, show first and middle name fields.
         // NB This event fires when selecting an autocomplete suggestion with the enter
         // key. Since it fires first, we undo its effects in the ac select event listener.
@@ -486,12 +486,12 @@ var addEditorForm = {
                 return false; // don't submit form
             }
         });
-        
+
         this.removeEditorshipLinks.click(function() {
             addEditorForm.removeEditorship(this);
             return false;
         });
-        
+
     },
 
     prepareSubmit: function() {
@@ -499,18 +499,18 @@ var addEditorForm = {
             middleName,
             lastName,
             name;
-        
+
         // If selecting an existing person, don't submit name fields
         if (this.personUriField.val() != '' ) {
             this.firstNameField.attr('disabled', 'disabled');
             this.middleNameField.attr('disabled', 'disabled');
             this.lastNameField.attr('disabled', 'disabled');
-        } 
+        }
         else {
             firstName = this.firstNameField.val();
             middleName = this.middleNameField.val();
             lastName = this.lastNameField.val();
-            
+
             name = lastName;
             if (firstName) {
                 name += ', ' + firstName;
@@ -518,18 +518,18 @@ var addEditorForm = {
             if (middleName) {
                 name += ' ' + middleName;
             }
-            
+
             this.labelField.val(name);
         }
 
-    },    
-    
+    },
+
     onLastNameChange: function() {
         this.showFieldsForNewPerson();
         this.firstNameField.focus();
         // this.fixNames();
     },
-         
+
     removeEditorship: function(link) {
         // RY Upgrade this to a modal window
 
@@ -549,18 +549,18 @@ var addEditorForm = {
         }
         else {
             addEditorForm.cancel.hide();
-            $('img#indicatorTwo').removeClass('hidden');            
+            $('img#indicatorTwo').removeClass('hidden');
             addEditorForm.submit.addClass('disabledSubmit');
             addEditorForm.submit.attr('disabled','disabled');
         }
-              
+
         if ($(link)[0] === $('.remove:last')[0]) {
             removeLast = true;
-        } 
-        
+        }
+
         $.ajax({
             url: $(link).attr('href'),
-            type: 'POST', 
+            type: 'POST',
             data: {
                 deletion: $(link).parents('.editorship').data('editorshipUri')
             },
@@ -569,39 +569,39 @@ var addEditorForm = {
             complete: function(request, status) {
                 var editorship,
                     editorUri;
-            
+
                 if (status === 'success') {
-                    
+
                     editorship = $(this).parents('.editorship');
-                
+
                     // Clear autocomplete cache entries matching this editor's name, else
                     // autocomplete will be retrieved from the cache, which excludes the removed editor.
                     addEditorForm.clearAcCacheEntries(editorship.data('editorName'));
-                    
+
                     // Remove this editor from the acFilter so it is included in autocomplete
                     // results again.
                     addEditorForm.removeEditorFromAcFilter(editorship.data('editorUri'));
-                    
+
                     editorship.fadeOut(400, function() {
                         var numEditors;
- 
+
                         // For undo link: add to a deletedEditorships array
-                        
-                        // Remove from the DOM                       
+
+                        // Remove from the DOM
                         $(this).remove();
-                        
+
                         // Actions that depend on the editor having been removed from the DOM:
                         numEditors = $('.editorship').length; // retrieve the length after removing editorship from the DOM
-                        
+
                         // If removed item not last, reorder to remove any gaps
                         if (numEditors > 0 && ! removeLast) {
                             addEditorForm.reorderEditors();
                         }
-                            
+
                         // If fewer than two editors remaining, disable drag-drop
                         if (numEditors < 2) {
                             addEditorForm.disableEditorDD();
-                        }                           
+                        }
 
                         if ( $('img#indicatorOne').is(':visible') ) {
                             $('img#indicatorOne').fadeOut(100, function() {
@@ -629,25 +629,25 @@ var addEditorForm = {
 
                 } else {
                     alert(addEditorForm.removeEditorshipAlert);
-                    
+
                 }
             }
-        });        
+        });
     },
-    
+
     // Disable DD and associated cues if only one editor remains
     disableEditorDD: function() {
         var editorships = $('#dragDropList'),
             editorNameWrapper = $('.editorNameWrapper');
-            
+
         editorships.sortable({ disable: true } );
-        
+
         // Use class dd rather than jQuery UI's class ui-sortable, so that we can remove
         // the class if there's fewer than one editor. We don't want to remove the ui-sortable
         // class, in case we want to re-enable DD without a page reload (e.g., if implementing
-        // adding an editor via Ajax request). 
+        // adding an editor via Ajax request).
         editorships.removeClass('dd');
-              
+
         editorNameWrapper.removeAttr('title');
     },
 
@@ -663,13 +663,13 @@ var addEditorForm = {
         if ( $(selectedObj).attr('id') == "lastName" ) {
             typeText = addEditorForm.editorTypeText;
         }
-        
+
         if (!$(selectedObj).val()) {
 			$(selectedObj).val(addEditorForm.helpTextSelect + " " + typeText + " " + addEditorForm.helpTextAdd)
 						   .addClass(this.acHelpTextClass);
 		}
 	},
-	
+
 	deleteAcHelpText: function(selectedObj) {
 	    if ($(selectedObj).hasClass(this.acHelpTextClass)) {
 	            $(selectedObj).val('')
@@ -698,6 +698,6 @@ var addEditorForm = {
     }
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     addEditorForm.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
index 99fa9fb0c3..8fea0f7b2c 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
@@ -4,28 +4,28 @@
 var addOrcidIdToPersonUtils = {
 
     onLoad: function() {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#personHasOrcidId');
     this.orcidId = $('#orcidId');
     this.orcidIdDisplay = $('#orcidIdDisplay');
 
     },
-    
+
     bindEventListeners: function() {
 
         this.form.submit(function() {
             addOrcidIdToPersonUtils.buildOrcidIdURL();
-        });    
-    
+        });
+
     },
-    
+
     buildOrcidIdURL: function() {
-        
+
         var orcidBase = "http://orcid.org/";
         var orcidIdVal = "";
         if ( this.orcidIdDisplay.val().length > 0 ) {
@@ -38,8 +38,8 @@ var addOrcidIdToPersonUtils = {
             }
         }
     },
-       
+
 }
-$(document).ready(function() {   
+$(document).ready(function() {
     addOrcidIdToPersonUtils.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
index 0c586b04da..4266b89d29 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
@@ -1,17 +1,17 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var adviseeRelUtils = {
-        
+
     onLoad: function(subject,blankSentinel) {
         this.subjName = '';
         if ( subject ) { this.subjName = subject; }
-        
+
         this.sentinel = '';
         if ( blankSentinel ) { this.sentinel = blankSentinel; }
 
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        
+
         $.extend(this, vitro.customFormUtils);
         $.extend(this, i18nStrings);
 
@@ -21,7 +21,7 @@ var adviseeRelUtils = {
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#personHasAdvisingRelationship');
     this.adRelshiplabel = $('#advisingRelLabel');
     this.advisor = $('#advisor');
@@ -33,33 +33,33 @@ var adviseeRelUtils = {
     this.subjAreaUri = $('#subjAreaUri');
     this.saveAdvisorLabel = $('#saveAdvisorLabel');
     this.advisorAcSelection = $('div#advisorAcSelection');
-    
+
 
     // may not need this
     this.firstName.attr('disabled', false);
-    
+
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         // we want to use the advisor label in the relationship label.
         // since the former gets cleared on submit in some cases, store
         // the value in a hidden field and map to relationship label
         this.advisor.change( function(objEvent) {
-           window.setTimeout('adviseeRelUtils.mapAdvisorValue()', 180); 
+           window.setTimeout('adviseeRelUtils.mapAdvisorValue()', 180);
         });
         this.advisor.blur( function(objEvent) {
-           window.setTimeout('adviseeRelUtils.mapAdvisorValue()', 180); 
+           window.setTimeout('adviseeRelUtils.mapAdvisorValue()', 180);
         });
-        
-        
+
+
         this.form.submit(function() {
             adviseeRelUtils.resolveAdvisorNames();
             adviseeRelUtils.buildAdvisingRelLabel();
-        });            
+        });
     },
-    
+
     mapAdvisorValue: function() {
        if ( this.advisorAcSelection.attr('class').indexOf('userSelected') != -1 ) {
            this.saveAdvisorLabel.val(this.advisor.val());
@@ -74,11 +74,11 @@ var adviseeRelUtils = {
         if (this.advisorUri.val() == '' || this.advisorUri.val() == this.sentinel ) {
             firstName = this.firstName.val();
             lastName = this.advisor.val();
-            
+
             name = lastName;
             if (firstName) {
                 name += ', ' + firstName;
-            }            
+            }
 
             // we don't want the user to see the label getting built, so hide the acSelector
             // field and display a bogus field that just has the last name in it.
@@ -87,13 +87,13 @@ var adviseeRelUtils = {
             this.fauxLabel.show();
             this.advisor.val(name);
             this.lastName.val(lastName);
-        } 
+        }
         else {
             this.firstName.attr('disabled', 'disabled');
             this.lastName.attr('disabled', 'disabled');
         }
 
-    },    
+    },
 
     buildAdvisingRelLabel: function() {
         if ( this.advisor.val() != "" ) {
@@ -114,5 +114,5 @@ var adviseeRelUtils = {
             this.advisor.val(temp);
         }
     }
-    
-} 
+
+}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js
index 0ce82748a8..5cc76e85bb 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js
@@ -1,17 +1,17 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var advisorRelUtils = {
-        
+
     onLoad: function(subject,blankSentinel) {
         this.subjName = '';
         if ( subject ) { this.subjName = subject; }
-        
+
         this.sentinel = '';
         if ( blankSentinel ) { this.sentinel = blankSentinel; }
 
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        
+
         $.extend(this, vitro.customFormUtils);
         $.extend(this, i18nStrings);
 
@@ -21,7 +21,7 @@ var advisorRelUtils = {
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#personHasAdvisingRelationship');
     this.adRelshiplabel = $('#advisingRelLabel');
     this.advisee = $('#advisee');
@@ -33,34 +33,34 @@ var advisorRelUtils = {
     this.subjAreaUri = $('#subjAreaUri');
     this.saveAdviseeLabel = $('#saveAdviseeLabel');
     this.adviseeAcSelection = $('div#adviseeAcSelection');
-    
+
 
     // may not need this
     this.firstName.attr('disabled', false);
-    
+
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         // we want to use the advisee label in the relationship label.
         // since the former gets cleared on submit in some cases, store
         // the value in a hidden field and map to relationship label
         this.advisee.change( function(objEvent) {
-           window.setTimeout('advisorRelUtils.mapAdviseeValue()', 180); 
+           window.setTimeout('advisorRelUtils.mapAdviseeValue()', 180);
         });
         this.advisee.blur( function(objEvent) {
-           window.setTimeout('advisorRelUtils.mapAdviseeValue()', 180); 
+           window.setTimeout('advisorRelUtils.mapAdviseeValue()', 180);
         });
-        
-        
+
+
         this.form.submit(function() {
             advisorRelUtils.resolveAdviseeNames();
             advisorRelUtils.buildAdvisingRelLabel();
 
-        });            
+        });
     },
-    
+
     mapAdviseeValue: function() {
        if ( this.adviseeAcSelection.attr('class').indexOf('userSelected') != -1 ) {
            this.saveAdviseeLabel.val(this.advisee.val());
@@ -75,12 +75,12 @@ var advisorRelUtils = {
         if (this.adviseeUri.val() == '' || this.adviseeUri.val() == this.sentinel ) {
             firstName = this.firstName.val();
             lastName = this.advisee.val();
-            
+
             name = lastName;
 
             if (firstName) {
                 name += ', ' + firstName;
-            }            
+            }
 
             // we don't want the user to see the label getting built, so hide the acSelector
             // field and display a bogus field that just has the last name in it.
@@ -89,13 +89,13 @@ var advisorRelUtils = {
             this.fauxLabel.show();
             this.advisee.val(name);
             this.lastName.val(lastName);
-        } 
+        }
         else {
             this.firstName.attr('disabled', 'disabled');
             this.lastName.attr('disabled', 'disabled');
         }
 
-    },    
+    },
 
     buildAdvisingRelLabel: function() {
         if ( this.advisee.val() != "" ) {
@@ -116,5 +116,5 @@ var advisorRelUtils = {
             this.advisee.val(temp);
         }
     }
-    
-} 
+
+}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js
index 125089dba4..85f26eafb4 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js
@@ -4,7 +4,7 @@
 var awardReceiptUtils = {
 
     onLoad: function(mode, subjectName, href) {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
         this.baseHref = href;
         this.editMode = mode;
@@ -24,7 +24,7 @@ var awardReceiptUtils = {
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#personHasAwardOrHonor');
     this.recLabel = $('#awardReceiptLabel');
     this.award = $('#award');
@@ -38,29 +38,29 @@ var awardReceiptUtils = {
     this.changeLink = this.awardAcSelection.children('p').children('#changeSelection');
 
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         // the delay ensures that the function is called after the ac selection is completed
         this.award.change( function(objEvent) {
-           window.setTimeout('awardReceiptUtils.hideConferredBy()', 180); 
+           window.setTimeout('awardReceiptUtils.hideConferredBy()', 180);
         });
-        
+
         this.award.blur( function(objEvent) {
-           window.setTimeout('awardReceiptUtils.hideConferredBy()', 180); 
+           window.setTimeout('awardReceiptUtils.hideConferredBy()', 180);
         });
 
         this.form.submit(function() {
             awardReceiptUtils.setYearAwardedValue();
             awardReceiptUtils.buildAwardReceiptLabel();
-        });    
-    
+        });
+
         this.changeLink.click( function() {
-           awardReceiptUtils.showConferredBy(); 
+           awardReceiptUtils.showConferredBy();
         });
     },
-    
+
     hideConferredBy: function() {
         if ( this.awardAcSelection.attr('class').indexOf('userSelected') != -1 ) {
             this.org.parent('p').hide();
@@ -80,7 +80,7 @@ var awardReceiptUtils = {
 
     resetAcSelection: function() {
         var $acSelection = $("div.acSelection[acGroupName='org']");
-        
+
         if ( this.orgUriReceiver.val() != '' ) {
             this.hideFields($acSelection);
             $acSelection.removeClass('userSelected');
@@ -110,5 +110,5 @@ var awardReceiptUtils = {
     setYearAwardedValue: function() {
         this.yearAwarded.val(this.displayedYear.val());
     }
-       
+
 }
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
index 91862acaae..9b7be2f75c 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
@@ -1,442 +1,442 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-var customForm = {
-    
-    /* *** Initial page setup *** */
-   
-    onLoad: function() {
-        
-        if (this.disableFormInUnsupportedBrowsers()) {
-            return;
-        }
-        this.mixIn();
-        this.initObjects();                 
-        this.initPage();       
-    },
-    
-    disableFormInUnsupportedBrowsers: function() {       
-        var disableWrapper = $('#ie67DisableWrapper');
-        
-        // Check for unsupported browsers only if the element exists on the page
-        if (disableWrapper.length) {
-            if (vitro.browserUtils.isIELessThan8()) {
-                disableWrapper.show();
-                $('.noIE67').hide();
-                return true;
-            }
-        }            
-        return false;      
-    },
-
-    mixIn: function() {
-        // Mix in the custom form utility methods
-        $.extend(this, vitro.customFormUtils);
-
-        // Get the custom form data from the page
-        $.extend(this, customFormData);
-        $.extend(this, i18nStrings);
-    },
-    
-    // On page load, create references for easy access to form elements.
-    // NB These must be assigned after the elements have been loaded onto the page.
-    initObjects: function(){
-
-        this.form = $('form.customForm');
-        this.fullViewOnly = $('.fullViewOnly');
-        this.button = $('#submit');
-        this.requiredLegend = $('#requiredLegend');
-       
-
-        // These are classed rather than id'd in case we want more than one autocomplete on a form.
-        // At that point we'll use ids to match them up with one another.
-        this.acSelector = this.form.find('.acSelector');
-        this.acSelection = this.form.find('.acSelection');
-        this.acSelectionInfo = this.form.find('.acSelectionInfo');
-        
-        this.acSelectorWrapper = this.acSelector.parent();
-        
-        this.or = $('span.or');       
-        this.cancel = this.form.find('.cancel');
-        this.acHelpTextClass = 'acSelectorWithHelpText';
-    },
-
-    // Set up the form on page load
-    initPage: function() {
-
-        if (!this.editMode) {
-            this.editMode = 'add'; // edit vs add: default to add
-        }
-               
-        if (!this.formSteps) { // Don't override formSteps specified in form data
-            if ( !this.fullViewOnly.length || this.editMode === 'edit' || this.editMode === 'repair' ) {
-                this.formSteps = 1;
-            // there may also be a 3-step form - look for this.subTypeSelector
-            }
-            else {
-                this.formSteps = 2;
-            }
-        }
-                
-        this.bindEventListeners();
-        
-        this.initAutocomplete();
-        
-        this.initElementData();
-        
-        this.initFormView();
-
-    },
-
-    initFormView: function() {
-        
-        // Put this case first, because in edit mode with
-        // validation errors we just want initFormFullView.
-        if (this.editMode == 'repair') {
-            this.initFormFullView();
-        } else if(this.editMode == 'edit') {
-        	this.initFormEditFullView();
-        }
-        else if (this.findValidationErrors()) {
-            this.initFormWithValidationErrors();
-        }
-        // If type is already selected when the page loads (Firefox retains value
-        // on a refresh), go directly to full view. Otherwise user has to reselect
-        // twice to get to full view.        
-        else if ( this.formSteps == 1 || typeVal.length ) {
-            this.initFormFullView();
-        }
-        else {
-            this.initFormTypeView();
-        }     
-    },
-    
-    initFormTypeView: function() {
-
-        this.hideFields(this.fullViewOnly);
-        this.button.hide();
-        this.requiredLegend.hide();
-        this.or.hide();
-
-        this.cancel.unbind('click');
-    },
-    
-    
-    initFormFullView: function() {
-
-        this.fullViewOnly.show();
-        this.or.show();
-        this.requiredLegend.show();
-        this.button.show();
-//        this.setButtonText('new');
-        this.setLabels(); 
-
-        // Set the initial autocomplete help text in the acSelector field.
-        this.addAcHelpText();
-
-        this.cancel.unbind('click');           
-        if (this.formSteps > 1) {     
-            this.cancel.click(function() {
-                customForm.clearFormData(); // clear any input and validation errors
-                customForm.initFormTypeView();
-                return false;            
-            });
-        // In one-step forms, if there is a type selection field, but no value is selected,
-        // hide the acSelector field. The type selection must be made first so that the
-        // autocomplete type can be determined. If a type selection has been made, 
-        // unhide the acSelector field.
-        } 
-
-    },
-    
-    initFormWithValidationErrors: function() {
-        var  label = this.acSelector.val(); 
-        
-        // Call initFormFullView first, because showAutocompleteSelection needs
-        // acType, which is set in initFormFullView. 
-        this.initFormFullView();
-        
-        //See if value exists, either b/c editing or label is in input if validation error
-        if(label.length > 0) {
-        	this.showAutocompleteSelection(label);
-        }
-        
-       
-    },
-    
-    initFormEditFullView: function() {
-    	  var  label = this.acSelector.val(); 
-          
-          // Call initFormFullView first, because showAutocompleteSelection needs
-          // acType, which is set in initFormFullView. 
-          this.initFormFullView();
-          
-          //See if value exists, either b/c editing or label is in input if validation error
-          if(this.editMode == 'edit' || label.length > 0) {
-          	this.showAutocompleteSelection(label);
-          }
-    },
-    
-    
-    // Bind event listeners that persist over the life of the page. Event listeners
-    // that depend on the view should be initialized in the view setup method.
-    bindEventListeners: function() {
-
-       //no longer need type selector and verify match
-        
-        this.acSelector.focus(function() {
-            customForm.deleteAcHelpText();
-        });   
-        
-        this.acSelector.blur(function() {
-            customForm.addAcHelpText();
-        }); 
-        
-        this.form.submit(function() {
-            customForm.deleteAcHelpText();
-        });
-        
-    },
-    
-    initAutocomplete: function() {	
-        
-        this.getAcFilter();
-        this.acCache = {};
-        
-        this.acSelector.autocomplete({
-            minLength: 3,
-            source: customForm.doAutoComplete,
-            select: function(event, ui) {
-              	customForm.showAutocompleteSelection(ui.item.value);                     
-            }
-        });
-    },
-   
-    //For debugging, trying to extract auto complete method
-    doAutoComplete: function(request, response) {
-        if (request.term in customForm.acCache) {
-            // console.log('found term in cache');
-            response(customForm.acCache[request.term]);
-            return;
-        }
-        // console.log('not getting term from cache');
-
-        $.ajax({
-            url: customForm.acUrl,
-            dataType: 'json',
-            data: {
-                term: request.term,
-                property: customForm.property
-            },
-            complete: function(xhr, status) {
-                // Not sure why, but we need an explicit json parse here. 
-                var results = $.parseJSON(xhr.responseText), 
-                filteredResults = customForm.filterAcResults(results);
-                customForm.acCache[request.term] = filteredResults;
-                response(filteredResults);
-            }
-        });
-    }, 
-    
-    
-    // Store original or base text with elements that will have text substitutions.
-    // Generally the substitution cannot be made on the current value, since that value
-    // may have changed from the original. So we store the original text with the element to
-    // use as a base for substitutions.
-    initElementData: function() {
-        
-        this.placeholderText = '###';
-        this.labelsWithPlaceholders = this.form.find('label, .label').filter(function() {
-            return $(this).html().match(customForm.placeholderText);
-        });        
-        this.labelsWithPlaceholders.each(function(){
-            $(this).data('baseText', $(this).html());
-        });
-        
-        this.button.data('baseText', this.button.val());
-   
-        
-    },
-    //get autocomplete filter with sparql query
-    getAcFilter: function() {
-
-        if (!this.sparqlForAcFilter) {
-            //console.log('autocomplete filtering turned off');
-            this.acFilter = null;
-            return;
-        }
-        
-        //console.log("sparql for autocomplete filter: " + this.sparqlForAcFilter);
-
-        // Define this.acFilter here, so in case the sparql query fails
-        // we don't get an error when referencing it later.
-        this.acFilter = [];
-        $.ajax({
-            url: customForm.sparqlQueryUrl,
-            dataType: "json",
-            data: {
-                query: customForm.sparqlForAcFilter
-            },
-            success: function(data, status, xhr) {
-                customForm.setAcFilter(data);
-            }
-        });
-    },
-    
-    setAcFilter: function(data) {
-
-        var key = data.head.vars[0];
-        
-        $.each(data.results.bindings, function() {
-            customForm.acFilter.push(this[key].value);
-        });         
-    },
-    
-    filterAcResults: function(results) {
-        var filteredResults;
-        
-        if (!this.acFilter || !this.acFilter.length) {
-            //console.log('no autocomplete filtering applied');
-            return results;
-        }
-        
-        filteredResults = [];
-        $.each(results, function() {
-        	//Here this should refer to the results array value being iterated through
-            if ($.inArray(String(this), customForm.acFilter) == -1) {
-                filteredResults.push(String(this));
-            }
-            else {
-           
-            }
-        });
-        return filteredResults;
-    },
-    
-    // Reset some autocomplete values after type is changed
-    resetAutocomplete: function(typeVal) {
-        // Append the type parameter to the base autocomplete url
-        var glue = this.baseAcUrl.indexOf('?') > -1 ? '&' : '?';
-        this.acUrl = this.baseAcUrl + glue;
-        
-        // Flush autocomplete cache when type is reset, since the cached values 
-        // pertain only to the previous type.
-        this.acCache = {};
-    },       
-    //in our case, we have only the literal value itself    
-    showAutocompleteSelection: function(label) {
-
-        this.hideFields(this.acSelectorWrapper);              
-        this.acSelection.show();
-
-        this.acSelector.val(label);        
-        this.acSelectionInfo.html(label);
-     
-//        this.setButtonText('existing');            
-        
-        this.cancel.unbind('click');
-        this.cancel.click(function() {
-            customForm.undoAutocompleteSelection();
-            customForm.initFormFullView();
-            return false;
-        });
-    },
-    
-    // Cancel action after making an autocomplete selection: undo autocomplete 
-    // selection (from showAutocomplete) before returning to full view.
-    undoAutocompleteSelection: function() {
- 
-        // The test is not just for efficiency: undoAutocompleteSelection empties the acSelector value,
-        // which we don't want to do if user has manually entered a value, since he may intend to
-        // change the type but keep the value. If no new value has been selected, form initialization
-        // below will correctly empty the value anyway.
-        if (!this.acSelection.is(':hidden')) {       
-            this.acSelectorWrapper.show();
-            this.hideFields(this.acSelection);
-            this.acSelector.val('');
-            this.acSelectionInfo.html('');
-            
-            if (this.formSteps > 1) {
-                htmlString = customForm.selectedString + " ";
-                this.acSelection.find('label').html(htmlString);
-            }
-        }      
-    },
-    
-    // Set field labels based on type selection. Although these won't change in edit
-    // mode, it's easier to specify the text here than in the jsp.
-    setLabels: function() {
-        var typeName = this.defaultTypeName;
-
-        this.labelsWithPlaceholders.each(function() {
-            var newLabel = $(this).data('baseText').replace(customForm.placeholderText, typeName);
-            $(this).html(newLabel);
-        });
-
-    },
-    
-    // Set button text based on both type selection and whether it's an autocomplete selection
-    // or a new related individual. Called when setting up full view of form, and after
-    // an autocomplete selection.
-    //Commenting out for now because keeping in synch with regular data property form and
-    //not changing the button text at all
-    setButtonText: function(newOrExisting) {
-    	
-    	/*
-        var typeText, 
-            buttonText,
-            baseButtonText = this.button.data('baseText');
-        
-        // Edit mode button doesn't change, so it's specified in the jsp
-        if (this.editMode === 'edit') {
-            return;
-        }  
-
-        typeText = this.defaultTypeName;
-                
-        // Creating new related individual      
-        if (newOrExisting === 'new') {
-            if (this.submitButtonTextType == 'compound') { // use == to tolerate nulls
-                // e.g., 'Create Grant & Principal Investigator'
-                buttonText = 'Create ' + typeText + ' & ' + baseButtonText;          
-            } else {
-                // In repair mode, baseButtonText is "Edit X". Keep that for this case.
-                // In add mode, baseButtonText is "X", so we get, e.g., "Create Publication"
-                buttonText = this.editMode == 'repair' ? baseButtonText : 'Create ' + baseButtonText;
-            }            
-        }
-        // Using existing related individual
-        else {  
-            // In repair mode, baseButtonText is "Edit X". Keep that for this case.
-            buttonText = this.editMode == 'repair' ? baseButtonText : 'Add ' + baseButtonText;
-        } 
-        
-        this.button.val(buttonText);
-        */
-    },
-    
-
-    // Set the initial help text that appears in the autocomplete field and change the class name
-    addAcHelpText: function() {
-        var typeText = this.defaultTypeName;
-    
-        // First case applies on page load; second case applies when the type gets changed.
-        if (!this.acSelector.val() || this.acSelector.hasClass(this.acHelpTextClass)) {            
-        	var helpText = customForm.selectExisting + " " + typeText + " " + customForm.orCreateNewOne;
-        	//Different for object property autocomplete
-			this.acSelector.val(helpText)
-		               	   .addClass(this.acHelpTextClass);     
-		}
-	},
-
-    deleteAcHelpText: function() {
-        if (this.acSelector.hasClass(this.acHelpTextClass)) {
-			this.acSelector.val('')
-		                   .removeClass(this.acHelpTextClass);
-		}
-	}
-	
-};
-
-$(document).ready(function() {   
-    customForm.onLoad();
-});
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+var customForm = {
+
+    /* *** Initial page setup *** */
+
+    onLoad: function() {
+
+        if (this.disableFormInUnsupportedBrowsers()) {
+            return;
+        }
+        this.mixIn();
+        this.initObjects();
+        this.initPage();
+    },
+
+    disableFormInUnsupportedBrowsers: function() {
+        var disableWrapper = $('#ie67DisableWrapper');
+
+        // Check for unsupported browsers only if the element exists on the page
+        if (disableWrapper.length) {
+            if (vitro.browserUtils.isIELessThan8()) {
+                disableWrapper.show();
+                $('.noIE67').hide();
+                return true;
+            }
+        }
+        return false;
+    },
+
+    mixIn: function() {
+        // Mix in the custom form utility methods
+        $.extend(this, vitro.customFormUtils);
+
+        // Get the custom form data from the page
+        $.extend(this, customFormData);
+        $.extend(this, i18nStrings);
+    },
+
+    // On page load, create references for easy access to form elements.
+    // NB These must be assigned after the elements have been loaded onto the page.
+    initObjects: function(){
+
+        this.form = $('form.customForm');
+        this.fullViewOnly = $('.fullViewOnly');
+        this.button = $('#submit');
+        this.requiredLegend = $('#requiredLegend');
+
+
+        // These are classed rather than id'd in case we want more than one autocomplete on a form.
+        // At that point we'll use ids to match them up with one another.
+        this.acSelector = this.form.find('.acSelector');
+        this.acSelection = this.form.find('.acSelection');
+        this.acSelectionInfo = this.form.find('.acSelectionInfo');
+
+        this.acSelectorWrapper = this.acSelector.parent();
+
+        this.or = $('span.or');
+        this.cancel = this.form.find('.cancel');
+        this.acHelpTextClass = 'acSelectorWithHelpText';
+    },
+
+    // Set up the form on page load
+    initPage: function() {
+
+        if (!this.editMode) {
+            this.editMode = 'add'; // edit vs add: default to add
+        }
+
+        if (!this.formSteps) { // Don't override formSteps specified in form data
+            if ( !this.fullViewOnly.length || this.editMode === 'edit' || this.editMode === 'repair' ) {
+                this.formSteps = 1;
+            // there may also be a 3-step form - look for this.subTypeSelector
+            }
+            else {
+                this.formSteps = 2;
+            }
+        }
+
+        this.bindEventListeners();
+
+        this.initAutocomplete();
+
+        this.initElementData();
+
+        this.initFormView();
+
+    },
+
+    initFormView: function() {
+
+        // Put this case first, because in edit mode with
+        // validation errors we just want initFormFullView.
+        if (this.editMode == 'repair') {
+            this.initFormFullView();
+        } else if(this.editMode == 'edit') {
+        	this.initFormEditFullView();
+        }
+        else if (this.findValidationErrors()) {
+            this.initFormWithValidationErrors();
+        }
+        // If type is already selected when the page loads (Firefox retains value
+        // on a refresh), go directly to full view. Otherwise user has to reselect
+        // twice to get to full view.
+        else if ( this.formSteps == 1 || typeVal.length ) {
+            this.initFormFullView();
+        }
+        else {
+            this.initFormTypeView();
+        }
+    },
+
+    initFormTypeView: function() {
+
+        this.hideFields(this.fullViewOnly);
+        this.button.hide();
+        this.requiredLegend.hide();
+        this.or.hide();
+
+        this.cancel.unbind('click');
+    },
+
+
+    initFormFullView: function() {
+
+        this.fullViewOnly.show();
+        this.or.show();
+        this.requiredLegend.show();
+        this.button.show();
+//        this.setButtonText('new');
+        this.setLabels();
+
+        // Set the initial autocomplete help text in the acSelector field.
+        this.addAcHelpText();
+
+        this.cancel.unbind('click');
+        if (this.formSteps > 1) {
+            this.cancel.click(function() {
+                customForm.clearFormData(); // clear any input and validation errors
+                customForm.initFormTypeView();
+                return false;
+            });
+        // In one-step forms, if there is a type selection field, but no value is selected,
+        // hide the acSelector field. The type selection must be made first so that the
+        // autocomplete type can be determined. If a type selection has been made,
+        // unhide the acSelector field.
+        }
+
+    },
+
+    initFormWithValidationErrors: function() {
+        var  label = this.acSelector.val();
+
+        // Call initFormFullView first, because showAutocompleteSelection needs
+        // acType, which is set in initFormFullView.
+        this.initFormFullView();
+
+        //See if value exists, either b/c editing or label is in input if validation error
+        if(label.length > 0) {
+        	this.showAutocompleteSelection(label);
+        }
+
+
+    },
+
+    initFormEditFullView: function() {
+    	  var  label = this.acSelector.val();
+
+          // Call initFormFullView first, because showAutocompleteSelection needs
+          // acType, which is set in initFormFullView.
+          this.initFormFullView();
+
+          //See if value exists, either b/c editing or label is in input if validation error
+          if(this.editMode == 'edit' || label.length > 0) {
+          	this.showAutocompleteSelection(label);
+          }
+    },
+
+
+    // Bind event listeners that persist over the life of the page. Event listeners
+    // that depend on the view should be initialized in the view setup method.
+    bindEventListeners: function() {
+
+       //no longer need type selector and verify match
+
+        this.acSelector.focus(function() {
+            customForm.deleteAcHelpText();
+        });
+
+        this.acSelector.blur(function() {
+            customForm.addAcHelpText();
+        });
+
+        this.form.submit(function() {
+            customForm.deleteAcHelpText();
+        });
+
+    },
+
+    initAutocomplete: function() {
+
+        this.getAcFilter();
+        this.acCache = {};
+
+        this.acSelector.autocomplete({
+            minLength: 3,
+            source: customForm.doAutoComplete,
+            select: function(event, ui) {
+              	customForm.showAutocompleteSelection(ui.item.value);
+            }
+        });
+    },
+
+    //For debugging, trying to extract auto complete method
+    doAutoComplete: function(request, response) {
+        if (request.term in customForm.acCache) {
+            // console.log('found term in cache');
+            response(customForm.acCache[request.term]);
+            return;
+        }
+        // console.log('not getting term from cache');
+
+        $.ajax({
+            url: customForm.acUrl,
+            dataType: 'json',
+            data: {
+                term: request.term,
+                property: customForm.property
+            },
+            complete: function(xhr, status) {
+                // Not sure why, but we need an explicit json parse here.
+                var results = $.parseJSON(xhr.responseText),
+                filteredResults = customForm.filterAcResults(results);
+                customForm.acCache[request.term] = filteredResults;
+                response(filteredResults);
+            }
+        });
+    },
+
+
+    // Store original or base text with elements that will have text substitutions.
+    // Generally the substitution cannot be made on the current value, since that value
+    // may have changed from the original. So we store the original text with the element to
+    // use as a base for substitutions.
+    initElementData: function() {
+
+        this.placeholderText = '###';
+        this.labelsWithPlaceholders = this.form.find('label, .label').filter(function() {
+            return $(this).html().match(customForm.placeholderText);
+        });
+        this.labelsWithPlaceholders.each(function(){
+            $(this).data('baseText', $(this).html());
+        });
+
+        this.button.data('baseText', this.button.val());
+
+
+    },
+    //get autocomplete filter with sparql query
+    getAcFilter: function() {
+
+        if (!this.sparqlForAcFilter) {
+            //console.log('autocomplete filtering turned off');
+            this.acFilter = null;
+            return;
+        }
+
+        //console.log("sparql for autocomplete filter: " + this.sparqlForAcFilter);
+
+        // Define this.acFilter here, so in case the sparql query fails
+        // we don't get an error when referencing it later.
+        this.acFilter = [];
+        $.ajax({
+            url: customForm.sparqlQueryUrl,
+            dataType: "json",
+            data: {
+                query: customForm.sparqlForAcFilter
+            },
+            success: function(data, status, xhr) {
+                customForm.setAcFilter(data);
+            }
+        });
+    },
+
+    setAcFilter: function(data) {
+
+        var key = data.head.vars[0];
+
+        $.each(data.results.bindings, function() {
+            customForm.acFilter.push(this[key].value);
+        });
+    },
+
+    filterAcResults: function(results) {
+        var filteredResults;
+
+        if (!this.acFilter || !this.acFilter.length) {
+            //console.log('no autocomplete filtering applied');
+            return results;
+        }
+
+        filteredResults = [];
+        $.each(results, function() {
+        	//Here this should refer to the results array value being iterated through
+            if ($.inArray(String(this), customForm.acFilter) == -1) {
+                filteredResults.push(String(this));
+            }
+            else {
+
+            }
+        });
+        return filteredResults;
+    },
+
+    // Reset some autocomplete values after type is changed
+    resetAutocomplete: function(typeVal) {
+        // Append the type parameter to the base autocomplete url
+        var glue = this.baseAcUrl.indexOf('?') > -1 ? '&' : '?';
+        this.acUrl = this.baseAcUrl + glue;
+
+        // Flush autocomplete cache when type is reset, since the cached values
+        // pertain only to the previous type.
+        this.acCache = {};
+    },
+    //in our case, we have only the literal value itself
+    showAutocompleteSelection: function(label) {
+
+        this.hideFields(this.acSelectorWrapper);
+        this.acSelection.show();
+
+        this.acSelector.val(label);
+        this.acSelectionInfo.html(label);
+
+//        this.setButtonText('existing');
+
+        this.cancel.unbind('click');
+        this.cancel.click(function() {
+            customForm.undoAutocompleteSelection();
+            customForm.initFormFullView();
+            return false;
+        });
+    },
+
+    // Cancel action after making an autocomplete selection: undo autocomplete
+    // selection (from showAutocomplete) before returning to full view.
+    undoAutocompleteSelection: function() {
+
+        // The test is not just for efficiency: undoAutocompleteSelection empties the acSelector value,
+        // which we don't want to do if user has manually entered a value, since he may intend to
+        // change the type but keep the value. If no new value has been selected, form initialization
+        // below will correctly empty the value anyway.
+        if (!this.acSelection.is(':hidden')) {
+            this.acSelectorWrapper.show();
+            this.hideFields(this.acSelection);
+            this.acSelector.val('');
+            this.acSelectionInfo.html('');
+
+            if (this.formSteps > 1) {
+                htmlString = customForm.selectedString + " ";
+                this.acSelection.find('label').html(htmlString);
+            }
+        }
+    },
+
+    // Set field labels based on type selection. Although these won't change in edit
+    // mode, it's easier to specify the text here than in the jsp.
+    setLabels: function() {
+        var typeName = this.defaultTypeName;
+
+        this.labelsWithPlaceholders.each(function() {
+            var newLabel = $(this).data('baseText').replace(customForm.placeholderText, typeName);
+            $(this).html(newLabel);
+        });
+
+    },
+
+    // Set button text based on both type selection and whether it's an autocomplete selection
+    // or a new related individual. Called when setting up full view of form, and after
+    // an autocomplete selection.
+    //Commenting out for now because keeping in synch with regular data property form and
+    //not changing the button text at all
+    setButtonText: function(newOrExisting) {
+
+    	/*
+        var typeText,
+            buttonText,
+            baseButtonText = this.button.data('baseText');
+
+        // Edit mode button doesn't change, so it's specified in the jsp
+        if (this.editMode === 'edit') {
+            return;
+        }
+
+        typeText = this.defaultTypeName;
+
+        // Creating new related individual
+        if (newOrExisting === 'new') {
+            if (this.submitButtonTextType == 'compound') { // use == to tolerate nulls
+                // e.g., 'Create Grant & Principal Investigator'
+                buttonText = 'Create ' + typeText + ' & ' + baseButtonText;
+            } else {
+                // In repair mode, baseButtonText is "Edit X". Keep that for this case.
+                // In add mode, baseButtonText is "X", so we get, e.g., "Create Publication"
+                buttonText = this.editMode == 'repair' ? baseButtonText : 'Create ' + baseButtonText;
+            }
+        }
+        // Using existing related individual
+        else {
+            // In repair mode, baseButtonText is "Edit X". Keep that for this case.
+            buttonText = this.editMode == 'repair' ? baseButtonText : 'Add ' + baseButtonText;
+        }
+
+        this.button.val(buttonText);
+        */
+    },
+
+
+    // Set the initial help text that appears in the autocomplete field and change the class name
+    addAcHelpText: function() {
+        var typeText = this.defaultTypeName;
+
+        // First case applies on page load; second case applies when the type gets changed.
+        if (!this.acSelector.val() || this.acSelector.hasClass(this.acHelpTextClass)) {
+        	var helpText = customForm.selectExisting + " " + typeText + " " + customForm.orCreateNewOne;
+        	//Different for object property autocomplete
+			this.acSelector.val(helpText)
+		               	   .addClass(this.acHelpTextClass);
+		}
+	},
+
+    deleteAcHelpText: function() {
+        if (this.acSelector.hasClass(this.acHelpTextClass)) {
+			this.acSelector.val('')
+		                   .removeClass(this.acHelpTextClass);
+		}
+	}
+
+};
+
+$(document).ready(function() {
+    customForm.onLoad();
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js
index b26463709e..7021f9ba9b 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js
@@ -3,13 +3,13 @@
 var missingIndividualFormUtils = {
 
     onLoad: function(mode,country) {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
     },
 
     initObjectReferences: function() {
         this.form = $('#editForm');
-    
+
     // The external auth ID field and messages
         this.fName = $('#firstName');
         this.lName = $('#lastName');
@@ -17,15 +17,15 @@ var missingIndividualFormUtils = {
         this.rdfsLabel = $('#label');
         this.submitButton = $('#submit');
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             missingIndividualFormUtils.buildRDFSLabel();
             missingIndividualFormUtils.submitButton.attr("disabled",true);
-        });    
-    
+        });
+
     },
 
     buildRDFSLabel: function() {
@@ -39,6 +39,6 @@ var missingIndividualFormUtils = {
     },
 }
 
-$(document).ready(function() {   
+$(document).ready(function() {
     missingIndividualFormUtils.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js
index a85ca6bd94..98645720c3 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js
@@ -4,26 +4,26 @@
 var educationalTrainingUtils = {
 
     onLoad: function(href, blankSentinel) {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
         $.extend(this, customFormData);
     },
 
     initObjectReferences: function() {
-    
+
         this.form = $('#personHasEducationalTraining');
         this.aDLabel = $('#awardedDegreeLabel');
         this.degreeSelector = $('#degreeUri');
     },
-    
+
     bindEventListeners: function() {
-        
+
         this.degreeSelector.change(function() {
-            educationalTrainingUtils.setAwardedDegreeLabel(); 
+            educationalTrainingUtils.setAwardedDegreeLabel();
         });
-                        
+
     },
-    
+
     setAwardedDegreeLabel: function() {
         var degreeLabel = this.subjectName + ": " + this.degreeSelector.find(":selected").text();
         this.aDLabel.val(degreeLabel);
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js
index 852ffde916..89ab2daf91 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js
@@ -1,14 +1,14 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var grantHasContributorUtils = {
-        
+
     onLoad: function(blankSentinel) {
         this.sentinel = '';
         if ( blankSentinel ) { this.sentinel = blankSentinel; }
 
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        
+
         $.extend(this, vitro.customFormUtils);
         $.extend(this, i18nStrings);
 
@@ -18,7 +18,7 @@ var grantHasContributorUtils = {
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#grantHasContributor');
     this.person = $('#person');
     this.fauxLabel = $('#maskLabelBuilding');
@@ -28,17 +28,17 @@ var grantHasContributorUtils = {
 
     // may not need this
     this.firstName.attr('disabled', false);
-    
+
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             grantHasContributorUtils.resolveFirstLastNames();
-        });            
+        });
     },
-    
+
     resolveFirstLastNames: function() {
         var firstName,
             lastName,
@@ -48,12 +48,12 @@ var grantHasContributorUtils = {
         if (this.personUri.val() == '' || this.personUri.val() == this.sentinel ) {
             firstName = this.firstName.val();
             lastName = this.person.val();
-            
+
             name = lastName;
 
             if (firstName) {
                 name += ', ' + firstName;
-            }            
+            }
 
             // we don't want the user to see the label getting built, so hide the acSelector
             // field and display a bogus field that just has the last name in it.
@@ -62,12 +62,12 @@ var grantHasContributorUtils = {
             this.fauxLabel.show();
             this.person.val(name);
             this.lastName.val(lastName);
-        } 
+        }
         else {
             this.firstName.attr('disabled', 'disabled');
             this.lastName.attr('disabled', 'disabled');
         }
-    },    
+    },
 
     resetLastNameLabel: function() {
         var indx = this.person.val().indexOf(", ");
@@ -76,5 +76,5 @@ var grantHasContributorUtils = {
             this.person.val(temp);
         }
     },
-    
-} 
+
+}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js
index b26cb45c39..d3921145b6 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js
@@ -4,7 +4,7 @@
 var issuedCredentialUtils = {
 
     onLoad: function() {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
         $.extend(this, credentials);
 
@@ -15,7 +15,7 @@ var issuedCredentialUtils = {
     },
 
     initObjectReferences: function() {
-    
+
         this.form = $('#personHasIssuedCredential');
         this.yearCredentialed = $('#yearCredentialed-year');
         this.displayedYear = $('#yearCredentialedDisplay');
@@ -23,23 +23,23 @@ var issuedCredentialUtils = {
         this.issuedType = $('#issuedCredentialType');
 
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             issuedCredentialUtils.setIssuedCredentialType($(issuedCredentialUtils.typeSelector).find(":selected").text());
             issuedCredentialUtils.setYearCredentialedValue();
-        }); 
-        
+        });
+
     },
-    
+
     setYearCredentialedValue: function() {
         this.yearCredentialed.val(this.displayedYear.val());
     },
-    
+
     setIssuedCredentialType: function(val) {
         this.issuedType.val(credentials[val]);
     }
-       
+
 }
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js
index 79f32d1fdc..d05520a484 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js
@@ -4,18 +4,18 @@
 var mailingAddressUtils = {
 
     onLoad: function(editMode) {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        
+
         if ( editMode != "add" ) {
             this.setStreetAddressDisplayFields();
         }
-        
+
         this.setAddressFieldsIfErrors();
     },
 
     initObjectReferences: function() {
-    
+
         this.form = $('#personHasMailingAddress');
         this.street1 = $('#streetAddressOne');
         this.street2 = $('#streetAddressTwo');
@@ -23,23 +23,23 @@ var mailingAddressUtils = {
         this.errorSection = $('section#error-alert');
 
     },
-    
+
     setAddressFieldsIfErrors: function() {
       if ( this.errorSection.length ) {
           mailingAddressUtils.setStreetAddressDisplayFields();
       }
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             mailingAddressUtils.setStreetAddressField();
-        }); 
-        
+        });
+
     },
 
-    // the vcard only has one address field, so combine the two 
+    // the vcard only has one address field, so combine the two
     // displayed addresses into the hidden field which gets asserted in the N3
     setStreetAddressField: function() {
         var tempString = this.street1.val() + "; " + this.street2.val();
@@ -52,9 +52,9 @@ var mailingAddressUtils = {
         var tempString = this.streetAddress.val();
         var lineOne = tempString.substring(0,tempString.lastIndexOf(";"));
         var lineTwo = tempString.substring(tempString.lastIndexOf(";") + 2);
-        
+
         this.street1.val(lineOne);
         this.street2.val(lineTwo);
     }
-    
+
 }
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js
index e28487a42e..22e736c72b 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js
@@ -3,11 +3,11 @@
 var manageHideShowStatus = {
 
     /* *** Initial page setup *** */
-   
+
     onLoad: function() {
-    
-            this.mixIn();               
-            this.initPage();       
+
+            this.mixIn();
+            this.initPage();
         },
 
     mixIn: function() {
@@ -21,9 +21,9 @@ var manageHideShowStatus = {
     initPage: function() {
 
         this.initItemData();
-       
+
         this.bindEventListeners();
-                       
+
     },
 
     // On page load, associate data with each list item. Then we don't
@@ -31,21 +31,21 @@ var manageHideShowStatus = {
     // items.
     initItemData: function() {
         $('.itemCheckbox').each(function(index) {
-            $(this).data(itemData[index]);  
+            $(this).data(itemData[index]);
         });
     },
-    
+
     bindEventListeners: function() {
 
         $('.itemCheckbox').click(function() {
             manageHideShowStatus.processItem(this);
             //return false;
         });
-               
+
     },
-                      
+
     processItem: function(item) {
-        
+
         var add = "";
         var retract = "";
         var n3String = "<" + $(item).data('relatedUri') + "> <http://vivoweb.org/ontology/core#hideFromDisplay> \"true\" ." ;
@@ -55,11 +55,11 @@ var manageHideShowStatus = {
         }
         else {
             retract = n3String;
-        } 
-        
+        }
+
         $.ajax({
             url: manageHideShowStatus.processingUrl,
-            type: 'POST', 
+            type: 'POST',
             data: {
                 additions: add,
                 retractions: retract
@@ -67,20 +67,20 @@ var manageHideShowStatus = {
             dataType: 'json',
             context: item, // context for callback
             complete: function(request, status) {
-            
+
                 if (status === 'success') {
-                    window.status = manageHideShowStatus.itemSuccessfullyExcluded; 
+                    window.status = manageHideShowStatus.itemSuccessfullyExcluded;
 
                 } else {
                     alert(manageHideShowStatus.errorExcludingItem);
                     $(item).prop('checked', null);
                 }
             }
-        });        
+        });
     },
 
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     manageHideShowStatus.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
index 6e8d9c55d9..a1887eda6e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
@@ -3,35 +3,35 @@
 var manageWebpages = {
 
     /* *** Initial page setup *** */
-   
+
     onLoad: function() {
-    
-        this.mixIn();               
-        this.initPage();       
+
+        this.mixIn();
+        this.initPage();
     },
 
     mixIn: function() {
-        
+
         // Get the custom form data from the page
         $.extend(this, customFormData);
         $.extend(this, i18nStrings);
     },
-    
+
     // Initial page setup. Called only at page load.
     initPage: function() {
 
         this.initWebpageData();
-       
+
         this.bindEventListeners();
-               
+
         this.initDragAndDrop();
-        
+
         if ($('.webpage').length) {  // make sure we have at least one webpage
             // Reorder web pages on page load so that previously unranked items get a rank. Otherwise,
             // when we add a new web page, it will get put ahead of any previously unranked web pages, instead
-            // of at the end of the list. (It is also helpful to normalize the data before we get started.)            
+            // of at the end of the list. (It is also helpful to normalize the data before we get started.)
             this.reorder();
-        }     
+        }
     },
 
     // On page load, associate data with each list item. Then we don't
@@ -39,47 +39,47 @@ var manageWebpages = {
     // items.
     initWebpageData: function() {
         $('.webpage').each(function(index) {
-            $(this).data(webpageData[index]);    
-            
+            $(this).data(webpageData[index]);
+
             // RY We might still need position to put back an element after reordering
             // failure. Rank might already have been reset? Check.
-            $(this).data('position', index+1);      
+            $(this).data('position', index+1);
         });
     },
-    
+
     bindEventListeners: function() {
 
         $('.remove').click(function() {
             manageWebpages.removeWebpage(this);
             return false;
         });
-               
+
     },
-    
+
     /* *** Ajax initializations *** */
 
     /* Drag-and-drop */
     initDragAndDrop: function() {
-        
+
         var webpages = $('#dragDropList');
-        
+
         // No DD if < 2 items
         if (webpages.children('li') < 2) {
             return;
         }
-        
+
         $('.webpageName').each(function() {
             $(this).attr('title', manageWebpages.dragDropToReorderWebpages);
         });
-        
+
         webpages.sortable({
             cursor: 'move',
             update: function(event, ui) {
                 manageWebpages.reorder(event, ui);
             }
-        });     
+        });
     },
-    
+
     // Reorder webpages. Called on page load and after drag-and-drop and remove.
     // Event and ui parameters are defined only in the case of drag-and-drop.
     reorder: function(event, ui) {
@@ -93,7 +93,7 @@ var manageWebpages = {
                 predicate: manageWebpages.rankPredicate,
                 individuals: webpages
             },
-            
+
             traditional: true, // serialize the array of individuals for the server
             dataType: 'json',
             type: 'POST',
@@ -101,61 +101,61 @@ var manageWebpages = {
                 var pos;
                 $('.webpage').each(function(index){
                     pos = index + 1;
-                    // Set the new position for this element. The only function of this value 
+                    // Set the new position for this element. The only function of this value
                     // is so we can reset an element to its original position in case reordering fails.
-                    manageWebpages.setPosition(this, pos);                
-                }); 
+                    manageWebpages.setPosition(this, pos);
+                });
             },
             error: function(request, status, error) {
                 // ui is undefined on page load and after a webpage removal.
                 if (ui) {
                     // Put the moved item back to its original position.
                     // Seems we need to do this by hand. Can't see any way to do it with jQuery UI. ??
-                    var pos = manageWebpages.getPosition(ui.item),                       
-                        nextpos = pos + 1, 
-                        webpages = $('#dragDropList'), 
+                    var pos = manageWebpages.getPosition(ui.item),
+                        nextpos = pos + 1,
+                        webpages = $('#dragDropList'),
                         next = manageWebpages.findWebpage('position', nextpos);
-                    
+
                     if (next.length) {
                         ui.item.insertBefore(next);
                     }
                     else {
                         ui.item.appendTo(webpages);
                     }
-                    
-                    alert(manageWebpages.webpageReorderingFailed);                                 
-                }      
+
+                    alert(manageWebpages.webpageReorderingFailed);
+                }
             }
-        });           
+        });
     },
-    
+
     getPosition: function(webpage) {
         return $(webpage).data('position');
     },
-    
+
     setPosition: function(webpage, pos) {
         $(webpage).data('position', pos);
     },
-    
+
     findWebpage: function(key, value) {
         var matchingWebpage = $(); // if we don't find one, return an empty jQuery set
-        
+
         $('.webpage').each(function() {
             var webpage = $(this);
             if ( webpage.data(key) === value ) {
-                matchingWebpage = webpage; 
+                matchingWebpage = webpage;
                 return false; // stop the loop
             }
         });
-         
-        return matchingWebpage;       
+
+        return matchingWebpage;
     },
-                  
+
     removeWebpage: function(link) {
         // RY Upgrade this to a modal window
         var removeLast = false,
             message = manageWebpages.confirmWebpageDeletion;
-            
+
         if (!confirm(message)) {
             return false;
         }
@@ -164,14 +164,14 @@ var manageWebpages = {
         $('img#indicator').removeClass('hidden');
         $('a#showAddForm').addClass('disabledSubmit');
         $('a#showAddForm').attr('disabled', 'disabled');
-        
+
         if ($(link)[0] === $('.remove:last')[0]) {
             removeLast = true;
-        } 
-        
+        }
+
         $.ajax({
             url: $(link).attr('href'),
-            type: 'POST', 
+            type: 'POST',
             data: {
                 deletion: $(link).parents('.webpage').data('webpageUri')
             },
@@ -179,29 +179,29 @@ var manageWebpages = {
             context: link, // context for callback
             complete: function(request, status) {
                 var webpage;
-            
+
                 if (status === 'success') {
-                    
+
                     webpage = $(this).parents('.webpage');
-                    
+
                     webpage.fadeOut(400, function() {
                         var numWebpages;
-                        
-                        // Remove from the DOM                       
+
+                        // Remove from the DOM
                         $(this).remove();
 
                         // Actions that depend on the webpage having been removed from the DOM:
                         numWebpages = $('.webpage').length; // retrieve the new length after removing webpage from the DOM
-                        
+
                         // If removed item not last, reorder to remove any gaps
-                        if (numWebpages > 0 && ! removeLast) {                            
+                        if (numWebpages > 0 && ! removeLast) {
                             manageWebpages.reorder();
                         }
-                            
+
                         // If fewer than two webpages remaining, disable drag-drop
                         if (numWebpages < 2) {
                             manageWebpages.disableDD();
-                        }                           
+                        }
                         $('img#indicator').fadeOut(100, function() {
                             $(this).addClass('hidden');
                         });
@@ -217,26 +217,26 @@ var manageWebpages = {
                     alert(manageWebpages.errorRemovingWebpage);
                 }
             }
-        });        
+        });
     },
-    
+
     // Disable DD and associated cues if only one item remains
     disableDD: function() {
         var webpages = $('#dragDropList');
-        
+
         $('#dragDropList').sortable({ disable: true } )
                          /* Use class dd rather than jQuery UI's class ui-sortable, so that we can remove
                           * the class if there's fewer than one webpage. We don't want to remove the ui-sortable
                           * class, in case we want to re-enable DD without a page reload (e.g., if implementing
-                          * adding a webpage via Ajax request). 
+                          * adding a webpage via Ajax request).
                           */
                          .removeClass('dd');
-              
+
         $('.webpageName').removeAttr('title');
     }
 
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     manageWebpages.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js
index 7b918b6f2d..2e14e1f9fe 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js
@@ -3,13 +3,13 @@
 var newIndividualFormUtils = {
 
     onLoad: function(mode,country) {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
     },
 
     initObjectReferences: function() {
     this.form = $('#newIndividual');
-    
+
     // The external auth ID field and messages
     this.fName = $('#firstName');
     this.lName = $('#lastName');
@@ -17,15 +17,15 @@ var newIndividualFormUtils = {
     this.rdfsLabel = $('#label');
     this.submitButton = $('#submit');
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             newIndividualFormUtils.buildRDFSLabel();
             newIndividualFormUtils.submitButton.attr("disabled",true);
-        });    
-    
+        });
+
     },
 
     buildRDFSLabel: function() {
@@ -39,6 +39,6 @@ var newIndividualFormUtils = {
     },
 }
 
-$(document).ready(function() {   
+$(document).ready(function() {
     newIndividualFormUtils.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js
index acb3acf6fa..cbd9e732ec 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js
@@ -1,14 +1,14 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var orgHasPositionUtils = {
-        
+
     onLoad: function(blankSentinel) {
         this.sentinel = '';
         if ( blankSentinel ) { this.sentinel = blankSentinel; }
 
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        
+
         $.extend(this, vitro.customFormUtils);
 
         if ( this.findValidationErrors() ) {
@@ -17,26 +17,26 @@ var orgHasPositionUtils = {
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#organizationHasPositionHistory');
     this.person = $('#person');
     this.firstName = $('#firstName');
     this.lastName = $('#lastName');
-    this.personUri = $('#personUri');    
+    this.personUri = $('#personUri');
 
     // may not need this
     this.firstName.attr('disabled', false);
-    
+
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             orgHasPositionUtils.resolvePersonNames();
-        });            
+        });
     },
-    
+
     resolvePersonNames: function() {
         var firstName,
             lastName,
@@ -46,20 +46,20 @@ var orgHasPositionUtils = {
         if (this.personUri.val() == '' || this.personUri.val() == this.sentinel ) {
             firstName = this.firstName.val();
             lastName = this.person.val();
-            
+
             name = lastName;
             if (firstName) {
                 name += ', ' + firstName;
             }
             this.person.val(name);
             this.lastName.val(lastName);
-        } 
+        }
         else {
             this.firstName.attr('disabled', 'disabled');
             this.lastName.attr('disabled', 'disabled');
         }
 
-    },    
+    },
 
     resetLastNameLabel: function() {
         var indx = this.person.val().indexOf(", ");
@@ -68,5 +68,5 @@ var orgHasPositionUtils = {
             this.person.val(temp);
         }
     }
-    
-} 
+
+}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
index d501e9b4e1..d198c81338 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
@@ -1,15 +1,15 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var orgForTrainingUtils = {
-        
+
     onLoad: function(blankSentinel) {
-        
+
         this.sentinel = '';
         if ( blankSentinel ) { this.sentinel = blankSentinel; }
 
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        
+
         $.extend(this, vitro.customFormUtils);
         $.extend(this, i18nStrings);
 
@@ -19,7 +19,7 @@ var orgForTrainingUtils = {
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#organizationForTraining');
     this.person = $('#person');
     this.fauxLabel = $('#maskLabelBuilding');
@@ -27,22 +27,22 @@ var orgForTrainingUtils = {
     this.lastName = $('#lastName');
     this.personUri = $('#personUri');
     this.aDLabel = $('#awardedDegreeLabel');
-    this.degreeSelector = $('#degreeUri');    
+    this.degreeSelector = $('#degreeUri');
 
     // may not need this
     this.firstName.attr('disabled', false);
-    
+
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             orgForTrainingUtils.resolveFirstLastNames();
 
-        });            
+        });
     },
-    
+
     resolveFirstLastNames: function() {
         var firstName,
             lastName,
@@ -52,12 +52,12 @@ var orgForTrainingUtils = {
         if (this.personUri.val() == '' || this.personUri.val() == this.sentinel ) {
             firstName = this.firstName.val();
             lastName = this.person.val();
-            
+
             name = lastName;
 
             if (firstName) {
                 name += ', ' + firstName;
-            }            
+            }
 
             // we don't want the user to see the label getting built, so hide the acSelector
             // field and display a bogus field that just has the last name in it.
@@ -66,13 +66,13 @@ var orgForTrainingUtils = {
             this.fauxLabel.show();
             this.person.val(name);
             this.lastName.val(lastName);
-        } 
+        }
         else {
             this.firstName.attr('disabled', 'disabled');
             this.lastName.attr('disabled', 'disabled');
         }
-        orgForTrainingUtils.setAwardedDegreeLabel(this.person.val()); 
-    },    
+        orgForTrainingUtils.setAwardedDegreeLabel(this.person.val());
+    },
 
     resetLastNameLabel: function() {
         var indx = this.person.val().indexOf(", ");
@@ -81,7 +81,7 @@ var orgForTrainingUtils = {
             this.person.val(temp);
         }
     },
-    
+
     setAwardedDegreeLabel: function(name) {
         var degreeLabel = "";
         if ( name == '' || name == null ) {
@@ -91,5 +91,5 @@ var orgForTrainingUtils = {
             degreeLabel = name + ": " + this.degreeSelector.find(":selected").text();
         }
         this.aDLabel.val(degreeLabel);
-    }    
-} 
+    }
+}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js
index deff54a27d..0086c18b48 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js
@@ -1,14 +1,14 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var projectHasParticipantUtils = {
-        
+
     onLoad: function(blankSentinel) {
         this.sentinel = '';
         if ( blankSentinel ) { this.sentinel = blankSentinel; }
 
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        
+
         $.extend(this, vitro.customFormUtils);
         $.extend(this, i18nStrings);
 
@@ -18,7 +18,7 @@ var projectHasParticipantUtils = {
     },
 
     initObjectReferences: function() {
-    
+
     this.form = $('#projectHasParticipant');
     this.person = $('#person');
     this.fauxLabel = $('#maskLabelBuilding');
@@ -28,18 +28,18 @@ var projectHasParticipantUtils = {
 
     // may not need this
     this.firstName.attr('disabled', false);
-    
+
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.form.submit(function() {
             projectHasParticipantUtils.resolveFirstLastNames();
 
-        });            
+        });
     },
-    
+
     resolveFirstLastNames: function() {
         var firstName,
             lastName,
@@ -49,12 +49,12 @@ var projectHasParticipantUtils = {
         if (this.personUri.val() == '' || this.personUri.val() == this.sentinel ) {
             firstName = this.firstName.val();
             lastName = this.person.val();
-            
+
             name = lastName;
 
             if (firstName) {
                 name += ', ' + firstName;
-            }            
+            }
 
             // we don't want the user to see the label getting built, so hide the acSelector
             // field and display a bogus field that just has the last name in it.
@@ -63,12 +63,12 @@ var projectHasParticipantUtils = {
             this.fauxLabel.show();
             this.person.val(name);
             this.lastName.val(lastName);
-        } 
+        }
         else {
             this.firstName.attr('disabled', 'disabled');
             this.lastName.attr('disabled', 'disabled');
         }
-    },    
+    },
 
     resetLastNameLabel: function() {
         var indx = this.person.val().indexOf(", ");
@@ -77,5 +77,5 @@ var projectHasParticipantUtils = {
             this.person.val(temp);
         }
     },
-    
-} 
+
+}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
index 1410c6f887..1aa81bb6ba 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
@@ -4,7 +4,7 @@
 var publicationToPersonUtils = {
 
     onLoad: function(href, blankSentinel) {
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
         this.autoDateLabel.hide();
         this.baseHref = href;
@@ -16,11 +16,11 @@ var publicationToPersonUtils = {
         if ( this.findValidationErrors() ) {
             this.resetLastNameLabel();
         }
-        
+
     },
 
     initObjectReferences: function() {
-    
+
         this.form = $('#addpublicationToPerson');
         this.pubTitle = $('input#title');
         this.collection = $('#collection');
@@ -49,7 +49,7 @@ var publicationToPersonUtils = {
         this.cancel = $('.cancel');
         this.fullViewOnly = $('.fullViewOnly');
         this.autoDateLabel = null;
-        
+
         this.form.find('label').each(function() {
             if ( $(this).attr('for') == "dateTime-year") {
                 publicationToPersonUtils.autoDateLabel = $(this);
@@ -59,55 +59,55 @@ var publicationToPersonUtils = {
         this.pubAcSelection = $('div#pubAcSelection');
         this.fieldsForNewPub = $('#fieldsForNewPub');
         this.changeLink = this.pubAcSelection.children('p').children('#changeSelection');
-        
+
         // may not need this
         this.firstName.attr('disabled', false);
-        
+
     },
-    
+
     bindEventListeners: function() {
         this.idCache = {};
-        
+
         this.typeSelector.change(function() {
-            // controls the fieldsForNewPub div. If the user selects an existing pub/title, 
-            // this div gets hidden. 
-            publicationToPersonUtils.showFieldsForPub(); 
+            // controls the fieldsForNewPub div. If the user selects an existing pub/title,
+            // this div gets hidden.
+            publicationToPersonUtils.showFieldsForPub();
             // after a cancel, the first reset of the type selector resulted in all fields being displayed.
-            // by delaying this function just slightly, the timing issue between this js and the 
-            // customFormWithAutocomplete js is resolved 
+            // by delaying this function just slightly, the timing issue between this js and the
+            // customFormWithAutocomplete js is resolved
             window.setTimeout('publicationToPersonUtils.displayFieldsForType()', 60);
         });
-        
+
         // we need the delay in the next two functions to ensure the correct timing after the user
         // selects the ac item. The .change handles a mouse click; .blur an arrow key and tab selection
         this.pubTitle.change( function(objEvent) {
-           window.setTimeout('publicationToPersonUtils.hideFieldsForPub()', 180); 
+           window.setTimeout('publicationToPersonUtils.hideFieldsForPub()', 180);
         });
-        
+
         this.pubTitle.blur( function(objEvent) {
-           window.setTimeout('publicationToPersonUtils.hideFieldsForPub()', 180); 
+           window.setTimeout('publicationToPersonUtils.hideFieldsForPub()', 180);
         });
-        
+
         this.changeLink.click( function() {
-           publicationToPersonUtils.showFieldsForPub(); 
+           publicationToPersonUtils.showFieldsForPub();
         });
-        
+
         this.form.submit(function() {
             publicationToPersonUtils.resolveEditorNames();
-        });            
-                
+        });
+
     },
-    
+
     hideFieldsForPub: function() {
        if ( this.pubAcSelection.attr('class').indexOf('userSelected') != -1 ) {
            this.fieldsForNewPub.slideUp(250);
        }
     },
-    
+
     showFieldsForPub: function() {
         this.fieldsForNewPub.show();
     },
-    
+
     resetAcSelection: function(groupName) {
         var $acSelection = this.form.find("div.acSelection[acGroupName='" + groupName + "']");
         this.hideFields($acSelection);
@@ -116,7 +116,7 @@ var publicationToPersonUtils = {
         $acSelection.find("span").text('');
         $acSelection.find("a.verifyMatch").attr('href', this.baseHref);
     },
-    
+
     getAcUriReceiverVal: function(groupName) {
         var $collectionDiv = this.form.find("div.acSelection[acGroupName='" + groupName + "']");
         return $collectionDiv.find('input#'+ groupName + 'Uri').val();
@@ -149,7 +149,7 @@ var publicationToPersonUtils = {
         var selectedType = this.typeSelector.find(':selected').text();
 
         if ( selectedType == 'Academic Article' ) {
-            // if the user has changed type, keep any relevant values and display the 
+            // if the user has changed type, keep any relevant values and display the
             // acSelection as appropriate
             var ckForVal = this.getAcUriReceiverVal('collection');
             if ( ckForVal == '' || ckForVal == this.sentinel ) {
@@ -161,7 +161,7 @@ var publicationToPersonUtils = {
             this.issueLabel.show();
             this.startPage.parent('p').show();
             this.sPLabel.parent('p').show();
-            
+
             // if the user has changed type, ensure that irrelevant fields are cleared
             // and reset an acSelection divs
             if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
@@ -184,13 +184,13 @@ var publicationToPersonUtils = {
                 this.proceedingsOf.val('');
                 this.resetAcSelection('event');
             }
-                        
+
             this.locale.val('');
             this.number.val('');
             this.chapterNbr.val('');
         }
         else if ( selectedType == 'Chapter' ) {
-            // if the user has changed type, keep any relevant values and display the 
+            // if the user has changed type, keep any relevant values and display the
             // acSelection as appropriate
             var ckForVal = this.getAcUriReceiverVal('book');
             if ( ckForVal == '' || ckForVal == this.sentinel ) {
@@ -204,20 +204,20 @@ var publicationToPersonUtils = {
             if ( ckForVal == '' || ckForVal == this.sentinel ) {
                 this.publisher.parent('p').show();
             }
-            
-            this.locale.parent('p').show();            
+
+            this.locale.parent('p').show();
             this.volume.show();
             this.volLabel.show();
             this.chapterNbr.show();
             this.chapterNbrLabel.show();
             this.startPage.parent('p').show();
             this.sPLabel.parent('p').show();
-            
+
             // if the user is changing type, ensure that irrelevant fields are cleared
             // and reset an acSelection divs
             if ( this.collection.val() != ''  && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.collection.val('');
-                this.resetAcSelection('collection');                
+                this.resetAcSelection('collection');
             }
             if ( this.presentedAt.val() != ''  && this.presentedAt.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.presentedAt.val('');
@@ -227,14 +227,14 @@ var publicationToPersonUtils = {
                 this.proceedingsOf.val('');
                 this.resetAcSelection('event');
             }
-                                    
+
             this.number.val('');
             this.issue.val('');
             this.startPage.val('');
             this.endPage.val('');
         }
         else if ( selectedType == 'Book' || selectedType == 'Edited Book' ) {
-            // if the user has changed type, keep any relevant values and display the 
+            // if the user has changed type, keep any relevant values and display the
             // acSelection as appropriate
             var ckForVal = this.getAcUriReceiverVal('editor');
             if ( ckForVal == '' || ckForVal == this.sentinel ) {
@@ -244,8 +244,8 @@ var publicationToPersonUtils = {
             if ( ckForVal == '' || ckForVal == this.sentinel ) {
                 this.publisher.parent('p').show();
             }
-            
-            this.locale.parent('p').show();            
+
+            this.locale.parent('p').show();
             this.volume.show();
             this.volLabel.show();
 
@@ -253,7 +253,7 @@ var publicationToPersonUtils = {
             // and reset an acSelection divs
             if ( this.collection.val() != ''  && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.collection.val('');
-                this.resetAcSelection('collection');                
+                this.resetAcSelection('collection');
             }
             if ( this.presentedAt.val() != ''  && this.presentedAt.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.presentedAt.val('');
@@ -263,7 +263,7 @@ var publicationToPersonUtils = {
                 this.proceedingsOf.val('');
                 this.resetAcSelection('event');
             }
-                        
+
             this.number.val('');
             this.issue.val('');
             this.startPage.val('');
@@ -271,13 +271,13 @@ var publicationToPersonUtils = {
             this.chapterNbr.val('');
         }
         else if ( selectedType == 'Conference Paper' ) {
-            // if the user has changed type, keep any relevant values and display the 
+            // if the user has changed type, keep any relevant values and display the
             // acSelection as appropriate
             ckForVal = this.getAcUriReceiverVal('conference');
             if ( ckForVal == '' || ckForVal == this.sentinel ) {
                 this.presentedAt.parent('p').show();
             }
-            
+
             this.startPage.parent('p').show();
             this.sPLabel.parent('p').show();
 
@@ -285,7 +285,7 @@ var publicationToPersonUtils = {
             // and reset an acSelection divs
             if ( this.collection.val() != ''  && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.collection.val('');
-                this.resetAcSelection('collection');                
+                this.resetAcSelection('collection');
             }
             if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.book.val('');
@@ -311,7 +311,7 @@ var publicationToPersonUtils = {
             this.chapterNbr.val('');
         }
         else if ( selectedType == 'Conference Poster' || selectedType == 'Speech') {
-            // if the user has changed type, keep any relevant values and display the 
+            // if the user has changed type, keep any relevant values and display the
             // acSelection as appropriate
             var ckForVal = this.getAcUriReceiverVal('conference');
             if ( ckForVal == '' || ckForVal == this.sentinel ) {
@@ -322,7 +322,7 @@ var publicationToPersonUtils = {
             // and reset an acSelection divs
             if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.collection.val('');
-                this.resetAcSelection('collection');                
+                this.resetAcSelection('collection');
             }
             if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.book.val('');
@@ -353,7 +353,7 @@ var publicationToPersonUtils = {
             // and reset an acSelection divs
             if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.collection.val('');
-                this.resetAcSelection('collection');                
+                this.resetAcSelection('collection');
             }
             if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
                 this.book.val('');
@@ -381,9 +381,9 @@ var publicationToPersonUtils = {
             this.issue.val('');
             this.startPage.val('');
             this.endPage.val('');
-            this.chapterNbr.val('');     
+            this.chapterNbr.val('');
         }
-        
+
      },
 
      resolveEditorNames: function() {
@@ -403,10 +403,10 @@ var publicationToPersonUtils = {
                  name = lastName;
                  if (firstName) {
                      name += ', ' + firstName;
-                 }            
+                 }
                  this.editor.val(name);
                  this.lastName.val(lastName);
-             } 
+             }
              else {
                  this.disableNameFields();
              }
@@ -414,9 +414,9 @@ var publicationToPersonUtils = {
         else {
             this.disableNameFields();
         }
-        
+
      },
-     
+
      disableNameFields: function() {
          this.firstName.attr('disabled', 'disabled');
          this.lastName.attr('disabled', 'disabled');
@@ -429,5 +429,5 @@ var publicationToPersonUtils = {
              this.editor.val(temp);
          }
      }
-     
+
 }
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
index 61e5873599..0513a41017 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
@@ -16,8 +16,8 @@ ${i18n().check_grants_to_exclude}
     var itemData = [];
 </script>
 </p>
-<@lvf.unsupportedBrowser urls.base /> 
-       
+<@lvf.unsupportedBrowser urls.base />
+
     <#list allSubclasses as sub>
     <h4>${sub}</h4>
         <section id="pubsContainer" role="container">
@@ -29,16 +29,16 @@ ${i18n().check_grants_to_exclude}
             </li>
             <script type="text/javascript">
                 itemData.push({
-                    "relatedUri": "${grant.role!}"              
+                    "relatedUri": "${grant.role!}"
                 });
-            </script>      
-            
+            </script>
+
             </#list>
         </ul>
         </section>
     </#list>
 
-<br />    
+<br />
 <p>
     <a href="${urls.referringPage}#research" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
 </p>
@@ -60,4 +60,4 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></s
               '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
                 '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/manageHideShowStatus.js"></script>')}
-              
+
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
index 903e47656b..041bf2fca1 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
@@ -11,9 +11,9 @@ ${i18n().check_people_to_exclude}
 </script>
 </p>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
 
-       
     <#list allSubclasses as sub>
     <h4>${sub}</h4>
         <section id="pubsContainer" role="container">
@@ -25,16 +25,16 @@ ${i18n().check_people_to_exclude}
             </li>
             <script type="text/javascript">
                 itemData.push({
-                    "relatedUri": "${person.position}"              
+                    "relatedUri": "${person.position}"
                 });
-            </script>      
-            
+            </script>
+
             </#list>
         </ul>
         </section>
     </#list>
 
-<br />    
+<br />
 <p>
     <a href="${urls.referringPage}#affiliation" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
 </p>
@@ -56,4 +56,4 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></s
               '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
                 '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/manageHideShowStatus.js"></script>')}
-              
+
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
index 66fd39c394..e767c6521e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
@@ -17,9 +17,9 @@ ${i18n().check_pubs_to_exclude}
 </script>
 </p>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
 
-       
     <#list allSubclasses as sub>
     <h4>
         <#if sub = "Software">
@@ -42,16 +42,16 @@ ${i18n().check_pubs_to_exclude}
             </li>
             <script type="text/javascript">
                 itemData.push({
-                    "relatedUri": "${pub.authorship}"              
+                    "relatedUri": "${pub.authorship}"
                 });
-            </script>      
-            
+            </script>
+
             </#list>
         </ul>
         </section>
     </#list>
 
-<br />    
+<br />
 <p>
     <a href="${urls.referringPage}#publications" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
 </p>
@@ -73,4 +73,4 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></s
               '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
                 '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/manageHideShowStatus.js"></script>')}
-              
+
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
index 071720096b..436e7da9ea 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
@@ -17,7 +17,7 @@
 </#if>
 
 <h3>${i18n().manage_web_pages}</h3>
-       
+
 <script type="text/javascript">
     var webpageData = [];
 </script>
@@ -34,31 +34,31 @@
             <#else>
                 <#assign anchor=webpage.url >
             </#if>
-            
+
             <span class="itemName extra-wide">
-                <a href="${webpage.url}" title="${i18n().webpage_url}">${anchor}</a> 
+                <a href="${webpage.url}" title="${i18n().webpage_url}">${anchor}</a>
                 <#if webpage.typeLabel??>(<#if webpage.typeLabel == "URL">Standard Web Link<#else>${webpage.typeLabel}</#if></#if>)
             </span>
             <span class="editingLinks">
-                <a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}&rangeUri=${editConfiguration.rangeUri?url}&domainUri=${editConfiguration.domainUri?url}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> | 
-                <a href="${urls.base}${deleteWebpageUrl}" class="remove" title="${i18n().delete_webpage_link}">${i18n().delete_button}</a> 
+                <a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}&rangeUri=${editConfiguration.rangeUri?url}&domainUri=${editConfiguration.domainUri?url}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> |
+                <a href="${urls.base}${deleteWebpageUrl}" class="remove" title="${i18n().delete_webpage_link}">${i18n().delete_button}</a>
             </span>
-        </li>    
-        
+        </li>
+
         <script type="text/javascript">
             webpageData.push({
-                "webpageUri": "${webpage.link}"              
+                "webpageUri": "${webpage.link}"
             });
-        </script>      
-    </#list>  
+        </script>
+    </#list>
 </ul>
 
 <section id="addAndCancelLinks" role="section">
     <#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel.
-         These can just be ordinary links, rather than a v:input element, as in 
-         addAuthorsToInformationResource.jsp. -->   
+         These can just be ordinary links, rather than a v:input element, as in
+         addAuthorsToInformationResource.jsp. -->
     <a href="${showAddFormUrl}" id="showAddFormButton" title="${i18n().add_new_web_page}">${i18n().add_new_web_page}</a>
-     <span class="or"> ${i18n().or} </span>  
+     <span class="or"> ${i18n().or} </span>
     <a href="${cancelUrl}" id="returnToIndividual" class="return" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
     <img id="indicator" class="indicator hidden" src="${urls.base}/images/indicatorWhite.gif" alt="${i18n().processing_indicator}"/>
 </section>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
index 9d72766b1e..bf468d0e66 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
@@ -1,16 +1,16 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<section id="internal-class" role="region">
-    <#if internalClass?has_content>
-        <#assign enableInternalClass = '' />
-        <#assign disableClass = 'class="inline"' />
-    <#else>
-        <#assign enableInternalClass = '<p class="note">${i18n().enable_internal_class_one} <a href="${urls.base}/processInstitutionalInternalClass" title="${i18n().internal_class}">${i18n().internal_class}</a> ${i18n().enable_internal_class_two}</p>' />
-        <#assign disableClass = 'class="disable inline" disabled="disabled"' />
-    </#if>
-
-                <input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if internalClass?has_content && isInternal?has_content>checked</#if> role="input" />
-    <label ${disableClass} class="inline" for="display-internalClass">${i18n().only_display} <em>${associatedPage}</em> ${i18n().within_my_institution}</label>
-
-    ${enableInternalClass}
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<section id="internal-class" role="region">
+    <#if internalClass?has_content>
+        <#assign enableInternalClass = '' />
+        <#assign disableClass = 'class="inline"' />
+    <#else>
+        <#assign enableInternalClass = '<p class="note">${i18n().enable_internal_class_one} <a href="${urls.base}/processInstitutionalInternalClass" title="${i18n().internal_class}">${i18n().internal_class}</a> ${i18n().enable_internal_class_two}</p>' />
+        <#assign disableClass = 'class="disable inline" disabled="disabled"' />
+    </#if>
+
+                <input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if internalClass?has_content && isInternal?has_content>checked</#if> role="input" />
+    <label ${disableClass} class="inline" for="display-internalClass">${i18n().only_display} <em>${associatedPage}</em> ${i18n().within_my_institution}</label>
+
+    ${enableInternalClass}
 </section>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl
index 9caab032d4..fd6f0ddbcd 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl
@@ -44,16 +44,16 @@
 
 <#assign requiredHint = "<span class='requiredHint'> *</span>" />
 
-<section id="newIndividual" role="region">        
-    
+<section id="newIndividual" role="region">
+
     <form id="newIndividual" class="customForm noIE67" action="${submitUrl}"  role="add new individual">
- 
-    <#if isPersonType = "true">       
+
+    <#if isPersonType = "true">
         <p>
             <label for="firstName">${i18n().first_name} ${requiredHint}</label>
             <input size="30"  type="text" id="firstName" name="firstName" value="${firstNameValue}" />
         </p>
-        
+
         <p>
             <label for="lastName">${i18n().middle_name} </label>
             <input size="30"  type="text" id="middleName" name="middleName" value="${middleNameValue}" />
@@ -63,9 +63,9 @@
             <label for="lastName">${i18n().last_name} ${requiredHint}</label>
             <input size="30"  type="text" id="lastName" name="lastName" value="${lastNameValue}" />
         </p>
-        
+
         <input type="hidden" id="label" name="label" value="${labelValue}" />
-    <#else>       
+    <#else>
         <p>
             <label for="name">${i18n().name_capitalized} ${requiredHint}</label>
             <input size="30"  type="text" id="label" name="label" value="${labelValue}" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl
index 4be00752df..a01c35a753 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl
@@ -37,12 +37,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-<#assign titleVerb="${i18n().create_capitalized}">        
+<#assign titleVerb="${i18n().create_capitalized}">
 <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -56,22 +56,22 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#if grantLabelDisplayValue?has_content >
         <#assign grantLabelValue = grantLabelDisplayValue />
     </#if>
-        
+
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--Checking if any required fields are empty-->
         <#if lvf.submissionErrorExists(editSubmission, "grantLabel")>
  	        ${i18n().enter_or_select_grant}
-        </#if> 
+        </#if>
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="organizationAdministers" role="region">
 
-<section id="organizationAdministers" role="region">        
-    
     <form id="organizationAdministersGrant" class="customForm noIE67" action="${submitUrl}"  role="add/edit AdministeringOrganization">
     <p>
         <label for="relatedIndLabel">${i18n().grant_name} ${requiredHint}</label>
@@ -83,7 +83,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_grant}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="grantUri" name="existingGrant" value="${existingGrantValue}" ${flagClearLabelForExisting}="true" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl
index 7c5389c555..0ed1e9abed 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl
@@ -44,12 +44,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit" || editMode == "repair">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit" || editMode == "repair">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -99,18 +99,18 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
          <#if lvf.submissionErrorExists(editSubmission, "trainingType")>
  	        ${i18n().select_educational_training_value}<br />
         </#if>
-        
-        
+
+
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="organizationForTraining" role="region">
 
-<section id="organizationForTraining" role="region">        
-    
     <form id="organizationForTraining" class="customForm noIE67" action="${submitUrl}"  role="add/edit organizational training">
-    
+
     <p >
         <label for="person">${i18n().person_capitalized}: ${i18n().last_name}  ${requiredHint}<span style="padding-left:322px">${i18n().first_name}  ${requiredHint}</span></label>
             <input class="acSelector" size="50"  type="text" acGroupName="person" id="person" name="personLabel" value="${personLabelValue}" >
@@ -119,12 +119,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <input type="hidden" id="lastName" name="lastName" value="">
             <input class="display" type="hidden" acGroupName="person" id="personDisplay" name="personLabelDisplay" value="${personLabelDisplayValue}" >
     </p>
-        
+
     <div class="acSelection" acGroupName="person">
         <p class="inline">
             <label>${i18n().selected_person}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="personUri" name="existingPerson" value="${existingPersonValue}" ${flagClearLabelForExisting}="true" />
@@ -132,40 +132,40 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <label for="positionType">${i18n().educational_training_type} ${requiredHint}</label>
     <#assign trainingTypeOpts = editConfiguration.pageData.trainingType />
     <select name="trainingType" style="margin-top:-2px" >
-        <option value="" <#if trainingTypeValue == "">selected</#if>>${i18n().select_one}</option>                
-        <#list trainingTypeOpts?keys as key>             
-            <option value="${key}"  <#if trainingTypeValue == key>selected</#if>><#if trainingTypeOpts[key] == "Other">${i18n().academic_studies_or_other}<#else>${trainingTypeOpts[key]}</#if></option>         
+        <option value="" <#if trainingTypeValue == "">selected</#if>>${i18n().select_one}</option>
+        <#list trainingTypeOpts?keys as key>
+            <option value="${key}"  <#if trainingTypeValue == key>selected</#if>><#if trainingTypeOpts[key] == "Other">${i18n().academic_studies_or_other}<#else>${trainingTypeOpts[key]}</#if></option>
         </#list>
     </select>
     <p>
         <label for="dept">${i18n().dept_or_school_name} ${i18n().person_capitalized}</label>
         <input  size="50"  type="text" id="dept" name="dept" value="${deptValue}" />
     </p>
-    
+
     <div class="entry">
-      <label for="degreeUri">${i18n().degree}</label>      
-    
-      <#assign degreeOpts = editConfiguration.pageData.degreeType />  
+      <label for="degreeUri">${i18n().degree}</label>
+
+      <#assign degreeOpts = editConfiguration.pageData.degreeType />
       <select name="degreeType" id="degreeUri" >
-        <option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>        
-               <#list degreeOpts?keys as key>                 
-        <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>                    
-        </#list>                                
+        <option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>
+               <#list degreeOpts?keys as key>
+        <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>
+        </#list>
       </select>
             <input type="hidden" id="awardedDegreeLabel" name="awardedDegreeLabel" value=""/>
     </div>
-    
-    <p>    
+
+    <p>
         <label for="majorField">${i18n().major_field}</label>
-        <input type="text" id="majorField" name="majorField" size="30" value="${majorFieldValue}"/>   
-    </p>   
-          
-    <p>    
-        <label for="info">${i18n().supplemental_information} 
+        <input type="text" id="majorField" name="majorField" size="30" value="${majorFieldValue}"/>
+    </p>
+
+    <p>
+        <label for="info">${i18n().supplemental_information}
             <span class="hint">&nbsp;${i18n().supplemental_information_hint}</span>
         </label>
         <input  size="60"  type="text" id="info" name="info" value="${infoValue}" />
-        
+
     </p>
     <p></p>
     <#--Need to draw edit elements for dates here-->
@@ -178,7 +178,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 			<label class="dateTime" for="endField">${i18n().end_capitalized}</label>
 		 	${htmlForElements["endField"]} ${yearHint}
      </#if>
-                                    
+
   	<#--End draw elements-->
     <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
     <p class="submit">
@@ -214,7 +214,7 @@ $(document).ready(function() {
 </script>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
index cb57651323..2fed809fb9 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
@@ -10,12 +10,12 @@
     <#assign editMode = "add">
 </#if>
 
-<#if editMode == "edit">        
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -55,14 +55,14 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p>
         <#if lvf.submissionErrorExists(editSubmission, "positionTitle")>
             ${i18n().enter_posn_title_value}<br />
-        </#if> 
+        </#if>
         <#if lvf.submissionErrorExists(editSubmission, "positionType")>
             ${i18n().enter_posn_type_value}<br />
         </#if>
         <#if lvf.submissionErrorExists(editSubmission, "personLabel")>
  	        ${i18n().enter_or_select_person_value}
-        </#if> 
-        
+        </#if>
+
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
@@ -70,7 +70,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
-        	    
+
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
     	            ${i18n().end_year_must_be_later}
@@ -87,14 +87,14 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 
 <@lvf.unsupportedBrowser urls.base/>
 
-<section id="organizationHasPositionHistory" role="region">        
-    
+<section id="organizationHasPositionHistory" role="region">
+
 	<form id="organizationHasPositionHistory" class="customForm noIE67" action="${submitUrl}"  role="add/edit position history">
 	    <p>
 	        <label for="positionTitle">${i18n().position_title} ${requiredHint}</label>
 	        <input size="30" type="text" id="positionTitle" name="positionTitle" value="${positionTitleValue}" />
 	    </p>
-	    
+
 	    <label for="positionType">${i18n().position_type} ${requiredHint}</label>
         <#assign posnTypeOpts = editConfiguration.pageData.positionType />
 	    <select id="positionType" name="positionType">
@@ -102,10 +102,10 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	        <#if (posnTypeOpts?keys)??>
 		        <#list posnTypeOpts?keys as key>
                     <#if positionTypeValue?has_content && positionTypeValue = key>
-                        <option value="${key}" selected >${posnTypeOpts[key]}</option>     
+                        <option value="${key}" selected >${posnTypeOpts[key]}</option>
                     <#else>
                         <option value="${key}">${posnTypeOpts[key]}</option>
-                    </#if>        
+                    </#if>
                 </#list>
 	        </#if>
 	    </select>
@@ -116,17 +116,17 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
                 <input type="hidden" id="lastName" name="lastName" value="">
                 <input class="display" type="hidden" acGroupName="person" id="personDisplay" name="personLabelDisplay" value="${personLabelDisplayValue}" >
 	    </p>
-	
+
 	    <div class="acSelection" id="personAcSelection" acGroupName="person">
 	        <p class="inline">
 	            <label>${i18n().selected_person}:</label>
 	            <span class="acSelectionInfo"></span>
-                <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+                <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
                 <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
 	        </p>
 	        <input class="acUriReceiver" type="hidden" id="personUri" name="existingPerson" value="${existingPersonValue}" ${flagClearLabelForExisting}="true" />
 	    </div>
-        
+
         <br />
         <#--Need to draw edit elements for dates here-->
         <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
@@ -147,12 +147,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <input type="submit" id="submit" value="${submitButtonText}"/>
             <span class="or"> ${i18n().or} </span><a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         </p>
-	
+
 	    <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
 
 	</form>
-	
-	
+
+
 	<script type="text/javascript">
 	var customFormData  = {
 	    acUrl: '${urls.base}/autocomplete?tokenize=true&stem=true',
@@ -162,7 +162,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	    baseHref: '${urls.base}/individual?uri=',
         blankSentinel: '${blankSentinel}',
         flagClearLabelForExisting: '${flagClearLabelForExisting}'
-        
+
 	};
 	var i18nStrings = {
         selectAnExisting: '${i18n().select_an_existing}',
@@ -176,7 +176,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 $(document).ready(function(){
     orgHasPositionUtils.onLoad('${blankSentinel}');
 });
-</script> 
+</script>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
index 690cd2ea87..06db6a83b3 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
@@ -1,5 +1,5 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#-- Scripts for class group browsing -->
-<#--Replaces Vitro's processing for individuals for classes with VIVO's processing internal classes-->
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processClassGroupDataGetterContent.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processInternalClassDataGetterContent.js"></script>')}
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#-- Scripts for class group browsing -->
+<#--Replaces Vitro's processing for individuals for classes with VIVO's processing internal classes-->
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processClassGroupDataGetterContent.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processInternalClassDataGetterContent.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
index 4deff695de..8705b11b7b 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
@@ -1,17 +1,17 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#assign internalClassUri = editConfiguration.pageData.internalClassUri />
-<section id="internal-class" role="region">
-    <#if editConfiguration.pageData.internalClass?has_content>
-        <#assign enableInternalClass = '' />
-        <#assign disableClass = 'class="inline"' />
-    <#else>
-        <#assign enableInternalClass = '<p class="note">${i18n().enable_internal_class_one} <a href="${urls.base}/processInstitutionalInternalClass" title="${i18n().internal_class}">${i18n().internal_class}</a> ${i18n().enable_internal_class_two}</p>' />
-        <#assign disableClass = 'class="disable inline" disabled="disabled"' />
-    </#if>
-
-                <input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if editConfiguration.pageData.internalClass?has_content && editConfiguration.pageData.isInternal?has_content>checked</#if> role="input" />
-    <label ${disableClass} class="inline" for="display-internalClass">${i18n().only_display} <em> </em> ${i18n().within_my_institution}</label>
-
-    ${enableInternalClass}
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#assign internalClassUri = editConfiguration.pageData.internalClassUri />
+<section id="internal-class" role="region">
+    <#if editConfiguration.pageData.internalClass?has_content>
+        <#assign enableInternalClass = '' />
+        <#assign disableClass = 'class="inline"' />
+    <#else>
+        <#assign enableInternalClass = '<p class="note">${i18n().enable_internal_class_one} <a href="${urls.base}/processInstitutionalInternalClass" title="${i18n().internal_class}">${i18n().internal_class}</a> ${i18n().enable_internal_class_two}</p>' />
+        <#assign disableClass = 'class="disable inline" disabled="disabled"' />
+    </#if>
+
+                <input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if editConfiguration.pageData.internalClass?has_content && editConfiguration.pageData.isInternal?has_content>checked</#if> role="input" />
+    <label ${disableClass} class="inline" for="display-internalClass">${i18n().only_display} <em> </em> ${i18n().within_my_institution}</label>
+
+    ${enableInternalClass}
 </section>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
index dea8cc8d75..3924538607 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
@@ -1,21 +1,21 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#--Sets up script for custom form data. Including here instead of as separate javascript
-file to ensure this script is always loaded first.  Can also make sure placed first in 
-scripts list.-->
-
-<#--Overwrites original in Vitro by including internalClass as the data getter instead of individuals for classes-->
-
-<script type="text/javascript">
-    var customFormData = {
-    menuAction:"${menuAction}",
-    addMenuItem:"${addMenuItem}",
-      dataGetterLabelToURI:{
-      		//maps labels to URIs
-      		"browseClassGroup": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData",
-      		"internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter",
-      		"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
-      		"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter",
-      		"searchIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter"
-      }
-    };
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+<#--Sets up script for custom form data. Including here instead of as separate javascript
+file to ensure this script is always loaded first.  Can also make sure placed first in
+scripts list.-->
+
+<#--Overwrites original in Vitro by including internalClass as the data getter instead of individuals for classes-->
+
+<script type="text/javascript">
+    var customFormData = {
+    menuAction:"${menuAction}",
+    addMenuItem:"${addMenuItem}",
+      dataGetterLabelToURI:{
+      		//maps labels to URIs
+      		"browseClassGroup": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData",
+      		"internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter",
+      		"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
+      		"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter",
+      		"searchIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter"
+      }
+    };
 </script>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
index 4ce5a5b665..c798b0ae25 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
@@ -43,12 +43,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -66,14 +66,14 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#if subjAreaLabelDisplayValue?has_content >
         <#assign subjAreaLabelValue = subjAreaLabelDisplayValue />
     </#if>
-    
+
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--Checking if any required fields are empty-->
         <#if lvf.submissionErrorExists(editSubmission, "advisingRelType")>
  	        ${i18n().select_advising_relationship_type}<br />
-        </#if> 
+        </#if>
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
@@ -81,7 +81,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
-        	    
+
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
     	            ${i18n().end_year_must_be_later}
@@ -97,16 +97,16 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasAdvisingRelationship" role="region">
 
-<section id="personHasAdvisingRelationship" role="region">        
-    
     <form id="personHasAdvisingRelationship" class="customForm noIE67" action="${submitUrl}"  role="add/edit AdvisingRelationship">
-    <p class="inline">    
+    <p class="inline">
       <label for="orgType">${i18n().advising_relationship_type}<#if editMode != "edit"> ${requiredHint}<#else>:</#if></label>
       <#assign advisingRelTypeOpts = editConfiguration.pageData.advisingRelType />
       <#if editMode == "edit">
-        <#list advisingRelTypeOpts?keys as key>             
+        <#list advisingRelTypeOpts?keys as key>
             <#if advisingRelTypeValue = key >
                 <span class="readOnly">${advisingRelTypeOpts[key]}</span>
                 <input type="hidden" id="typeSelectorInput" name="advisingRelType"  value="${advisingRelTypeValue}" >
@@ -114,9 +114,9 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         </#list>
       <#else>
         <select id="selector" name="advisingRelType"  ${disabledVal} >
-            <option value="" selected="selected">${i18n().select_one}</option>                
-            <#list advisingRelTypeOpts?keys as key>             
-                <option value="${key}"  <#if advisingRelTypeValue = key>selected</#if>>${advisingRelTypeOpts[key]}</option>            
+            <option value="" selected="selected">${i18n().select_one}</option>
+            <#list advisingRelTypeOpts?keys as key>
+                <option value="${key}"  <#if advisingRelTypeValue = key>selected</#if>>${advisingRelTypeOpts[key]}</option>
             </#list>
         </select>
       </#if>
@@ -134,7 +134,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_advisor}
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="advisorUri" name="existingAdvisor" value="${advisorValue}" ${flagClearLabelForExisting}="true"/>
@@ -149,7 +149,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
           <p class="inline">
               <label>${i18n().selected_subject_area}:</label>
               <span class="acSelectionInfo"></span>
-              <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+              <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
               <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
           </p>
           <#--When no autocomplete value is selected, the value of this field will be set to the 'blank sentinel'.
@@ -158,15 +158,15 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
       </div>
 
     <p>
-    <label for="degreeUri">${i18n().degree_candidacy}</label>      
-  
-    <#assign degreeOpts = editConfiguration.pageData.degree />  
+    <label for="degreeUri">${i18n().degree_candidacy}</label>
+
+    <#assign degreeOpts = editConfiguration.pageData.degree />
     <select name="degree" id="degreeUri" >
-      <option value="${blankSentinel}" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>        
-             <#list degreeOpts?keys as key>                 
-      <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>                    
-      </#list>                                
-    </select>    
+      <option value="${blankSentinel}" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>
+             <#list degreeOpts?keys as key>
+      <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>
+      </#list>
+    </select>
     </p>
 
     <p>
@@ -229,8 +229,8 @@ var i18nStrings = {
 $(document).ready(function(){
     adviseeRelUtils.onLoad('${editConfiguration.subjectName}', '${blankSentinel}');
 });
-</script> 
- 
+</script>
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl
index bc2bcfe26e..09a3c5461a 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl
@@ -43,12 +43,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -66,14 +66,14 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#if subjAreaLabelDisplayValue?has_content >
         <#assign subjAreaLabelValue = subjAreaLabelDisplayValue />
     </#if>
-    
+
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--Checking if any required fields are empty-->
         <#if lvf.submissionErrorExists(editSubmission, "advisingRelType")>
  	        ${i18n().select_advising_relationship_type}<br />
-        </#if> 
+        </#if>
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
@@ -81,7 +81,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
-        	    
+
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
     	            ${i18n().end_year_must_be_later}
@@ -97,16 +97,16 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasAdvisingRelationship" role="region">
 
-<section id="personHasAdvisingRelationship" role="region">        
-    
     <form id="personHasAdvisingRelationship" class="customForm noIE67" action="${submitUrl}"  role="add/edit AdvisingRelationship">
-    <p class="inline">    
+    <p class="inline">
       <label for="orgType">${i18n().advising_relationship_type}<#if editMode != "edit"> ${requiredHint}<#else>:</#if></label>
       <#assign advisingRelTypeOpts = editConfiguration.pageData.advisingRelType />
       <#if editMode == "edit">
-        <#list advisingRelTypeOpts?keys as key>             
+        <#list advisingRelTypeOpts?keys as key>
             <#if advisingRelTypeValue = key >
                 <span class="readOnly">${advisingRelTypeOpts[key]}</span>
                 <input type="hidden" id="typeSelectorInput" name="advisingRelType"  value="${advisingRelTypeValue}" >
@@ -115,8 +115,8 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
       <#else>
         <select id="selector" name="advisingRelType"  ${disabledVal} >
             <option value="" selected="selected">${i18n().select_one}</option>
-            <#list advisingRelTypeOpts?keys as key>             
-                <option value="${key}"  <#if advisingRelTypeValue = key>selected</#if>>${advisingRelTypeOpts[key]}</option>            
+            <#list advisingRelTypeOpts?keys as key>
+                <option value="${key}"  <#if advisingRelTypeValue = key>selected</#if>>${advisingRelTypeOpts[key]}</option>
             </#list>
         </select>
       </#if>
@@ -134,7 +134,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_advisee}
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="adviseeUri" name="existingAdvisee" value="${adviseeValue}" ${flagClearLabelForExisting}="true"/>
@@ -149,7 +149,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
           <p class="inline">
               <label>${i18n().selected_subject_area}:</label>
               <span class="acSelectionInfo"></span>
-              <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+              <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
               <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
           </p>
           <#--When no autocomplete value is selected, the value of this field will be set to the 'blank sentinel'.
@@ -158,15 +158,15 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
       </div>
 
     <p>
-    <label for="degreeUri">${i18n().degree_candidacy}</label>      
-  
-    <#assign degreeOpts = editConfiguration.pageData.degree />  
+    <label for="degreeUri">${i18n().degree_candidacy}</label>
+
+    <#assign degreeOpts = editConfiguration.pageData.degree />
     <select name="degree" id="degreeUri" >
-      <option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>        
-             <#list degreeOpts?keys as key>                 
-      <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>                    
-      </#list>                                
-    </select>    
+      <option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>
+             <#list degreeOpts?keys as key>
+      <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>
+      </#list>
+    </select>
     </p>
 
     <p>
@@ -229,8 +229,8 @@ var i18nStrings = {
 $(document).ready(function(){
     advisorRelUtils.onLoad('${editConfiguration.subjectName}', '${blankSentinel}');
 });
-</script> 
- 
+</script>
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl
index 9789386c88..6cc9391c5b 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl
@@ -43,12 +43,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-<#assign titleVerb="${i18n().create_capitalized}">        
+<#assign titleVerb="${i18n().create_capitalized}">
 <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -66,14 +66,14 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#if awardLabelDisplayValue?has_content >
         <#assign awardLabelValue = awardLabelDisplayValue />
     </#if>
-        
+
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--Checking if any required fields are empty-->
         <#if lvf.submissionErrorExists(editSubmission, "awardLabel")>
  	        ${i18n().select_Award_or_enter_name}
-        </#if> 
+        </#if>
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
@@ -81,7 +81,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
-        	    
+
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
     	            ${i18n().end_year_must_be_later}
@@ -94,10 +94,10 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasAwardOrHonor" role="region">
 
-<section id="personHasAwardOrHonor" role="region">        
-    
     <form id="personHasAwardOrHonor" class="customForm noIE67" action="${submitUrl}"  role="add/edit AwardOrHonor">
     <p>
         <label for="relatedIndLabel">${i18n().award_honor_name} ${requiredHint}</label>
@@ -109,7 +109,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_award}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="awardUri" name="existingAward" value="${awardValue}" ${flagClearLabelForExisting}="true" />
@@ -119,12 +119,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
       <input  class="acSelector" size="50" acGroupName="org" type="text" id="org" name="orgLabel" value="${orgLabelValue}" />
       <input  class="display" type="hidden" id="orgDisplay" acGroupName="org" name="orgLabelDisplay" value="${orgLabelDisplayValue}" />
   </p>
-  
+
   <div class="acSelection" acGroupName="org" id="orgAcSelection">
       <p class="inline">
           <label>${i18n().selected_conferred}:</label>
           <span class="acSelectionInfo"></span>
-          <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+          <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
           <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
       </p>
       <input class="acUriReceiver" type="hidden" id="orgUri" name="existingOrg" value="${orgValue}" ${flagClearLabelForExisting}="true"/>
@@ -174,7 +174,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#-- hide the html that gets written, and use java script to pass the value between the two -->
     <div class="hidden">
         <#if htmlForElements?keys?seq_contains("yearAwarded")>
-		    ${htmlForElements["yearAwarded"]} 
+		    ${htmlForElements["yearAwarded"]}
         </#if>
     </div>
 
@@ -203,11 +203,11 @@ var i18nStrings = {
 
 </script>
 
- 
+
 <script type="text/javascript">
  $(document).ready(function(){
     awardReceiptUtils.onLoad('${editMode}', '${editConfiguration.subjectName}', '${urls.base}/individual?uri=');
-}); 
+});
 </script>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
index 3185832cf1..b29e0e4cc5 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
@@ -45,12 +45,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit" || editMode == "repair">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit" || editMode == "repair">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -98,95 +98,95 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
          <#if lvf.submissionErrorExists(editSubmission, "trainingType")>
  	        ${i18n().select_educational_training_value}<br />
         </#if>
-        
-        
+
+
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasEducationalTraining" role="region">
 
-<section id="personHasEducationalTraining" role="region">        
-    
     <form id="personHasEducationalTraining" class="customForm noIE67" action="${submitUrl}"  role="add/edit educational training">
 
-    
-    <p class="inline">    
+
+    <p class="inline">
         <label for="orgType">${i18n().org_type_capitalized} ${requiredHint}</label>
         <#assign orgTypeOpts = editConfiguration.pageData.orgType />
         <select id="typeSelector" name="orgType" acGroupName="organization">
-            <option value="" selected="selected">${i18n().select_one}</option>                
-            <#list orgTypeOpts?keys as key>             
+            <option value="" selected="selected">${i18n().select_one}</option>
+            <#list orgTypeOpts?keys as key>
                 <#if orgTypeValue = key>
-                    <option value="${key}"  selected >${orgTypeOpts[key]}</option>     
+                    <option value="${key}"  selected >${orgTypeOpts[key]}</option>
                 <#else>
                     <option value="${key}">${orgTypeOpts[key]}</option>
                 </#if>
             </#list>
         </select>
-    </p>     
-    
+    </p>
+
     <p>
         <label for="relatedIndLabel">${i18n().organization_capitalized} ${i18n().name_capitalized} ${requiredHint}</label>
         <input class="acSelector" size="50"  type="text" id="relatedIndLabel" name="orgLabel" acGroupName="organization" value="${orgLabelValue}"  />
         <input class="display" type="hidden" id="orgDisplay" acGroupName="organization" name="orgLabelDisplay" value="${orgLabelDisplayValue}">
     </p>
-        
+
     <div class="acSelection" acGroupName="organization">
         <p class="inline">
             <label>${i18n().selected_organization}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="orgUri" name="existingOrg" value="${existingOrgValue}" ${flagClearLabelForExisting}="true" />
     </div>
-    
+
     <label for="positionType">${i18n().educational_training_type} ${requiredHint}</label>
     <#assign trainingTypeOpts = editConfiguration.pageData.trainingType />
     <select name="trainingType" style="margin-top:-2px" >
-        <option value="" <#if trainingTypeValue == "">selected</#if>>${i18n().select_one}</option>                
-        <#list trainingTypeOpts?keys as key>             
-            <option value="${key}"  <#if trainingTypeValue == key>selected</#if>><#if trainingTypeOpts[key] == "Other">${i18n().academic_studies_or_other}<#else>${trainingTypeOpts[key]}</#if></option>         
+        <option value="" <#if trainingTypeValue == "">selected</#if>>${i18n().select_one}</option>
+        <#list trainingTypeOpts?keys as key>
+            <option value="${key}"  <#if trainingTypeValue == key>selected</#if>><#if trainingTypeOpts[key] == "Other">${i18n().academic_studies_or_other}<#else>${trainingTypeOpts[key]}</#if></option>
         </#list>
     </select>
     <p>
         <label for="dept">${i18n().dept_or_school_name} ${i18n().organization_capitalized}</label>
         <input  size="50"  type="text" id="dept" name="dept" value="${deptValue}" />
     </p>
-    
+
     <div class="entry">
-      <label for="degreeUri">${i18n().degree}</label>      
-    
-      <#assign degreeOpts = editConfiguration.pageData.degreeType />  
+      <label for="degreeUri">${i18n().degree}</label>
+
+      <#assign degreeOpts = editConfiguration.pageData.degreeType />
       <select name="degreeType" id="degreeUri" >
-        <option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>        
-               <#list degreeOpts?keys as key>                 
-        <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>                    
-        </#list>                                
+        <option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>
+               <#list degreeOpts?keys as key>
+        <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>
+        </#list>
       </select>
 <#--
       <#if editMode == "edit" || editMode == "repair">
-            <input type="hidden" id="newAwardedDegreeLabel" name="awardedDegreeLabel" value=""/> 
-            <input type="hidden" id="awardedDegreeLabel" name="existingAwardedDegreeLabel" value="${existingADLabelValue!}"/> 
+            <input type="hidden" id="newAwardedDegreeLabel" name="awardedDegreeLabel" value=""/>
+            <input type="hidden" id="awardedDegreeLabel" name="existingAwardedDegreeLabel" value="${existingADLabelValue!}"/>
       <#else>
-            <input type="hidden" id="awardedDegreeLabel" name="awardedDegreeLabel" value=""/> 
-      </#if> 
+            <input type="hidden" id="awardedDegreeLabel" name="awardedDegreeLabel" value=""/>
+      </#if>
 -->
             <input type="hidden" id="awardedDegreeLabel" name="awardedDegreeLabel" value=""/>
     </div>
-    
-    <p>    
+
+    <p>
         <label for="majorField">${i18n().major_field}</label>
-        <input type="text" id="majorField" name="majorField" size="30" value="${majorFieldValue}"/>   
-    </p>   
-          
-    <p>    
-        <label for="info">${i18n().supplemental_information} 
+        <input type="text" id="majorField" name="majorField" size="30" value="${majorFieldValue}"/>
+    </p>
+
+    <p>
+        <label for="info">${i18n().supplemental_information}
             <span class="hint">&nbsp;${i18n().supplemental_information_hint}</span>
         </label>
         <input  size="60"  type="text" id="info" name="info" value="${infoValue}" />
-        
+
     </p>
     <p></p>
     <#--Need to draw edit elements for dates here-->
@@ -199,7 +199,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 			<label class="dateTime" for="endField">${i18n().end_capitalized}</label>
 		 	${htmlForElements["endField"]} ${yearHint}
      </#if>
-                                    
+
   	<#--End draw elements-->
     <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
     <p class="submit">
@@ -235,7 +235,7 @@ $(document).ready(function() {
 </script>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl
index 3a3d73ec98..4ec9ed5cdf 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl
@@ -23,12 +23,12 @@
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${titleVerb}" + " ${i18n().email_address}">
         <#assign disabledVal=""/>
 </#if>
@@ -45,15 +45,15 @@
             <#--Checking if any required fields are empty-->
             <#if lvf.submissionErrorExists(editSubmission, "emailAddress")>
  	            ${i18n().enter_email_address}<br />
-            </#if>        
+            </#if>
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasAdditionalEmail" role="region">
 
-<section id="personHasAdditionalEmail" role="region">        
-    
     <form id="personHasAdditionalEmail" class="customForm noIE67" action="${submitUrl}"  role="add/edit phone">
 
         <p>
@@ -73,7 +73,7 @@
     </form>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
index 1078aa9a84..f0a18cc6eb 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
@@ -40,12 +40,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-<#assign titleVerb="${i18n().create_capitalized}">        
+<#assign titleVerb="${i18n().create_capitalized}">
 <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -60,14 +60,14 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#if credentialLabelDisplayValue?has_content >
         <#assign credentialLabelValue = credentialLabelDisplayValue />
     </#if>
-        
+
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--Checking if any required fields are empty-->
         <#if lvf.submissionErrorExists(editSubmission, "credentialLabel")>
  	        ${i18n().select_credential_or_enter_name}
-        </#if> 
+        </#if>
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
@@ -75,7 +75,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
-        	    
+
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
     	            ${i18n().end_year_must_be_later}
@@ -88,12 +88,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasIssuedCredential" role="region">
 
-<section id="personHasIssuedCredential" role="region">        
-    
     <form id="personHasIssuedCredential" class="customForm noIE67" action="${submitUrl}"  role="add/edit IssuedCredential">
-    <p class="inline">    
+    <p class="inline">
         <label for="credentialType">${i18n().type_of_credential} ${requiredHint}</label>
         <#assign credentialTypeOpts = editConfiguration.pageData.credentialType />
 
@@ -101,28 +101,28 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <#if editMode == "add" >
 
         <select id="typeSelector" name="credentialType" acGroupName="credential">
-            <option value="" selected="selected">${i18n().select_one}</option>                
-            <#list credentialTypeOpts?keys as key>             
+            <option value="" selected="selected">${i18n().select_one}</option>
+            <#list credentialTypeOpts?keys as key>
                 <#if credentialTypeValue = key>
-                    <option value="${key}"  selected >${credentialTypeOpts[key]}</option>     
+                    <option value="${key}"  selected >${credentialTypeOpts[key]}</option>
                 <#else>
                     <option value="${key}">${credentialTypeOpts[key]}</option>
                 </#if>
             </#list>
         </select>
-        
+
         <#else>
-        <#list credentialTypeOpts?keys as key>             
+        <#list credentialTypeOpts?keys as key>
             <#if credentialTypeValue = key >
-              <span class="readOnly" id="typeSelectorSpan">${credentialTypeOpts[key]}</span> 
+              <span class="readOnly" id="typeSelectorSpan">${credentialTypeOpts[key]}</span>
               <input type="hidden" id="typeSelectorInput" name="credentialType" acGroupName="credential" value="${credentialTypeValue}" >
-            </#if>           
+            </#if>
         </#list>
-        
+
         </#if>
-        
-        
-    </p>     
+
+
+    </p>
     <p>
         <label for="relatedIndLabel">${i18n().credential_name} ${requiredHint}</label>
             <input class="acSelector" size="50"  type="text" id="credential" acGroupName="credential" name="credentialLabel" value="${credentialLabelValue}">
@@ -133,7 +133,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_credential}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="credentialUri" name="existingCredential" value="${credentialValue}" ${flagClearLabelForExisting}="true" />
@@ -141,9 +141,9 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 
 
-    <p>    
+    <p>
         <input type="hidden" id="issuedCredentialType" name="issuedCredentialType" acGroupName="credential" value="${issuedCredentialTypeValue}">
-    </p>     
+    </p>
 
     <p>
         <label for="yearCredentialedDisplay" id="yearCredentialed">${i18n().year_issued}</label>
@@ -176,7 +176,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <#-- hide the html that gets written, and use java script to pass the value between the two -->
     <div class="hidden">
         <#if htmlForElements?keys?seq_contains("yearCredentialed")>
-		    ${htmlForElements["yearCredentialed"]} 
+		    ${htmlForElements["yearCredentialed"]}
         </#if>
     </div>
 
@@ -206,11 +206,11 @@ var i18nStrings = {
 
 </script>
 
- 
+
 <script type="text/javascript">
  $(document).ready(function(){
     issuedCredentialUtils.onLoad();
-}); 
+});
 </script>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl
index 8d35ccbc23..963af61667 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl
@@ -31,17 +31,17 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 </#if>
 
 <#assign disabledVal = ""/>
-<#if editMode == "edit">        
-        <#assign formAction="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign formAction="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign formAction="${i18n().create_capitalized}">        
+        <#assign formAction="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal="">
 </#if>
 
-<#assign requiredHint="<span class='requiredHint'> *</span>"/> 
+<#assign requiredHint="<span class='requiredHint'> *</span>"/>
 <#assign yearHint     = "<span class='hint'>(${i18n().year_hint_format})</span>" />
 
 <h2>${formAction} ${i18n().posn_entry_for} ${editConfiguration.subjectName}</h2>
@@ -87,32 +87,32 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
          <#if lvf.submissionErrorExists(editSubmission, "positionType")>
  	        ${i18n().enter_posn_type_value}<br />
         </#if>
-        
+
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
 
 <form class="customForm" action ="${submitUrl}" class="customForm noIE67" role="${formAction} position entry">
-  <p class="inline">    
+  <p class="inline">
     <label for="orgType">${i18n().org_type_capitalized}<#if editMode != "edit"> ${requiredHint}<#else>:</#if></label>
     <#assign orgTypeOpts = editConfiguration.pageData.orgType />
 <#--
     <#if editMode == "edit">
-      <#list orgTypeOpts?keys as key>             
+      <#list orgTypeOpts?keys as key>
           <#if orgTypeValue = key >
-            <span class="readOnly" id="typeSelectorSpan">${orgTypeOpts[key]}</span> 
+            <span class="readOnly" id="typeSelectorSpan">${orgTypeOpts[key]}</span>
             <input type="hidden" id="typeSelectorInput" name="orgType" acGroupName="organization" value="${orgTypeValue}" >
-          </#if>           
+          </#if>
       </#list>
     <#else>
     </#if>
 -->
 <select id="typeSelector" name="orgType" acGroupName="organization">
-    <option value="" selected="selected">${i18n().select_one}</option>                
-    <#list orgTypeOpts?keys as key>             
-        <option value="${key}"  <#if orgTypeValue = key>selected</#if>>${orgTypeOpts[key]}</option>            
+    <option value="" selected="selected">${i18n().select_one}</option>
+    <#list orgTypeOpts?keys as key>
+        <option value="${key}"  <#if orgTypeValue = key>selected</#if>>${orgTypeOpts[key]}</option>
     </#list>
 </select>
   </p>
@@ -126,21 +126,21 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <p class="inline">
             <label>${i18n().selected_organization}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="orgUri" name="existingOrg" value="${existingOrgValue}" ${flagClearLabelForExisting}="true" />
     </div>
-    
+
     <label for="positionTitle">${i18n().position_title} ${requiredHint}</label>
     <input  size="30"  type="text" id="positionTitle" name="positionTitle" value="${positionTitleValue}" role="input" />
 
       <label for="positionType">${i18n().position_type} ${requiredHint}</label>
       <#assign posnTypeOpts = editConfiguration.pageData.positionType />
       <select name="positionType" style="margin-top:-2px" >
-          <option value="" <#if positionTypeValue == "">selected</#if>>${i18n().select_one}</option>                
-          <#list posnTypeOpts?keys as key>             
-              <option value="${key}"  <#if positionTypeValue == key>selected</#if>>${posnTypeOpts[key]}</option>         
+          <option value="" <#if positionTypeValue == "">selected</#if>>${i18n().select_one}</option>
+          <#list posnTypeOpts?keys as key>
+              <option value="${key}"  <#if positionTypeValue == key>selected</#if>>${posnTypeOpts[key]}</option>
           </#list>
       </select>
       <p></p>
@@ -156,20 +156,20 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
        </#if>
 
     	<#--End draw elements-->
-    	
+
       <input type="hidden" name = "editKey" value="${editKey}" role="input"/>
 
       <p class="submit">
-        <#if editMode == "edit">  
-            <input type="submit" id="submit" name="submit-${formAction}" value="${submitButtonText}" class="submit" /> 
+        <#if editMode == "edit">
+            <input type="submit" id="submit" name="submit-${formAction}" value="${submitButtonText}" class="submit" />
         <#else>
-            <input type="submit" id="submit" name="submit-${formAction}" value="${submitButtonText}" class="submit" /> 
+            <input type="submit" id="submit" name="submit-${formAction}" value="${submitButtonText}" class="submit" />
         </#if>
 
         <span class="or"> ${i18n().or} </span><a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
       </p>
       <p class="requiredHint"  id="requiredLegend" >* ${i18n().required_fields}</p>
-      
+
 </form>
 
 <script type="text/javascript">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl
index 60a3829013..0b4f8ffe69 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl
@@ -23,12 +23,12 @@
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${titleVerb}" + " ${i18n().preferred_title}">
         <#assign disabledVal=""/>
 </#if>
@@ -45,15 +45,15 @@
             <#--Checking if any required fields are empty-->
             <#if lvf.submissionErrorExists(editSubmission, "preferredTitle")>
  	            ${i18n().enter_preferred_title}<br />
-            </#if>        
+            </#if>
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasTelephoneNumber" role="region">
 
-<section id="personHasTelephoneNumber" role="region">        
-    
     <form id="personHasTelephoneNumber" class="customForm noIE67" action="${submitUrl}"  role="add/edit phone">
 
         <p>
@@ -73,7 +73,7 @@
     </form>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl
index 6d25ece801..b39bad100f 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl
@@ -39,12 +39,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit" || editMode == "repair">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit" || editMode == "repair">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().add_capitalized}">        
+        <#assign titleVerb="${i18n().add_capitalized}">
         <#assign submitButtonText="${i18n().create_entry}">
         <#assign disabledVal=""/>
 </#if>
@@ -94,18 +94,18 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
          <#if lvf.submissionErrorExists(editSubmission, "trainingType")>
  	        ${i18n().select_educational_training_value}<br />
         </#if>
-        
-        
+
+
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="projectHasParticipant" role="region">
 
-<section id="projectHasParticipant" role="region">        
-    
     <form id="projectHasParticipant" class="customForm noIE67" action="${submitUrl}"  role="add/edit organizational training">
-    
+
     <p >
         <label for="person">${i18n().person_capitalized}: ${i18n().last_name}  ${requiredHint}<span style="padding-left:322px">${i18n().first_name}  ${requiredHint}</span></label>
             <input class="acSelector" size="50"  type="text" acGroupName="person" id="person" name="personLabel" value="${personLabelValue}" >
@@ -114,12 +114,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <input type="hidden" id="lastName" name="lastName" value="">
             <input class="display" type="hidden" acGroupName="person" id="personDisplay" name="personLabelDisplay" value="${personLabelDisplayValue}" >
     </p>
-        
+
     <div class="acSelection" acGroupName="person">
         <p class="inline">
             <label>${i18n().selected_person}:</label>
             <span class="acSelectionInfo"></span>
-            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+            <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="personUri" name="existingPerson" value="${existingPersonValue}" ${flagClearLabelForExisting}="true" />
@@ -127,8 +127,8 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <p>
         <label for="dept">${i18n().researcher_role} ${requiredHint}</label>
         <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabelValue}" />
-    </p>    
-                                    
+    </p>
+
   	<#--End draw elements-->
     <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
     <p class="submit">
@@ -164,7 +164,7 @@ $(document).ready(function() {
 </script>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl
index 7fe03675ea..ff3210edbb 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl
@@ -27,12 +27,12 @@
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_mailing_address}">
         <#assign disabledVal=""/>
 </#if>
@@ -59,22 +59,22 @@
          <#if lvf.submissionErrorExists(editSubmission, "postalCode")>
  	        ${i18n().enter_postal_code}
         </#if>
-        
+
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasMailingAddress" role="region">
 
-<section id="personHasMailingAddress" role="region">        
-    
     <form id="personHasMailingAddress" class="customForm noIE67" action="${submitUrl}"  role="add/edit mailing address">
 
         <p>
             <label for="streetAddress">${i18n().street_address} 1 ${requiredHint}</label>
             <input  size="40"  type="text" id="streetAddressOne" name="streetAddressOne" value="" />
         </p>
-    
+
         <p>
             <label for="streetAddress">${i18n().street_address} 2</label>
             <input  size="40"  type="text" id="streetAddressTwo" name="streetAddressTwo" value="" />
@@ -96,11 +96,11 @@
             <input  size="20"  type="text" id="postalCode" name="postalCode" value="${postalCodeValue}" />
         </p>
 
-        <p>    
+        <p>
             <label for="country" style="margin-bottom:-4px">${i18n().country} ${requiredHint}</label>
             <input  size="20"  type="text"  id="countryEditMode" name="country" value="${countryValue}" />
         </p>
-    
+
         <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
 
         <p class="submit">
@@ -117,9 +117,9 @@
 <script type="text/javascript">
  $(document).ready(function(){
     mailingAddressUtils.onLoad('${editMode}');
-}); 
+});
 </script>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl
index 1a710af2db..9fbe6bdab6 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl
@@ -34,12 +34,12 @@
     <#assign titleString = "${i18n().telephone_number_for}" />
 </#if>
 
-<#if editMode == "edit">    
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().save_changes}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${titleVerb}" + " ${labelString}">
         <#assign disabledVal=""/>
 </#if>
@@ -56,15 +56,15 @@
             <#--Checking if any required fields are empty-->
             <#if lvf.submissionErrorExists(editSubmission, "telephoneNumber")>
  	            ${errorString}<br />
-            </#if>        
+            </#if>
         </p>
     </section>
 </#if>
 
-<@lvf.unsupportedBrowser urls.base /> 
+<@lvf.unsupportedBrowser urls.base />
+
+<section id="personHasTelephoneNumber" role="region">
 
-<section id="personHasTelephoneNumber" role="region">        
-    
     <form id="personHasTelephoneNumber" class="customForm noIE67" action="${submitUrl}"  role="add/edit phone">
 
         <p>
@@ -84,7 +84,7 @@
     </form>
 
 </section>
- 
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl
index d0eb4f220a..de5a9587e8 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl
@@ -101,7 +101,7 @@
             ${classGroupList}
     <#else>
         <h3 id="noContentMsg">${i18n().no_content_create_groups_classes}</h3>
-        
+
         <#if user.loggedIn>
             <#if user.hasSiteAdminAccess>
                 <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
@@ -110,7 +110,7 @@
             <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </#if>
     </#if>
-            
+
 </#macro>
 
 <#-- Renders the html for the research section on the home page. -->
@@ -131,7 +131,7 @@
                                 <#if class.name?substring(class.name?length-1) == "s">
                                     ${class.name}
                                 <#else>
-                                    ${class.name}s 
+                                    ${class.name}s
                                 </#if>
                             </a>
                         </li>
@@ -141,7 +141,7 @@
             </#if>
         </#list>
         <#if !foundClassGroup>
-            <p><li style="padding-left:1.2em">${i18n().no_research_content_found}</li></p> 
+            <p><li style="padding-left:1.2em">${i18n().no_research_content_found}</li></p>
         </#if>
     </ul>
 </section>
@@ -154,7 +154,7 @@
         <h4>${i18n().departments}</h4>
         <div id="academic-depts">
         </div>
-    </section>        
+    </section>
 </#macro>
 
 <#-- builds the "academic departments" box on the home page -->
@@ -166,7 +166,7 @@ var academicDepartments = [
         <#assign uri = resultRow["theURI"] />
         <#assign label = resultRow["name"] />
         {"uri": "${uri?url}", "name": "${label}"}<#if (resultRow_has_next)>,</#if>
-    </#list>        
+    </#list>
 </#if>
 ];
 var urlsBase = "${urls.base}";
@@ -186,8 +186,8 @@ var urlsBase = "${urls.base}";
             <div id="mapControls">
                 <a id="globalLink" class="selected" href="javascript:">${i18n().global_research}</a>&nbsp;|&nbsp;
                 <a id="countryLink" href="javascript:">${i18n().country_wide_research}</a>&nbsp;|&nbsp;
-                <a id="localLink" href="javascript:">${i18n().local_research}</a>  
-            </div>  
+                <a id="localLink" href="javascript:">${i18n().local_research}</a>
+            </div>
         -->
         <div id="researcherTotal"></div>
         <div id="timeIndicatorGeo">
@@ -196,9 +196,9 @@ var urlsBase = "${urls.base}";
             </span>
         </div>
         <div id="mapGlobal" class="mapArea"></div>
-       <#--  
+       <#--
             <div id="mapCountry" class="mapArea"></div>
-            <div id="mapLocal" class="mapArea"></div> 
+            <div id="mapLocal" class="mapArea"></div>
        -->
     </section>
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl
index f1e48c39d5..6fc662fa1d 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl
@@ -16,7 +16,7 @@
 			<#assign mst = type />
 			<#break>
 		</#list>
-    	<@getItemType mst "infoContentEntity"/> 
+    	<@getItemType mst "infoContentEntity"/>
     <#else>
         itemscope itemtype="http://schema.org/Thing"
     </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl
index 33aff0228d..368ceb7dc8 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl
@@ -19,7 +19,7 @@
     <p class="inline">
         <label>${labelValue}</label>
         <span class="acSelectionInfo"></span>
-        <a href="${urlsBase}/individual?uri=" class="verifyMatch" title="${i18n().verify_this_match_title}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
+        <a href="${urlsBase}/individual?uri=" class="verifyMatch" title="${i18n().verify_this_match_title}">(${i18n().verify_match_capitalized}</a> ${i18n().or}
         <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="${inputId}" name="${inputName}" value="${inputValue}" />
@@ -83,7 +83,7 @@ return - returns empty string if no value found-->
 	<#local returnValue = getEditSubmissionUriValue(submission, varName) />
 	<#if (returnValue?length = 0)>
 		<#local returnValue = getEditSubmissionLiteralValue(submission, varName) />
-	</#if> 
+	</#if>
 	<#return returnValue>
 </#function>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl
index e324e2f418..c13be27572 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl
@@ -16,7 +16,7 @@
 </#macro>
 
 <#-- core:webpage
-     
+
      Note that this macro has a side-effect in the call to propertyGroups.pullProperty().
 -->
 
@@ -25,8 +25,8 @@
 
     <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
         <nav role="navigation">
-            <#local label = "${i18n().websites}">  
-            <@p.addLinkWithLabel webpage editable label />           
+            <#local label = "${i18n().websites}">
+            <@p.addLinkWithLabel webpage editable label />
             <#if webpage.statements?has_content> <#-- if there are any statements -->
                 <#include "individual-webpage.ftl" >
             </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl
index 1a15c23ada..6dd08d15a6 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl
@@ -1,5 +1,5 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#if shouldVIVOrenderVis>
-	<#include "coAuthorshipSparklineContent.ftl"> 
-</#if>
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#if shouldVIVOrenderVis>
+	<#include "coAuthorshipSparklineContent.ftl">
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
index ec48efdfdf..46b0b2ecdd 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
@@ -9,7 +9,7 @@
 
 <#-- This is used to prevent collision between sparkline & visualization conatiner div ids. -->
 <#if visContainerID?upper_case == sparklineContainerID?upper_case>
-    <#assign sparklineContainerID = visContainerID + "_spark"> 
+    <#assign sparklineContainerID = visContainerID + "_spark">
 </#if>
 
 <div class="staticPageBackground">
@@ -34,32 +34,32 @@
             </#if>
 
             function drawCoauthorsSparklineVisualization(providedSparklineImgTD) {
-            
+
                 var unknownYearPublicationCounts = ${sparklineVO.unknownYearPublications};
                 var onlyUnknownYearPublications = false;
-    
+
                 var data = new google.visualization.DataTable();
                 data.addColumn('string', 'Year');
                 data.addColumn('number', 'Unique co-authors');
                 data.addRows(${sparklineVO.yearToEntityCountDataTable?size});
-                
+
                 var knownYearPublicationCounts = 0;
-                
-                <#list sparklineVO.yearToEntityCountDataTable as yearToUniqueCoauthorsDataElement>                        
+
+                <#list sparklineVO.yearToEntityCountDataTable as yearToUniqueCoauthorsDataElement>
                     data.setValue(${yearToUniqueCoauthorsDataElement.yearToEntityCounter}, 0, '${yearToUniqueCoauthorsDataElement.year}');
                     data.setValue(${yearToUniqueCoauthorsDataElement.yearToEntityCounter}, 1, ${yearToUniqueCoauthorsDataElement.currentEntitiesCount});
                     knownYearPublicationCounts += ${yearToUniqueCoauthorsDataElement.currentEntitiesCount};
                 </#list>
-                
+
                 <#-- Create a view of the data containing only the column pertaining to coauthors count. -->
                 var sparklineDataView = new google.visualization.DataView(data);
                 sparklineDataView.setColumns([1]);
-        
+
                 <#if sparklineVO.shortVisMode>
-         
-                <#-- For the short view we only want the last 10 year's view of coauthors count, hence we filter 
+
+                <#-- For the short view we only want the last 10 year's view of coauthors count, hence we filter
                     the data we actually want to use for render. -->
-         
+
                 sparklineDataView.setRows(data.getFilteredRows([{
                         column: 0,
                         minValue: '${sparklineVO.earliestRenderedPublicationYear?c}',
@@ -69,28 +69,28 @@
                 <#else>
 
                 </#if>
-         
+
 
                 /*
                 This means that all the publications have unknown years & we do not need to display
                 the sparkline.
-                */            
+                */
                 if (unknownYearPublicationCounts > 0 && knownYearPublicationCounts < 1) {
-                    
+
                     onlyUnknownYearPublications = true;
-                    
+
                 } else {
 
-                /* 
+                /*
                 Test if we want to go for the approach when serving visualizations from a secure site..
                 If "https:" is not found in location.protocol then we do everything normally.
                 */
                 if (location.protocol.indexOf("https") == -1) {
                     /*
-                    This condition will make sure that the location protocol (http, https, etc) does not have 
+                    This condition will make sure that the location protocol (http, https, etc) does not have
                     for word https in it.
                     */
-                             
+
                     <#-- Create the vis object and draw it in the div pertaining to sparkline. -->
                     var sparkline = new google.visualization.ImageSparkLine(providedSparklineImgTD[0]);
                     sparkline.draw(sparklineDataView, {
@@ -102,26 +102,26 @@
                     });
 
                 } else {
-                
+
                     <#-- Prepare data for generating google chart URL. -->
-                    
+
                     <#-- If we need to serve data for https:, we have to create an array of values to be plotted. -->
                     var chartValuesForEncoding = new Array();
-                    
+
                     $.each(sparklineDataView.getViewRows(), function(index, value) {
                         chartValuesForEncoding.push(data.getValue(value, 1));
                     });
-                    
+
                     var chartImageURL = constructVisualizationURLForSparkline(
-                                extendedEncodeDataForChartURL(chartValuesForEncoding, 
-                                                              sparklineDataView.getColumnRange(0).max), 
+                                extendedEncodeDataForChartURL(chartValuesForEncoding,
+                                                              sparklineDataView.getColumnRange(0).max),
                                 visualizationOptions);
 
                     var imageContainer = $(providedSparklineImgTD[0]);
-                    
-                    imageContainer.image(chartImageURL, 
+
+                    imageContainer.image(chartImageURL,
                             function(){
-                                imageContainer.empty().append(this); 
+                                imageContainer.empty().append(this);
                                 $(this).addClass("google-visualization-sparkline-image");
                             },
                             function(){
@@ -130,120 +130,120 @@
                                 imageContainer.empty();
                             }
                     );
-                
+
                 }
-                
+
                 }
-                
+
                 if (${sparklineVO.totalCollaborationshipCount?c}) {
                     var totalPublicationCount = ${sparklineVO.totalCollaborationshipCount?c};
                 } else {
-                    var totalPublicationCount = knownYearPublicationCounts + unknownYearPublicationCounts; 
+                    var totalPublicationCount = knownYearPublicationCounts + unknownYearPublicationCounts;
                 }
-         
+
                 <#if sparklineVO.shortVisMode>
-         
+
                     <#-- We want to display how many coauthors were considered, so this is used to calculate this. -->
-         
+
                     var shortSparkRows = sparklineDataView.getViewRows();
                     var renderedShortSparks = 0;
                     $.each(shortSparkRows, function(index, value) {
                         renderedShortSparks += data.getValue(value, 1);
                     });
-                    
+
                      /*
                     In case that there are only unknown publications we want the text to mention these counts,
                     which would not be mentioned in the other case because the renderedShortSparks only hold counts
                     of publications which have any date associated with it.
                     */
                     var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedShortSparks;
-                    
+
                     if (totalPubs === 1) {
                         var pubDisplay = "${i18n().co_author}";
                     } else {
                         var pubDisplay = "${i18n().co_authors}";
                     }
-         
+
                     $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + pubDisplay + " <br/></span>");
-            
+
                     var sparksText = '  ${i18n().within_last_10_years}';
-                                        
+
                     if (totalPubs !== totalPublicationCount) {
                         sparksText += ' (' + totalPublicationCount + ' ${i18n().total})';
                     }
-            
+
                  <#else>
-            
+
                     /*
-                     * Sparks that will be rendered will always be the one's which has 
+                     * Sparks that will be rendered will always be the one's which has
                      * any year associated with it. Hence.
                      * */
                     var renderedSparks = ${sparklineVO.renderedSparks?c};
-                    
+
                     /*
                     In case that there are only unknown publications we want the text to mention these counts,
                     which would not be mentioned in the other case because the renderedSparks only hold counts
                     of publications which have any date associated with it.
                     */
                     var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedSparks;
-                          
+
                     if ( totalPubs == 1 ) {
                         var pubDisplay = "${i18n().co_author}";
                     } else {
                         var pubDisplay = "${i18n().co_authors}";
                     }
-                          
+
                     $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + pubDisplay + " <br/></span>");
-            
-                    var sparksText = '  ${i18n().from} <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
+
+                    var sparksText = '  ${i18n().from} <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
                                         + ' - ${sparklineVO.latestRenderedPublicationYear?c}</span>';
-                                        
+
                     if (totalPubs !== totalPublicationCount) {
                         sparksText += ' (' + totalPublicationCount + ' ${i18n().total})';
                     }
-                    
+
                     if (totalPublicationCount) {
                         sparksText += ' <br /><a href="${sparklineVO.downloadDataLink}" title="csv ${i18n().file_capitalized}">(.CSV ${i18n().file_capitalized})</a> ';
                     }
-                                         
+
                  </#if>
-         
+
                  if (!onlyUnknownYearPublications) {
                     $('#${sparklineContainerID} td.sparkline_text').html(sparksText);
                  }
-         
+
             }
-    
+
             /*
-             * This will activate the visualization. It takes care of creating 
-             * div elements to hold the actual sparkline image and then calling the 
-             * drawCoauthorsSparklineVisualization function. 
+             * This will activate the visualization. It takes care of creating
+             * div elements to hold the actual sparkline image and then calling the
+             * drawCoauthorsSparklineVisualization function.
              * */
 
             $(document).ready(function() {
-                var sparklineImgTD; 
-        
+                var sparklineImgTD;
+
             /*
              * This is a nuclear option (creating the container in which everything goes)
-             * the only reason this will be ever used is the API user never submitted a 
-             * container ID in which everything goes. The alternative was to let the 
-             * vis not appear in the calling page at all. So now atleast vis appears but 
+             * the only reason this will be ever used is the API user never submitted a
+             * container ID in which everything goes. The alternative was to let the
+             * vis not appear in the calling page at all. So now atleast vis appears but
              * appended at the bottom of the body.
              * */
-     
+
                 if ($('#${visContainerID}').length === 0) {
                     $('<div/>', {
                         'id': '${visContainerID}'
                     }).appendTo('body');
-                }       
-        
+                }
+
                 if ($('#${sparklineContainerID}').length === 0) {
-        
+
                     $('<div/>', {
                         'id': '${sparklineContainerID}',
                         'class': 'sparkline_style'
                     }).prependTo('#${visContainerID}');
-            
+
                     var table = $('<table>');
                     table.attr('class', 'sparkline_wrapper_table');
                     var row = $('<tr>');
@@ -251,7 +251,7 @@
                     sparklineImgTD.attr('id', '${sparklineContainerID}_img');
                     sparklineImgTD.attr('width', visualizationOptions.width);
                     sparklineImgTD.attr('class', 'sparkline_style');
-            
+
                     row.append(sparklineImgTD);
                     var row2 = $('<tr>');
                     var sparklineNumberTD = $('<td>');
@@ -259,7 +259,7 @@
                     sparklineNumberTD.css('text-align', 'left');
                     row2.append(sparklineNumberTD);
                     var row3 = $('<tr>');
-                    
+
                     var sparklineTextTD = $('<td>');
                     sparklineTextTD.attr('class', 'sparkline_text');
                     sparklineTextTD.css('text-align', 'left');
@@ -268,15 +268,15 @@
                     table.append(row2);
                     table.append(row3);
                     table.prependTo('#${sparklineContainerID}');
-         
+
                 }
-            
+
                 drawCoauthorsSparklineVisualization(sparklineImgTD);
             });
         </script>
-         
+
     </div>
-    
+
     <!-- Sparkline Viz -->
 
     <#if sparklineVO.shortVisMode>
@@ -287,20 +287,20 @@
         <!-- For Full Sparkline - Print the Table of Couauthor Counts per Year -->
 
             <#if displayTable?? && displayTable>
-        
-                <p> 
+
+                <p>
                     <#assign tableID = "coauthors_sparkline_data_table" />
                     <#assign tableCaption = "${i18n().unique_coauthors_per_year} " />
                     <#assign tableActivityColumnName = "${i18n().count_capitalized}" />
                     <#assign tableContent = sparklineVO.yearToActivityCount />
                     <#assign fileDownloadLink = sparklineVO.downloadDataLink />
-                    
+
                     <#include "yearToActivityCountTable.ftl">
-        
+
                     ${i18n().download_data_as} <a href="${sparklineVO.downloadDataLink}" title="csv ${i18n().download}">.csv</a> ${i18n().file}.
                     <br />
                 </p>
-        
+
             </#if>
 
     </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl
index b065ba7a18..d8703e6973 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl
@@ -1,5 +1,5 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#if shouldVIVOrenderVis>
-	<#include "coInvestigationSparklineContent.ftl"> 
+	<#include "coInvestigationSparklineContent.ftl">
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
index c725ade80f..c414970832 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
@@ -9,7 +9,7 @@
 
 <#-- This is used to prevent collision between sparkline & visualization conatiner div ids. -->
 <#if visContainerID?upper_case == sparklineContainerID?upper_case>
-    <#assign sparklineContainerID = visContainerID + "_spark"> 
+    <#assign sparklineContainerID = visContainerID + "_spark">
 </#if>
 
 <div class="staticPageBackground">
@@ -34,32 +34,32 @@
             </#if>
 
             function drawCoInvestigatorsSparklineVisualization(providedSparklineImgTD) {
-    
+
                 var unknownYearGrantCounts = ${sparklineVO.unknownYearGrants};
                 var onlyUnknownYearGrants = false;
-                
+
                 var data = new google.visualization.DataTable();
                 data.addColumn('string', '${i18n().year_capitalized}');
                 data.addColumn('number', '${i18n().unique_coinvestigators}');
                 data.addRows(${sparklineVO.yearToEntityCountDataTable?size});
-                
+
                 var knownYearGrantCounts = 0;
-        
-                <#list sparklineVO.yearToEntityCountDataTable as yearToUniqueCoinvestigatorsDataElement>                        
+
+                <#list sparklineVO.yearToEntityCountDataTable as yearToUniqueCoinvestigatorsDataElement>
                     data.setValue(${yearToUniqueCoinvestigatorsDataElement.yearToEntityCounter}, 0, '${yearToUniqueCoinvestigatorsDataElement.year}');
                     data.setValue(${yearToUniqueCoinvestigatorsDataElement.yearToEntityCounter}, 1, ${yearToUniqueCoinvestigatorsDataElement.currentEntitiesCount});
                     knownYearGrantCounts += ${yearToUniqueCoinvestigatorsDataElement.currentEntitiesCount};
                 </#list>
-        
+
                 <#-- Create a view of the data containing only the column pertaining to coinvestigators count. -->
                 var sparklineDataView = new google.visualization.DataView(data);
                 sparklineDataView.setColumns([1]);
-        
+
                 <#if sparklineVO.shortVisMode>
-         
-                <#-- For the short view we only want the last 10 year's view of coinvestigators count, hence we filter 
+
+                <#-- For the short view we only want the last 10 year's view of coinvestigators count, hence we filter
                     the data we actually want to use for render. -->
-         
+
                 sparklineDataView.setRows(data.getFilteredRows([{
                         column: 0,
                         minValue: '${sparklineVO.earliestRenderedGrantYear?c}',
@@ -73,23 +73,23 @@
                 /*
                 This means that all the publications have unknown years & we do not need to display
                 the sparkline.
-                */            
+                */
                 if (unknownYearGrantCounts > 0 && knownYearGrantCounts < 1) {
-                    
+
                     onlyUnknownYearGrants = true;
-                    
+
                 } else {
 
-                /* 
+                /*
                 Test if we want to go for the approach when serving visualizations from a secure site..
                 If "https:" is not found in location.protocol then we do everything normally.
                 */
                 if (location.protocol.indexOf("https") == -1) {
                     /*
-                    This condition will make sure that the location protocol (http, https, etc) does not have 
+                    This condition will make sure that the location protocol (http, https, etc) does not have
                     for word https in it.
                     */
-                
+
                     <#-- Create the vis object and draw it in the div pertaining to sparkline. -->
                     var sparkline = new google.visualization.ImageSparkLine(providedSparklineImgTD[0]);
                     sparkline.draw(sparklineDataView, {
@@ -98,29 +98,29 @@
                             showAxisLines: false,
                             showValueLabels: false,
                             labelPosition: 'none'
-                    });    
-                    
+                    });
+
                 } else {
-                
+
                     <#-- Prepare data for generating google chart URL. -->
-                    
+
                     <#-- If we need to serve data for https:, we have to create an array of values to be plotted. -->
                     var chartValuesForEncoding = new Array();
-                    
+
                     $.each(sparklineDataView.getViewRows(), function(index, value) {
                         chartValuesForEncoding.push(data.getValue(value, 1));
                     });
-                    
+
                     var chartImageURL = constructVisualizationURLForSparkline(
-                                extendedEncodeDataForChartURL(chartValuesForEncoding, 
-                                                              sparklineDataView.getColumnRange(0).max), 
+                                extendedEncodeDataForChartURL(chartValuesForEncoding,
+                                                              sparklineDataView.getColumnRange(0).max),
                                 visualizationOptions);
 
                     var imageContainer = $(providedSparklineImgTD[0]);
-                    
-                    imageContainer.image(chartImageURL, 
+
+                    imageContainer.image(chartImageURL,
                             function(){
-                                imageContainer.empty().append(this); 
+                                imageContainer.empty().append(this);
                                 $(this).addClass("google-visualization-sparkline-image");
                             },
                             function(){
@@ -129,124 +129,124 @@
                                 imageContainer.empty();
                             }
                     );
-                
+
                 }
-                
+
                 }
-                
+
                 if (${sparklineVO.totalCollaborationshipCount?c}) {
                     var totalGrantCount = ${sparklineVO.totalCollaborationshipCount?c};
                 } else {
-                    var totalGrantCount = knownYearGrantCounts + unknownYearGrantCounts; 
+                    var totalGrantCount = knownYearGrantCounts + unknownYearGrantCounts;
                 }
-                 
-                             
-                
+
+
+
                 <#if sparklineVO.shortVisMode>
-                
+
                     <#-- We want to display how many coinvestigators were considered, so this is used to calculate this. -->
-                    
+
                     var shortSparkRows = sparklineDataView.getViewRows();
                     var renderedShortSparks = 0;
                     $.each(shortSparkRows, function(index, value) {
                         renderedShortSparks += data.getValue(value, 1);
-                    });      
-                    
+                    });
+
                     /*
                     In case that there are only unknown grants we want the text to mention these counts,
                     which would not be mentioned in the other case because the renderedShortSparks only hold counts
                     of grants which have any date associated with it.
                     */
                     var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedShortSparks;
-                    
-                                        
+
+
                     if (totalGrants === 1) {
                         var grantDisplay = "${i18n().co_investigator}";
                     } else {
                         var grantDisplay = "${i18n().co_investigators}";
                     }
-                    
+
                     $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
-            
+
                     var sparksText = '  ${i18n().within_last_10_years}';
-                    
+
                     if (totalGrants !== totalGrantCount) {
                         sparksText += ' (' + totalGrantCount + ' ${i18n().total})';
                     }
-            
+
                  <#else>
-                       
+
                     /*
-                     * Sparks that will be rendered will always be the one's which has 
+                     * Sparks that will be rendered will always be the one's which has
                      * any year associated with it. Hence.
                      * */
-                    var renderedSparks = ${sparklineVO.renderedSparks};     
-                    
+                    var renderedSparks = ${sparklineVO.renderedSparks};
+
                     /*
                     In case that there are only unknown grants we want the text to mention these counts,
                     which would not be mentioned in the other case because the renderedSparks only hold counts
                     of grants which have any date associated with it.
                     */
                     var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedSparks;
-                    
+
                     if (totalGrants === 1) {
                         var grantDisplay = "${i18n().co_investigator}";
                     } else {
                         var grantDisplay = "${i18n().co_investigators}";
                     }
-                     
+
                     $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
-            
-                    var sparksText = '  ${i18n().from} <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
+
+                    var sparksText = '  ${i18n().from} <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
                                         + ' through ${sparklineVO.latestRenderedGrantYear?c}</span>';
-                                        
+
                     if (totalGrants !== totalGrantCount) {
                         sparksText += ' (' + totalGrantCount + ' ${i18n().total})';
                     }
-                    
+
                     if (totalGrantCount) {
                         sparksText += '<br /> <a href="${sparklineVO.downloadDataLink}" title="csv ${i18n().file_capitalized}">(.CSV ${i18n().file_capitalized})</a> ';
                     }
-                    
+
                  </#if>
 
                  if (!onlyUnknownYearGrants) {
                     $('#${sparklineContainerID} td.sparkline_text').html(sparksText).css("font-weight", "bold");
-                 } 
-                 
+                 }
+
            }
-    
+
             /*
-             * This will activate the visualization. It takes care of creating 
-             * div elements to hold the actual sparkline image and then calling the 
-             * drawCoInvestigatorsSparklineVisualization function. 
+             * This will activate the visualization. It takes care of creating
+             * div elements to hold the actual sparkline image and then calling the
+             * drawCoInvestigatorsSparklineVisualization function.
              * */
 
             $(document).ready(function() {
-                var sparklineImgTD; 
-                
+                var sparklineImgTD;
+
             /*
              * This is a nuclear option (creating the container in which everything goes)
-             * the only reason this will be ever used is the API user never submitted a 
-             * container ID in which everything goes. The alternative was to let the 
-             * vis not appear in the calling page at all. So now atleast vis appears but 
+             * the only reason this will be ever used is the API user never submitted a
+             * container ID in which everything goes. The alternative was to let the
+             * vis not appear in the calling page at all. So now atleast vis appears but
              * appended at the bottom of the body.
              * */
-     
+
                 if ($('#${visContainerID}').length === 0) {
                     $('<div/>', {
                         'id': '${visContainerID}'
                     }).appendTo('body');
-                }                    
-                 
+                }
+
 
                 if ($('#${sparklineContainerID}').length === 0) {
-        
+
                     $('<div/>', {
                         'id': '${sparklineContainerID}',
                         'class': 'sparkline_style'
                     }).prependTo('#${visContainerID}');
-            
+
                     var table = $('<table>');
                     table.attr('class', 'sparkline_wrapper_table');
                     var row = $('<tr>');
@@ -254,7 +254,7 @@
                     sparklineImgTD.attr('id', '${sparklineContainerID}_img');
                     sparklineImgTD.attr('width', visualizationOptions.width);
                     sparklineImgTD.attr('class', 'sparkline_style');
-            
+
                     row.append(sparklineImgTD);
                     var row2 = $('<tr>');
                     var sparklineNumberTD = $('<td>');
@@ -262,7 +262,7 @@
                     sparklineNumberTD.css('text-align', 'left');
                     row2.append(sparklineNumberTD);
                     var row3 = $('<tr>');
-                    
+
                     var sparklineTextTD = $('<td>');
                     sparklineTextTD.attr('class', 'sparkline_text');
                     sparklineTextTD.css('text-align', 'left');
@@ -271,15 +271,15 @@
                     table.append(row2);
                     table.append(row3);
                     table.prependTo('#${sparklineContainerID}');
-       
+
                 }
-                
+
                 drawCoInvestigatorsSparklineVisualization(sparklineImgTD);
             });
-        </script> 
-        
+        </script>
+
     </div>
-    
+
     <!-- Sparkline Viz -->
 
     <#if sparklineVO.shortVisMode>
@@ -289,20 +289,20 @@
     <#else>
         <!-- For Full Sparkline - Print the Table of CoInvestigator Counts per Year -->
             <#if displayTable?? && displayTable>
-        
-                <p> 
+
+                <p>
                     <#assign tableID = "coinve_sparkline_data_table" />
                     <#assign tableCaption = "${i18n().unique_coinvestigators_per_year} " />
                     <#assign tableActivityColumnName = "${i18n().count_capitalized}" />
                     <#assign tableContent = sparklineVO.yearToActivityCount />
                     <#assign fileDownloadLink = sparklineVO.downloadDataLink />
-                    
+
                     <#include "yearToActivityCountTable.ftl">
-        
+
                     ${i18n().download_data_as} <a href="${sparklineVO.downloadDataLink}" title="csv ${i18n().download}">.csv</a> ${i18n().file}.
                     <br />
                 </p>
-        
-            </#if>  
+
+            </#if>
     </#if>
 </div>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
index f98b9c7404..4217546432 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
@@ -17,42 +17,42 @@
             </span>
         </h2>
         <br>
-        
+
         <div id="leftblock">
             <div id="leftUpper">
                 <h3>${i18n().how_to_compare}</h3>
-                
+
                 <div style="text-align: left;">
-                
+
                 <select class="comparisonValues" style="margin-bottom: 20px;">
-                
+
                 <#assign currentViewLink = "${i18n().no_view_link}">
-                
+
                 <#list parameterOptions as parameter>
                     <#if currentParameter = parameter.name>
-                    
+
                         <#assign selectedText = "selected='selected'">
                         <#assign currentViewLink = parameter.viewLink>
 
                     <#else>
-                    
+
                         <#assign selectedText = "">
-                        
+
                     </#if>
                     <option value="${parameter.value}" ${selectedText}>${parameter.dropDownText}</option>
                 </#list>
 
                 </select>
-                
+
                 <img id="copy-vis-viewlink-icon" title="${i18n().persistent_link_to_visualization}" class="middle" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}" />
                 <span id="copy-vis-viewlink"><input type="text" size="21" value="${currentViewLink}" /></span>
-                
+
                 </div>
             </div>
-                        
+
             <div id="leftLower">
                 <div id="notification-container" style="display:none">
-        
+
                     <div id="error-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;">
                         <a class="ui-notify-close" href="#" title="${i18n().error_notification}"><span class="ui-icon ui-icon-close" style="float:right"></span></a>
                         <span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span>
@@ -60,63 +60,63 @@
                         <p>&#035;{text}</p>
                         <p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p>
                     </div>
-                    
+
                     <div id="warning-notification" class="ui-state-highlight ui-corner-all" >
                     <a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a>
                     <span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
                         <h1>&#035;{title!}</h1>
                         <p>&#035;{text}</p>
                     </div>
-                
+
                 </div>
                 <div id="people-organizations-filter">
                   <h3>${i18n().what_to_compare}</h3>
-                	<span id="organizations-filter" class="filter-option">${i18n().organizations_capitalized}</span> | 
-                	<span id="people-filter" class="filter-option">${i18n().people_capitalized}</span> | 
+                	<span id="organizations-filter" class="filter-option">${i18n().organizations_capitalized}</span> |
+                	<span id="people-filter" class="filter-option">${i18n().people_capitalized}</span> |
                   <span id="no-filter" class="filter-option">${i18n().view_all}</span>
-                	<img class="filterInfoIcon" src="${urls.images}/iconInfo.png" 
-                		 alt="${i18n().info_icon}" 
+                	<img class="filterInfoIcon" src="${urls.images}/iconInfo.png"
+                		 alt="${i18n().info_icon}"
                 		 title="${i18n().organization_hierarchy_note(organizationLabel)}" />
                 </div>
-                
+
                 <div id="paginatedTable"></div>
                 <div id="paginated-table-footer">
                 <a id="csv" href="${temporalGraphDownloadFileLink}" class="temporalGraphLinks" title="${i18n().save_all_as_csv}">${i18n().save_all_as_csv}</a>
                 <a class="clear-selected-entities temporalGraphLinks" title="${i18n().clear_all_selected_entities}">${i18n().clear_capitalized}</a>
                 </div>
             </div>
-<#--        
+<#--
             <div id = "stopwordsdiv">
                 * The entity types core:Person, foaf:Organization have been excluded as they are too general.
-            </div>  
--->         
+            </div>
+-->
         </div>
-        
+
         <div id="rightblock">
-        
+
             <h3 id="headerText">${i18n().comparing_capitalized} <span id="comparisonHeader">${currentParameterObject.value}</span> ${i18n().of} <span id="entityHeader">${i18n().institutions_capitalized}</span> ${i18n().in} ${organizationLabel}</h3>
-            
+
             <div id="temporal-graph">
                 <div id="yaxislabel"></div>
                 <div id="graphContainer"></div>
                 <div id="xaxislabel">${i18n().year_capitalized}</div>
             </div>
-        
+
             <div id="bottom">
                 <h3><span id="comparisonParameter"></span>&nbsp;
                 <img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().info_based_on_vivo_data(currentParameterObject.value)}"  width="15px" height="15px"/></h3>
-            <p class="displayCounter">${i18n().you_have_selected} <span id="counter">0</span> ${i18n().of_a_maximum} 
-            <span id="total">10</span> <span id="entityleveltext"> ${i18n().schools}</span>. 
-            <span id="legend-row-header"> 
+            <p class="displayCounter">${i18n().you_have_selected} <span id="counter">0</span> ${i18n().of_a_maximum}
+            <span id="total">10</span> <span id="entityleveltext"> ${i18n().schools}</span>.
+            <span id="legend-row-header">
             <a class="clear-selected-entities temporalGraphLinks" title="${i18n().clear_all_selected_entities}">${i18n().clear_capitalized}</a>
             </span>
             </p>
-        
+
             </div>
-            
+
             <p class="displayCounter">${i18n().legend_capitalized}</p>
             <span class="legend-bar unknown-legend-bar"><span style="width: 25px; margin-bottom:3px;" class="unknown-inner-bar">&nbsp;</span></span> <span id="legend-unknown-bar-text">${currentParameterObject.name} ${i18n().with_unknown_year}</span><br />
             <span style="background-color: #A8A8A8; width: 25px;" class="known-bar legend-bar">&nbsp;</span> <span id="legend-known-bar-text">${currentParameterObject.name} ${i18n().with_known_year}</span><br />
             <span style="background-color: #CDCDCD; width: 25px;" class="current-year-legend-bar legend-bar">&nbsp;</span> <span id="legend-current-year-bar-text">${currentParameterObject.name} ${i18n().from_current_incomplete_year}</span>
-        </div>      
+        </div>
 </div>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
index 4c888a019a..cf854be05b 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
@@ -15,12 +15,12 @@
 
 <h1 id="noPubsOrGrants-header">${organizationLabel}</h1>
 
-    <h3 id="alternative-vis-info">${textForCurrentEntityComparisonType?capitalize} ${i18n().temporal_graph_capitalized} 
+    <h3 id="alternative-vis-info">${textForCurrentEntityComparisonType?capitalize} ${i18n().temporal_graph_capitalized}
         <span id="noPubsOrGrants-span">|&nbsp;<a  href="${temporalGraphURL}" title="${i18n().view}">${i18n().view}&nbsp${textForOtherEntityComparisonType}&nbsp;${i18n().temporal_graph}</a></span>
     </h3>
     <div id="error-body">
-        <p>${i18n().entity_comp_error_text1} 
-        <span id="comparison-parameter-unavailable-label">${textForCurrentEntityComparisonType}</span> ${i18n().entity_comp_error_text2} 
+        <p>${i18n().entity_comp_error_text1}
+        <span id="comparison-parameter-unavailable-label">${textForCurrentEntityComparisonType}</span> ${i18n().entity_comp_error_text2}
         ${i18n().entity_comp_error_text3} ${organizationLabel} <a href="${organizationVivoProfileURL}" title="${i18n().profile_page}">${i18n().profile_page}</a> ${i18n().entity_comp_error_text4}</p>
     </div>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
index 350feb466e..137779b943 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
@@ -22,7 +22,7 @@ var currentParameter = "${currentParameter}";
 
 /*
 This is used in util.js to print grant temporal graph links for all sub-organizations.
-*/    
+*/
 var temporalGraphCommonURL = subOrganizationGrantTemporalGraphCommonURL;
 
 var temporalGraphDataURL = '${temporalGraphDataURL}';
@@ -33,9 +33,9 @@ $(document).ready(function () {
 		responseContainer: $("div#temporal-graph-response"),
 		bodyContainer: $("#body"),
 		errorContainer: $("#error-container"),
-		dataURL: temporalGraphDataURL	
+		dataURL: temporalGraphDataURL
 	};
-	
+
 	renderTemporalGraphVisualization(options);
 
 });
@@ -49,9 +49,9 @@ $(document).ready(function () {
 
 <#include "entityComparisonBody.ftl">
 
-<#-- 
+<#--
 Right now we include the error message by default because currently I could not devise any more smarted solution. By default
-the CSS of the #error-container is display:none; so it will be hidden unless explicitly commanded to be shown which we do in 
+the CSS of the #error-container is display:none; so it will be hidden unless explicitly commanded to be shown which we do in
 via JavaScript.
 -->
 <#include "entityGrantComparisonError.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
index 7cba3b32d1..cf4825f0a0 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
@@ -22,7 +22,7 @@ var currentParameter = "${currentParameter}";
 
 /*
 This is used in util.js to print grant temporal graph links for all sub-organizations.
-*/    
+*/
 var temporalGraphCommonURL = subOrganizationPublicationTemporalGraphCommonURL;
 
 var temporalGraphDataURL = '${temporalGraphDataURL}';
@@ -33,9 +33,9 @@ $(document).ready(function () {
 		responseContainer: $("div#temporal-graph-response"),
 		bodyContainer: $("#body"),
 		errorContainer: $("#error-container"),
-		dataURL: temporalGraphDataURL	
+		dataURL: temporalGraphDataURL
 	};
-	
+
 	renderTemporalGraphVisualization(options);
 
 });
@@ -49,9 +49,9 @@ $(document).ready(function () {
 
 <#include "entityComparisonBody.ftl">
 
-<#-- 
+<#--
 Right now we include the error message by default because currently I could not devise any more smarted solution. By default
-the CSS of the #error-container is display:none; so it will be hidden unless explicitly commanded to be shown which we do in 
+the CSS of the #error-container is display:none; so it will be hidden unless explicitly commanded to be shown which we do in
 via JavaScript.
 -->
 <#include "entityPublicationComparisonError.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
index 0bb9fc3e90..9e79169f20 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
@@ -15,10 +15,10 @@
 
 
 <#if organizationLocalName?has_content >
-    
+
     <#assign organizationPublicationTemporalGraphURL = '${urls.base}${shortVisualizationURLRoot}/publication-graph/${organizationLocalName}'>
     <#assign organizationGrantTemporalGraphURL = "${urls.base}${shortVisualizationURLRoot}/grant-graph/${organizationLocalName}">
-    
+
 <#else>
 
     <#assign organizationPublicationTemporalGraphURL = '${urls.base}${shortVisualizationURLRoot}/publication-graph/?uri=${organizationURI}'>
@@ -37,31 +37,31 @@
 <#assign publicationParameter = {   "name": "${i18n().publication}",
                                     "pluralName": "${i18n().publications}",
                                     "verbName": "${i18n().published}",
-                                    "dropDownText": "${i18n().by_publications}", 
+                                    "dropDownText": "${i18n().by_publications}",
                                     "viewLink": "${organizationPublicationTemporalGraphURL}",
                                     "viewBaseLink": "${subOrganizationPublicationTemporalGraphCommonURL}",
                                     "dataLink": "${organizationPublicationTemporalGraphDataURL}",
-                                    "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison", 
+                                    "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison",
                                     "value": "${i18n().publications}" }>
-                                    
+
 <#assign grantParameter = {   "name": "${i18n().grant}",
                               "pluralName": "${i18n().grants}",
                               "verbName": "${i18n().granted}",
-                              "dropDownText": "${i18n().by_grants}", 
+                              "dropDownText": "${i18n().by_grants}",
                               "viewLink": "${organizationGrantTemporalGraphURL}",
-                              "viewBaseLink": "${subOrganizationGrantTemporalGraphCommonURL}", 
+                              "viewBaseLink": "${subOrganizationGrantTemporalGraphCommonURL}",
                               "dataLink": "${organizationGrantTemporalGraphDataURL}",
                               "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_grant_count",
                               "value": "${i18n().grants}" }>
-                              
+
 <#assign parameterOptions = [publicationParameter, grantParameter]>
 
 <#assign entityCheckboxSelectorDOMClass = "entity-selector-checkbox">
-                                    
+
 <#-- Javascript files -->
 
 <#-- Currently we are using the developer build version for both flot & excanvas libraries,
-this is because IE 9 complains about certain properties. After testing it seems that dev 
+this is because IE 9 complains about certain properties. After testing it seems that dev
 build version is stable enough. If in next couple of days we feel that there are some issues
 we will default to using the stable version unless the request comes from IE 9 in which case
 we will use rev 293 (dev build version) of the flot & excanvas files.
@@ -154,11 +154,11 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
                   '<link rel="stylesheet" href="${urls.base}/css/visualization/visualization.css" />',
                   '<link rel="stylesheet" href="${urls.base}/css/jquery_plugins/ui.notify.css" />',
                   '<!--[if IE]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie.css" rel="stylesheet" type="text/css" /><![endif]-->',
-                  '<!--[if lt IE 8]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" rel="stylesheet" type="text/css" /><![endif]-->')}                  
- 
+                  '<!--[if lt IE 8]><link href="${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" rel="stylesheet" type="text/css" /><![endif]-->')}
+
 <#-- variables passed from server-side code -->
 <script language="JavaScript" type="text/javascript">
-    
+
 var contextPath = "${urls.base}";
 var temporalGraphDrillUpIcon = "${temporalGraphDrillUpIcon}";
 var temporalGraphDrillDownIcon = "${temporalGraphDrillDownIcon}";
@@ -193,11 +193,11 @@ var COMPARISON_PARAMETERS_INFO = {
     <#list parameter?keys as key>
         ${key}:"${parameter[key]}"<#if key_has_next>,</#if>
     </#list>
-    
+
     }<#if parameter_has_next>,</#if>
 
 </#list>
-    
+
 }
 
 </script>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl
index 6d5f175c09..2bfcb90ed6 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl
@@ -1,5 +1,5 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#if shouldVIVOrenderVis>
-	<#include "personGrantSparklineContent.ftl"> 
+	<#include "personGrantSparklineContent.ftl">
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
index 033b504912..315259e9f5 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
@@ -9,7 +9,7 @@
 
 <#-- This is used to prevent collision between sparkline & visualization conatiner div ids. -->
 <#if visContainerID?upper_case == sparklineContainerID?upper_case>
-    <#assign sparklineContainerID = visContainerID + "_spark"> 
+    <#assign sparklineContainerID = visContainerID + "_spark">
 </#if>
 
 <div class="staticPageBackground">
@@ -34,32 +34,32 @@
             </#if>
 
             function drawGrantCountVisualization(providedSparklineImgTD) {
-            
+
                 var unknownYearGrantCounts = ${sparklineVO.unknownYearGrants};
                 var onlyUnknownYearGrants = false;
-    
+
                 var data = new google.visualization.DataTable();
                 data.addColumn('string', '${i18n().year_capitalized}');
                 data.addColumn('number', '${i18n().grants_capitalized}');
                 data.addRows(${sparklineVO.yearToEntityCountDataTable?size});
-        
+
                 var knownYearGrantCounts = 0;
-                
-                <#list sparklineVO.yearToEntityCountDataTable as yearToGrantCountDataElement>                        
+
+                <#list sparklineVO.yearToEntityCountDataTable as yearToGrantCountDataElement>
                     data.setValue(${yearToGrantCountDataElement.yearToEntityCounter}, 0, '${yearToGrantCountDataElement.year}');
                     data.setValue(${yearToGrantCountDataElement.yearToEntityCounter}, 1, ${yearToGrantCountDataElement.currentEntitiesCount});
                     knownYearGrantCounts += ${yearToGrantCountDataElement.currentEntitiesCount};
                 </#list>
-        
+
                 <#-- Create a view of the data containing only the column pertaining to grant count. -->
                 var sparklineDataView = new google.visualization.DataView(data);
                 sparklineDataView.setColumns([1]);
-        
+
                 <#if sparklineVO.shortVisMode>
-         
-                <#-- For the short view we only want the last 10 year's view of grant count, hence we filter 
+
+                <#-- For the short view we only want the last 10 year's view of grant count, hence we filter
                     the data we actually want to use for render. -->
-         
+
                 sparklineDataView.setRows(data.getFilteredRows([{
                         column: 0,
                         minValue: '${sparklineVO.earliestRenderedGrantYear?c}',
@@ -69,28 +69,28 @@
                 <#else>
 
                 </#if>
-                
+
 
                 /*
                 This means that all the publications have unknown years & we do not need to display
                 the sparkline.
-                */            
+                */
                 if (unknownYearGrantCounts > 0 && knownYearGrantCounts < 1) {
-                    
+
                     onlyUnknownYearGrants = true;
-                    
+
                 } else {
 
-                /* 
+                /*
                 Test if we want to go for the approach when serving visualizations from a secure site..
                 If "https:" is not found in location.protocol then we do everything normally.
                 */
                 if (location.protocol.indexOf("https") == -1) {
                     /*
-                    This condition will make sure that the location protocol (http, https, etc) does not have 
+                    This condition will make sure that the location protocol (http, https, etc) does not have
                     for word https in it.
                     */
-                
+
                 <#-- Create the vis object and draw it in the div pertaining to sparkline. -->
                 var sparkline = new google.visualization.ImageSparkLine(providedSparklineImgTD[0]);
                 sparkline.draw(sparklineDataView, {
@@ -99,30 +99,30 @@
                         showAxisLines: false,
                         showValueLabels: false,
                         labelPosition: 'none'
-                });  
-                
-                
+                });
+
+
                 } else {
-                
+
                     <#-- Prepare data for generating google chart URL. -->
-                    
+
                     <#-- If we need to serve data for https:, we have to create an array of values to be plotted. -->
                     var chartValuesForEncoding = new Array();
-                    
+
                     $.each(sparklineDataView.getViewRows(), function(index, value) {
                         chartValuesForEncoding.push(data.getValue(value, 1));
                     });
-                    
+
                     var chartImageURL = constructVisualizationURLForSparkline(
-                                extendedEncodeDataForChartURL(chartValuesForEncoding, 
-                                                              sparklineDataView.getColumnRange(0).max), 
+                                extendedEncodeDataForChartURL(chartValuesForEncoding,
+                                                              sparklineDataView.getColumnRange(0).max),
                                 visualizationOptions);
 
                     var imageContainer = $(providedSparklineImgTD[0]);
-                    
-                    imageContainer.image(chartImageURL, 
+
+                    imageContainer.image(chartImageURL,
                             function(){
-                                imageContainer.empty().append(this); 
+                                imageContainer.empty().append(this);
                                 $(this).addClass("google-visualization-sparkline-image");
                             },
                             function(){
@@ -131,116 +131,116 @@
                                 imageContainer.empty();
                             }
                     );
-                
+
+                }
+
                 }
-                
-                }   
-                
-                var totalGrantCount = knownYearGrantCounts + unknownYearGrantCounts; 
-                
+
+                var totalGrantCount = knownYearGrantCounts + unknownYearGrantCounts;
+
                 <#if sparklineVO.shortVisMode>
-         
+
                     <#-- We want to display how many grant counts were considered, so this is used to calculate this. -->
-         
+
                     var shortSparkRows = sparklineDataView.getViewRows();
                     var renderedShortSparks = 0;
                     $.each(shortSparkRows, function(index, value) {
                         renderedShortSparks += data.getValue(value, 1);
                     });
-                    
+
                     /*
                     In case that there are only unknown grants we want the text to mention these counts,
                     which would not be mentioned in the other case because the renderedShortSparks only hold counts
                     of grants which have any date associated with it.
                     */
                     var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedShortSparks;
-                    
+
                     if (totalGrants === 1) {
                         var grantDisplay = "${i18n().grant}";
                     } else {
                         var grantDisplay = "${i18n().grants}";
                     }
-                    
+
                     $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
-            
+
                     var sparksText = '  ${i18n().within_last_10_years}';
-                    
+
                     if (totalGrants !== totalGrantCount) {
                         sparksText += ' (' + totalGrantCount + ' ${i18n().total})';
                     }
-            
+
                  <#else>
-                 
+
                     /*
-                     * Sparks that will be rendered will always be the one's which has 
+                     * Sparks that will be rendered will always be the one's which has
                      * any year associated with it. Hence.
                      * */
-                    var renderedSparks = ${sparklineVO.renderedSparks};  
-                    
+                    var renderedSparks = ${sparklineVO.renderedSparks};
+
                     /*
                     In case that there are only unknown grants we want the text to mention these counts,
                     which would not be mentioned in the other case because the renderedSparks only hold counts
                     of grants which have any date associated with it.
                     */
                     var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedSparks;
-                    
+
                     if (totalGrants === 1) {
                         var grantDisplay = "${i18n().grant}";
                     } else {
                         var grantDisplay = "${i18n().grants}";
                     }
-                        
+
                     $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
-            
-                    var sparksText = '  from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
+
+                    var sparksText = '  from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
                                         + ' through ${sparklineVO.latestRenderedGrantYear?c}</span>';
-                                        
+
                     if (totalGrants !== totalGrantCount) {
                         sparksText += ' (' + totalGrantCount + ' ${i18n().total})';
-                    }                                        
-                               
+                    }
+
                     if (totalGrantCount) {
-                        sparksText += '<br /> <a href="${sparklineVO.downloadDataLink}"  title=".csv ${i18n().file}">(.CSV ${i18n().file_capitalized})</a> ';                    
-                    }                                                
-                                         
+                        sparksText += '<br /> <a href="${sparklineVO.downloadDataLink}"  title=".csv ${i18n().file}">(.CSV ${i18n().file_capitalized})</a> ';
+                    }
+
                  </#if>
-         
+
                  if (!onlyUnknownYearGrants) {
                     $('#${sparklineContainerID} td.sparkline_text').html(sparksText);
                  }
-         
+
             }
-                 
+
             /*
-             * This will activate the visualization. It takes care of creating 
-             * div elements to hold the actual sparkline image and then calling the 
-             * drawGrantCountVisualization function. 
+             * This will activate the visualization. It takes care of creating
+             * div elements to hold the actual sparkline image and then calling the
+             * drawGrantCountVisualization function.
              * */
 
             $(document).ready(function() {
-                var sparklineImgTD; 
-        
+                var sparklineImgTD;
+
             /*
              * This is a nuclear option (creating the container in which everything goes)
-             * the only reason this will be ever used is the API user never submitted a 
-             * container ID in which everything goes. The alternative was to let the 
-             * vis not appear in the calling page at all. So now atleast vis appears but 
+             * the only reason this will be ever used is the API user never submitted a
+             * container ID in which everything goes. The alternative was to let the
+             * vis not appear in the calling page at all. So now atleast vis appears but
              * appended at the bottom of the body.
              * */
-                          
+
                 if ($('#${visContainerID}').length === 0) {
                     $('<div/>', {
                         'id': '${visContainerID}'
                     }).appendTo('body');
-                }       
-                  
+                }
+
                 if ($('#${sparklineContainerID}').length === 0) {
-        
+
                     $('<div/>', {
                         'id': '${sparklineContainerID}',
                         'class': 'sparkline_style'
                     }).prependTo('#${visContainerID}');
-            
+
                     var table = $('<table>');
                     table.attr('class', 'sparkline_wrapper_table');
                     var row = $('<tr>');
@@ -248,7 +248,7 @@
                     sparklineImgTD.attr('id', '${sparklineContainerID}_img');
                     sparklineImgTD.attr('width', visualizationOptions.width);
                     sparklineImgTD.attr('class', 'sparkline_style');
-            
+
                     row.append(sparklineImgTD);
                     var row2 = $('<tr>');
                     var sparklineNumberTD = $('<td>');
@@ -256,7 +256,7 @@
                     sparklineNumberTD.css('text-align', 'left');
                     row2.append(sparklineNumberTD);
                     var row3 = $('<tr>');
-                    
+
                     var sparklineTextTD = $('<td>');
                     sparklineTextTD.attr('class', 'sparkline_text');
                     sparklineTextTD.css('text-align', 'left');
@@ -266,13 +266,13 @@
                     table.append(row3);
                     table.prependTo('#${sparklineContainerID}');
                 }
-                
+
                 drawGrantCountVisualization(sparklineImgTD);
             });
-        </script>  
-        
-    </div><!-- Sparkline Viz -->      
-    
+        </script>
+
+    </div><!-- Sparkline Viz -->
+
     <#if sparklineVO.shortVisMode>
         <#--<span class="vis_link">-->
             <p><a class="all-vivo-grants" href="${sparklineVO.fullTimelineNetworkLink}" title="${i18n().view_all_grants}">${i18n().view_all_grants_text}</a></p>
@@ -280,23 +280,23 @@
     <#else>
         <!-- For Full Sparkline - Print the Table of Grant Counts per Year -->
         <#if displayTable?? && displayTable>
-        
-            <p> 
+
+            <p>
                 <#assign tableID = "grant_sparkline_data_table" />
                 <#assign tableCaption = "${i18n().grant_per_year}" />
                 <#assign tableActivityColumnName = "${i18n().grants_capitalized}" />
                 <#assign tableContent = sparklineVO.yearToActivityCount />
                 <#assign fileDownloadLink = sparklineVO.downloadDataLink />
-                
+
                 <#include "yearToActivityCountTable.ftl">
-    
+
                 ${i18n().download_data_as} <a href="${sparklineVO.downloadDataLink}" title=".csv ${i18n().link}">.csv</a> ${i18n().file}.
                 <br />
             </p>
-        
-        
+
+
         </#if>
-        
+
 
     </#if>
 </div>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl
index d3c8dd988f..48253410fc 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl
@@ -4,49 +4,49 @@
 
 <h2>About VIVO's Map of Science Visualization</h2>
 <h3>Reference Basemap</h3>
-<p>The VIVO Map of Science visualization uses the UCSD map of science and classification 
-system that was computed using paper-level data from about 25,000 journals from Elsevier's 
-Scopus and Clarivate Analytics' Web of Science (WoS) for the years 2001-2010. The UCSD map 
-of science assigns the 25,000 journals to 554 subdisciplines that are further aggregated 
-into 13 main disciplines of science. In the map, each discipline has a distinct color 
-(green for 'Biology', brown for 'Earth Sciences', etc.) and a label. (Sub)disciplines that 
-are similar closer to one another on the map. (Sub)disciplines that are especially similar 
+<p>The VIVO Map of Science visualization uses the UCSD map of science and classification
+system that was computed using paper-level data from about 25,000 journals from Elsevier's
+Scopus and Clarivate Analytics' Web of Science (WoS) for the years 2001-2010. The UCSD map
+of science assigns the 25,000 journals to 554 subdisciplines that are further aggregated
+into 13 main disciplines of science. In the map, each discipline has a distinct color
+(green for 'Biology', brown for 'Earth Sciences', etc.) and a label. (Sub)disciplines that
+are similar closer to one another on the map. (Sub)disciplines that are especially similar
 are connected by grey lines.</p>
 
 <h3>Data Overlay</h3>
-<p>Publication activity of a university, organization, or person can be overlaid on the 
-map to generate expertise profiles. The process is as follows: (1) The set of unique 
-journals is identified, (2) the number of times each journal served as a publication venue 
-is calculated, and (3) the area size of the 13 disciplines and 554 subdisciplines is 
-calculated based on these journal publication venue counts. Note that some journals are 
-associated with exactly one (sub)discipline while others, e.g., interdisciplinary ones like 
-<em>Science</em> or <em>Nature</em>, are fractionally associated with multiple 
-(sub)disciplines. Subdisciplines inherit the colors of their parent disciplines. 
+<p>Publication activity of a university, organization, or person can be overlaid on the
+map to generate expertise profiles. The process is as follows: (1) The set of unique
+journals is identified, (2) the number of times each journal served as a publication venue
+is calculated, and (3) the area size of the 13 disciplines and 554 subdisciplines is
+calculated based on these journal publication venue counts. Note that some journals are
+associated with exactly one (sub)discipline while others, e.g., interdisciplinary ones like
+<em>Science</em> or <em>Nature</em>, are fractionally associated with multiple
+(sub)disciplines. Subdisciplines inherit the colors of their parent disciplines.
 (Sub)disciplines without any associated publications are given in gray.</p>
 
 <img src="${aboutImagesRoot}/scimap_discipline.jpg" width="450" height="327" />
 <img src="${aboutImagesRoot}/scimap_subdiscipline.jpg" width="450" height="327" />
 
 <h3>Expertise Profile Comparison Map</h3>
-<p>Publication activity of up to three organizations or persons can be compared via "Compare 
-organizations." In the table on the left, select up to three organizations. The expertise 
-profile of each organizations will be represented as data overlay. Each organizations is 
-represented in a distinct color and a top-10 list of subdisciplines with the highest number 
+<p>Publication activity of up to three organizations or persons can be compared via "Compare
+organizations." In the table on the left, select up to three organizations. The expertise
+profile of each organizations will be represented as data overlay. Each organizations is
+represented in a distinct color and a top-10 list of subdisciplines with the highest number
 of publications is given below the comparison map. Data can be saved as CSV file.</p>
 
 <img src="${aboutImagesRoot}/scimap_comparison.jpg" width="803" height="781" style=
 "margin-left: 50px;"/>
 
 <h3>Interactivity</h3>
-<p>The map can be explored at two levels-by 13 disciplines or 554 subdisciplines. Clicking 
-on a node in the map brings up the number of fractionally associated journal publications 
-and the percentage of publications mapped to this (sub)discipline. Hover over a discipline 
-in the table on the left to see what circles it corresponds to on the map. Use slider below 
+<p>The map can be explored at two levels-by 13 disciplines or 554 subdisciplines. Clicking
+on a node in the map brings up the number of fractionally associated journal publications
+and the percentage of publications mapped to this (sub)discipline. Hover over a discipline
+in the table on the left to see what circles it corresponds to on the map. Use slider below
 map, on the right to reduce number of subdisciplines shown to improve legibility</p>
 
 <h3>Links</h3>
-<p>For more information on the UCSD map of science and classification system, see 
-<a href="https://doi.org/10.1371/journal.pone.0039464" target="_blank">https://doi.org/10.1371/journal.pone.0039464</a>. 
-For other maps of science, see 
-<a href="http://scimaps.org" target="_blank">http://scimaps.org</a> and 
+<p>For more information on the UCSD map of science and classification system, see
+<a href="https://doi.org/10.1371/journal.pone.0039464" target="_blank">https://doi.org/10.1371/journal.pone.0039464</a>.
+For other maps of science, see
+<a href="http://scimaps.org" target="_blank">http://scimaps.org</a> and
 <a href="http://mapofscience.com" target="_blank">http://mapofscience.com</a>.</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
index bfeeedeec9..249cdd91f9 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
@@ -16,9 +16,9 @@
 
 
 <#if entityLocalName?has_content >
-    
+
     <#assign entityMapOfScienceURL = "${urls.base}${shortVisualizationURLRoot}/${mapOfScienceVisParam}/${entityLocalName}">
-    
+
 <#else>
 
     <#assign entityMapOfScienceURL = '${urls.base}${shortVisualizationURLRoot}/${mapOfScienceVisParam}/?uri=${entityURI}'>
@@ -49,7 +49,7 @@ var disciplineBlackLabelImageUrlPrefix = disciplineLabelImageUrlPrefix + "black/
 
 var infoIconUrl = "${urls.images}/iconInfo.png";
 var drillDownIconUrl = "${urls.images}/visualization/drill_down_icon.png";
-											
+
 var entityLabel = '${entityLabel}';
 
 var ENTITY_TYPE = '${entityType}';
@@ -61,11 +61,11 @@ var ENTITY_TYPE = '${entityType}';
 
 var loadingImageLink = contextPath + "/images/visualization/ajax-loader-indicator.gif";
 var refreshPageImageLink = contextPath + "/images/visualization/refresh-green.png";
-											
+
 var comparisonScienceMapCsvDataUrlPrefix = "${urls.base}${dataVisualizationURLRoot}?labelField=label&vis=entity_comparison&uri=";
 var entityMapOfScienceSubDisciplineCSVURLPrefix = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&output=csv&vis_mode=subdiscipline&&uri="
 var entityMapOfScienceDisciplineCSVURL = "${entityMapOfScienceDisciplineCSVURL}";
-var entityMapOfScienceSubDisciplineCSVURL = "${entityMapOfScienceSubDisciplineCSVURL}";											
+var entityMapOfScienceSubDisciplineCSVURL = "${entityMapOfScienceSubDisciplineCSVURL}";
 var i18nStrings = {
     firstString: '${i18n().vis_first_link}',
     lastString: '${i18n().vis_last_link}',
@@ -115,7 +115,7 @@ var i18nStrings = {
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.blockUI.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/datatable/1.10.12/jquery.dataTables.min.js"></script>',
-			  '<script type="text/javascript" src="${urls.base}/js/visualization/dataTables.helper.js"></script>', 
+			  '<script type="text/javascript" src="${urls.base}/js/visualization/dataTables.helper.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.notify.min.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/visualization/mapofscience/ClassExtendUtils.js"></script>',
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
index ecb88ce7e9..a0441bd2b2 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
@@ -19,9 +19,9 @@ corresponding changes in the included Templates. -->
 </#if>
 <h2 id="header-entity-label" class="hide-dom-on-init"><span><a id="entityMoniker" href="${entityVivoProfileURL}" title="${i18n().entity_label}">${entityLabel}</a></span></h2>
 
-<div id="map-of-science-info" class="hide-dom-on-init"> ${i18n().explore_activity} (<span id="mapped-publications" style="font-weight: bold"></span> ${i18n().publications}) ${i18n().across_subdisciplines} 
-	<img class="filterInfoIcon" id="imageIconOne"  src="${urls.images}/iconInfo.png" 
-		alt="${i18n().info_icon}" /> 
+<div id="map-of-science-info" class="hide-dom-on-init"> ${i18n().explore_activity} (<span id="mapped-publications" style="font-weight: bold"></span> ${i18n().publications}) ${i18n().across_subdisciplines}
+	<img class="filterInfoIcon" id="imageIconOne"  src="${urls.images}/iconInfo.png"
+		alt="${i18n().info_icon}" />
 </div>
 
 <div id="left-column" class="hide-dom-on-init">
@@ -33,7 +33,7 @@ corresponding changes in the included Templates. -->
             <p>&#035;{text}</p>
             <p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p>
         </div>
-        
+
         <div id="warning-notification" class="ui-state-highlight ui-corner-all" >
 	        <a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a>
 	        <span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
@@ -41,7 +41,7 @@ corresponding changes in the included Templates. -->
 	        <p>&#035;{text}</p>
         </div>
     </div>
-    
+
     <#-- VIEW TYPE FILTER -->
     <div id="view-type-filter" style="display:${viewTypeFilterDisplay};">
     	<input type="radio" name="view-type" value="ENTITY"> ${i18n().explore_capitalized} ${entityLabel} </input>
@@ -49,19 +49,19 @@ corresponding changes in the included Templates. -->
 		<input type="radio" name="view-type" value="COMPARISON"> ${i18n().compare_organizations} <#--/ people --></input>
 		<img class="filterInfoIcon" id="compareInfoIcon" src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="" /><br><br>
     </div>
-    
+
     <!-- <h3>${i18n().what_to_compare}</h3> -->
-    
+
     <div id="main-science-areas-table-container"></div>
 
-</div>		
+</div>
 
 <div id="right-column">
 	<div id="map_area"></div>
 	<div id="percent-mapped-info">
 		${i18n().mapped} <span id="percent-mapped"></span>% ${i18n().of} <span id="total-publications"></span> ${i18n().publications}
 		<img class="filterInfoIcon" id="imageIconThree" src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}"/>
-			
+
 		<div id="download-unlocated-journal-info">
 			<a href="${entityMapOfScienceUnlocatedJournalsCSVURL}" title="${i18n().save_unmapped_publications}">${i18n().save_unmapped_publications}</a>
 		</div>
@@ -80,7 +80,7 @@ corresponding changes in the included Templates. -->
 <h1 id="noPublications-header">${entityLabel}</h1>
     <h3 id="vis-title">${i18n().map_of_science_visualization}</h3>
     <div id="error-body">
-        <p><span id="variable-error-text">${i18n().no_publications_for_this_organization}</span><hr /> 
+        <p><span id="variable-error-text">${i18n().no_publications_for_this_organization}</span><hr />
         ${i18n().please_visit} ${entityLabel} <a href="${entityVivoProfileURL}">${i18n().profile_page}</a> ${i18n().for_complete_overview}</p>
     </div>
 </div>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl
index c69f145d78..df9aaac119 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl
@@ -3,19 +3,19 @@
 <#-- START TOOLTIP TEXT -->
 
 <div id="toolTipOne" style="display:none;">
-VIVO's Map of Science visualization depicts the topical expertise a university, organization, or person has 
-based on past publications loaded into VIVO. The ${entityLabel} expertise profile is shown here--larger 
+VIVO's Map of Science visualization depicts the topical expertise a university, organization, or person has
+based on past publications loaded into VIVO. The ${entityLabel} expertise profile is shown here--larger
 circle sizes denote more publications per topic area.<br /><br />
 
 <a href='${subEntityMapOfScienceCommonURL}about'>Learn more about VIVO's Map of Science visualization?</a>
 </div>
 
 <div id="toolTipTwo" style="display:none;">
-The table below summarizes the publications plotted on the Map of Science. Each row corresponds to a 
+The table below summarizes the publications plotted on the Map of Science. Each row corresponds to a
 (sub)discipline on the map<br /><br />
 
-The <b># of pubs.</b> column shows how many of the publications were mapped to each (sub)discipline. This count can be 
-fractional because some publication venues are associated with more than one (sub)discipline. Each publication 
+The <b># of pubs.</b> column shows how many of the publications were mapped to each (sub)discipline. This count can be
+fractional because some publication venues are associated with more than one (sub)discipline. Each publication
 in such a venue contributes fractionally to all associated (sub)disciplines according to a weighting scheme.<br /><br />
 
 The <b>% of activity</b> column shows what proportion of the publications were mapped to each (sub)discipline.
@@ -23,13 +23,13 @@ The <b>% of activity</b> column shows what proportion of the publications were m
 </div>
 
 <div id="toolTipThree" style="display:none;">
-This visualization is based on the publications we were able to 'science locate' for ${entityLabel}, and 
+This visualization is based on the publications we were able to 'science locate' for ${entityLabel}, and
 therefore it may not be fully representative of the overall publication activity for ${entityLabel}.<br /><br />
 
-The publication coverage of this visualization can be improved by including more publication data in the VIVO 
-system, and by ensuring that each publication in the VIVO system is associated with a journal that the Map of 
-Science recognizes (based on the holdings of Clarivate Analytics' Web of Science database and Elsevier's Scopus database). Journal 
-names containing typos or other idiosyncrasies may need to be cleaned up before they are recognized. You may 
+The publication coverage of this visualization can be improved by including more publication data in the VIVO
+system, and by ensuring that each publication in the VIVO system is associated with a journal that the Map of
+Science recognizes (based on the holdings of Clarivate Analytics' Web of Science database and Elsevier's Scopus database). Journal
+names containing typos or other idiosyncrasies may need to be cleaned up before they are recognized. You may
 contact a VIVO system administrator if publication coverage is a concern.</div>
 
 <div id="exploreTooltipText" style="display:none;">
@@ -48,15 +48,15 @@ contact a VIVO system administrator if publication coverage is a concern.</div>
 <#-- COMPARISON TOOLTIP TEXT -->
 
 <div id="comparisonToolTipTwo" style="display:none;">
-The listed organizations are children of the ${entityLabel} node in the organizational hierarchy. 
-You may 'drill down' to see the organizations below a given sub-organization by selecting the chart icon 
+The listed organizations are children of the ${entityLabel} node in the organizational hierarchy.
+You may 'drill down' to see the organizations below a given sub-organization by selecting the chart icon
 next to a selected sub-organization's name below the graph on the right.
 <br /><br />
 
-The <b># of pubs.</b> column shows how many of the publications were mapped to each subdiscipline. This 
-count can be fractional because some publication venues are associated with more than one subdiscipline. 
-Each publication in such a venue contributes fractionally to all associated subdisciplines according to 
-a weighting scheme. 
+The <b># of pubs.</b> column shows how many of the publications were mapped to each subdiscipline. This
+count can be fractional because some publication venues are associated with more than one subdiscipline.
+Each publication in such a venue contributes fractionally to all associated subdisciplines according to
+a weighting scheme.
 
 <br /><br />
 The <b>% of activity</b> column shows what proportion of the publications were mapped to each subdiscipline.
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl
index 1de932009e..6acfd209c9 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl
@@ -3,24 +3,24 @@
 
 <#if (currentModels?size > 0)>
 
-	
+
 	${i18n().cached_models_regenerated}<hr />
 
 	<ul>
 	<#list currentModels as model>
 		<li>
-		
+
 		<#if model.uri == "">
-			
+
 			${i18n().uri_independent_model}
-		
+
 		<#else>
-		
+
 			<a href="${urls.base}/individual?uri=${model.uri?url}" title="${i18n().label}">${model.individualLabel}</a>
-			
+
 		</#if>
-		<span class="display-title">${model.humanReadableType}</span> 
-		
+		<span class="display-title">${model.humanReadableType}</span>
+
 		</li>
 	</#list>
 	</ul>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
index 7ce7eafb50..a1e1533361 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
@@ -71,14 +71,14 @@ $(document).ready(function(){
                               "ego_moniker",
                               "ego_profile_image",
                               jQuery.parseJSON(getWellFormedURLs("${egoURIParam}", "profile_info")));
-    
-    <#if (numOfCoAuthorShips?? && numOfCoAuthorShips <= 0) || (numOfAuthors?? && numOfAuthors <= 0) >  
+
+    <#if (numOfCoAuthorShips?? && numOfCoAuthorShips <= 0) || (numOfAuthors?? && numOfAuthors <= 0) >
         if ($('#ego_label').text().length > 0) {
             setProfileName('no_coauthorships_person', $('#ego_label').text());
         }
     </#if>
-    
-    
+
+
     $.ajax({
             url: "${urls.base}/visualizationAjax",
             data: ({vis: "utilities", vis_mode: "SHOW_GRANTS_LINK", uri: '${egoURIParam}'}),
@@ -95,7 +95,7 @@ $(document).ready(function(){
 
             }
         });
-                    
+
 // RENDER CHORD
 
     var labels = [];
@@ -251,7 +251,7 @@ $(document).ready(function(){
 
 <div id="body">
 	<div  class="sub_headings"><h2><a href="${egoVivoProfileURL}" title="${i18n().author_name}"><span id="ego_label"></span></a><br />${i18n().co_author_network} </h2></div>
-    <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) > 
+    <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) >
         <div class = "graphml-file-link">(<a href="${egoCoAuthorshipNetworkDataFileURL}" title="GraphML ${i18n().file}">GraphML ${i18n().file}</a>)</div>
     </#if>
 
@@ -263,7 +263,7 @@ $(document).ready(function(){
             </div>
         </div>
     </div>
-    
+
     <#if (builtFromCacheTime??) >
         <div class="cache-info-small">${i18n().using_cache_time} ${builtFromCacheTime?time} (${builtFromCacheTime?date?string("MMM dd yyyy")})</div>
     </#if>
@@ -271,15 +271,15 @@ $(document).ready(function(){
 
     <#if (numOfAuthors?? && numOfAuthors > 0) >
     <#else>
-    
-        <span id="no_coauthorships">${i18n().no_papers_for} 
+
+        <span id="no_coauthorships">${i18n().no_papers_for}
             <a href="${egoVivoProfileURL}" title="${i18n().co_authorship}"><span id="no_coauthorships_person" class="author_name">${i18n().this_author}</span></a> ${i18n().in_the_vivo_db}
         </span>
-    
+
     </#if>
-            
+
     <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) >
-    
+
         <div id="bodyPannel">
             <div id="chord" style="float: right;"></div>
         </div>
@@ -300,22 +300,22 @@ $(document).ready(function(){
 
         <#-- Sparkline -->
         <div id="sparkline-container-full">
-            
+
             <#assign displayTable = false />
-            
+
             <#assign sparklineVO = egoPubSparklineVO />
             <div id="publication-count-sparkline-include"><#include "personPublicationSparklineContent.ftl"></div>
-    
+
             <#assign sparklineVO = uniqueCoauthorsSparklineVO />
             <div id="coauthor-count-sparkline-include"><#include "coAuthorshipSparklineContent.ftl"></div>
-        </div>  
-    
+        </div>
+
         <div class="vis_stats_full">
-        
+
         <div class="sub_headings" id="table_heading"><h3>${i18n().tables_capitalized}</h3></div>
-        
+
             <div class="vis-tables">
-                
+
                 <p id="publications_table_container" class="datatable">
 
                 <#assign tableID = "publication_data_table" />
@@ -323,15 +323,15 @@ $(document).ready(function(){
                 <#assign tableActivityColumnName = "${i18n().publications_capitalized}" />
                 <#assign tableContent = egoPubSparklineVO.yearToActivityCount />
                 <#assign fileDownloadLink = egoPubSparklineVO.downloadDataLink />
-                
+
                 <#include "yearToActivityCountTable.ftl">
 
                 </p>
-                
+
             </div>
-            
+
             <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) >
-        
+
                 <div class="vis-tables">
                     <p id="coauth_table_container" class="datatable">
                         <#assign tableID = "coauthorships_table" />
@@ -344,14 +344,14 @@ $(document).ready(function(){
                         <#include "collaboratorToActivityCountTable.ftl">
                     </p>
                 </div>
-            
+
             </#if>
-            
+
             <div style="clear:both"></div>
-        
+
         </div>
-        
+
     </#if>
-    
+
 </div>
 <div id="chord-info-div" style="display: none;"></div>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
index caba8b865c..08de3d0ad8 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
@@ -71,13 +71,13 @@ ${stylesheets.add('<link rel="stylesheet" type="text/css" href="${urls.base}/css
 <script language="JavaScript" type="text/javascript">
 
 $(document).ready(function(){
-        
+
     processProfileInformation("ego_label",
                               "ego_moniker",
                               "ego_profile_image",
                               jQuery.parseJSON(getWellFormedURLs("${egoURIParam}", "profile_info")));
-    
-    <#if (numOfCoInvestigations?? && numOfCoInvestigations <= 0) || (numOfInvestigators?? && numOfInvestigators <= 0) >  
+
+    <#if (numOfCoInvestigations?? && numOfCoInvestigations <= 0) || (numOfInvestigators?? && numOfInvestigators <= 0) >
             if ($('#ego_label').text().length > 0) {
                 setProfileName('no_coinvestigations_person', $('#ego_label').text());
             }
@@ -256,15 +256,15 @@ $(document).ready(function(){
 
 <div id="body">
     <div  class="sub_headings"><h2><a href="${egoVivoProfileURL}" title="${i18n().investigator_name}"><span id="ego_label"></span></a><br />${i18n().co_investigator_network_capitalized} </h2></div>
-            
+
     <#if (numOfInvestigators?? && numOfInvestigators > 0) >
-        
-        <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) > 
+
+        <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) >
                 <div class = "graphml-file-link"><a href="${egoCoInvestigationNetworkDataFileURL}" title="${i18n().co_investigator}">(GraphML ${i18n().file_capitalized})</a></div>
         </#if>
-    
+
     </#if>
-    
+
     <div class = "toggle_visualization">
         <div id="coauthorship_link_container" class="collaboratorship-link-container">
         	<div class="collaboratorship-icon"><a href="${coauthorshipURL}" title="${i18n().co_author}"><img src="${coAuthorIcon}" alt="${i18n().co_author_icon}"/></a></div>
@@ -273,12 +273,12 @@ $(document).ready(function(){
             </div>
         </div>
     </div>
-        
+
     <div style="clear:both;"></div>
-    
-            
+
+
     <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) >
-    
+
         <div id="bodyPannel">
             <div id="chord" style="float: right;"></div>
         </div>
@@ -308,19 +308,19 @@ $(document).ready(function(){
 
         <#-- Sparkline -->
         <div id="sparkline-container-full">
-            
+
             <#assign displayTable = false />
-            
+
             <#assign sparklineVO = egoGrantSparklineVO />
             <div id="grant-count-sparkline-include"><#include "personGrantSparklineContent.ftl"></div>
-    
+
             <#assign sparklineVO = uniqueCoInvestigatorsSparklineVO />
             <div id="coinvestigator-count-sparkline-include"><#include "coInvestigationSparklineContent.ftl"></div>
-        </div>  
-    
+        </div>
+
 
         <div class="vis_stats_full">
-        
+
         <div class="sub_headings" id="table_heading"><h3>${i18n().tables_capitalized}</h3></div>
             <p style="float:left;font-size:.9em">${i18n().grant_info_for_all_years}&nbsp;<img class="filterInfoIcon" width="16px" height="16px" id="imageIconThree" src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().grant_sparkline_note}" /></p>
 
@@ -335,17 +335,17 @@ $(document).ready(function(){
                 <#assign tableActivityColumnName = "${i18n().grants_capitalized}" />
                 <#assign tableContent = egoGrantSparklineVO.yearToActivityCount />
                 <#assign fileDownloadLink = egoGrantSparklineVO.downloadDataLink />
-                
+
                 <#include "yearToActivityCountTable.ftl">
 
                 </p>
-                
+
             </div>
-            
+
             <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) >
-        
+
                 <div class="vis-tables">
-                
+
                     <p id="coinve_table_container" class="datatable">
                         <#assign tableID = "coinvestigations_table" />
                         <#assign tableCaption = "${i18n().co_investigator_s_capitalized} " />
@@ -357,14 +357,14 @@ $(document).ready(function(){
                         <#include "collaboratorToActivityCountTable.ftl">
                     </p>
                 </div>
-            
+
             </#if>
-            
+
             <div style="clear:both"></div>
-        
+
         </div>
-        
+
     </#if>
-    
+
 </div>
 <div id="chord-info-div" style="display: none;"></div>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl
index be7ce8ea3b..4957d029d5 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl
@@ -1,19 +1,19 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<#-- 
-     There are two templates for displaying publication information on foaf person pages.
-
-     - personPublicationSparklineContent.ftl, which shows the actual sparkline
-     - personPublicationCountNoSparkline.ftl, which shows on counts and not the sparkline
-     
-     The first is the template used with the Wilma theme and the individual--foaf-person.ftl
-     template. The second is used with the individual--foaf-person-2column.ftl template.
--->
-<#if shouldVIVOrenderVis>
-    <#-- Added requestingTemplate variable in release 1.6 to support multi-view option -->
-    <#if requestingTemplate = "foaf-person-wilma" >
-	    <#include "personPublicationSparklineContent.ftl"> 
-	<#else>
-        <#include "personPublicationCountNoSparkline.ftl"> 
-    </#if>
-</#if>
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#--
+     There are two templates for displaying publication information on foaf person pages.
+
+     - personPublicationSparklineContent.ftl, which shows the actual sparkline
+     - personPublicationCountNoSparkline.ftl, which shows on counts and not the sparkline
+
+     The first is the template used with the Wilma theme and the individual--foaf-person.ftl
+     template. The second is used with the individual--foaf-person-2column.ftl template.
+-->
+<#if shouldVIVOrenderVis>
+    <#-- Added requestingTemplate variable in release 1.6 to support multi-view option -->
+    <#if requestingTemplate = "foaf-person-wilma" >
+	    <#include "personPublicationSparklineContent.ftl">
+	<#else>
+        <#include "personPublicationCountNoSparkline.ftl">
+    </#if>
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl
index 1223f00258..974ec0a85c 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl
@@ -9,29 +9,29 @@
 
 <#-- This is used to prevent collision between sparkline & visualization conatiner div ids. -->
 <#if visContainerID?upper_case == sparklineContainerID?upper_case>
-    <#assign sparklineContainerID = visContainerID + "_spark"> 
+    <#assign sparklineContainerID = visContainerID + "_spark">
 </#if>
 <div class="staticPageBackground">
     <div id="${visContainerID}">
         <script type="text/javascript">
-    
+
             function drawPubCountVisualization() {
                 var unknownYearPublicationCounts = ${sparklineVO.unknownYearPublications};
                 var onlyUnknownYearPublications = false;
-                
+
                 var data = new google.visualization.DataTable();
                 data.addColumn('string', '${i18n().year_capitalized}');
                 data.addColumn('number', '${i18n().publications_capitalized}');
                 data.addRows(${sparklineVO.yearToEntityCountDataTable?size});
-                
+
                 var knownYearPublicationCounts = 0;
-        
-                <#list sparklineVO.yearToEntityCountDataTable as yearToPublicationCountDataElement>                        
+
+                <#list sparklineVO.yearToEntityCountDataTable as yearToPublicationCountDataElement>
                     data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 0, '${yearToPublicationCountDataElement.year}');
                     data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 1, ${yearToPublicationCountDataElement.currentEntitiesCount});
                     knownYearPublicationCounts += ${yearToPublicationCountDataElement.currentEntitiesCount};
                 </#list>
-            
+
                 <#-- Create a view of the data containing only the column pertaining to publication count. -->
                 var sparklineDataView = new google.visualization.DataView(data);
                 sparklineDataView.setColumns([1]);
@@ -39,13 +39,13 @@
                 /*
                 This means that all the publications have unknown years & we do not need to display
                 the sparkline.
-                */            
+                */
                 if (unknownYearPublicationCounts > 0 && knownYearPublicationCounts < 1) {
-                    
+
                     onlyUnknownYearPublications = true;
-                    
-                } 
-                
+
+                }
+
                 var unknownYearPublicationCounts = ${sparklineVO.unknownYearPublications};
                 var totalPublicationCount = knownYearPublicationCounts + unknownYearPublicationCounts;
 
@@ -68,18 +68,18 @@
                     else {
                         td2Text += "<strong>" + tenYearCount + "</strong> ${i18n().last_ten_full_years} " ;
                     }
-                    
+
                     if ( tenYearCount < 100 ) {
                         td2Text += infoImgText;
-                    } 
+                    }
                 }
                 else {
                     td2Text += "total <img class='infoIcon' src='" + infoIconSrc + "' height='14px' width='14px' alt='${i18n().info_icon}' title='${i18n().numbers_based_on_publications_in_vivo}' />";
                 }
-         
+
                 $('#${sparklineContainerID} td#totalPubs').html(td1Text);
                 $('#${sparklineContainerID} td#tenYearCount').html(td2Text);
-                         
+
                 if ( td1Text > 99 && td1Text < 1000 ) {
                     $('#${sparklineContainerID} td#totalPubs').attr('style','font-size:1.25em');
                 }
@@ -87,14 +87,14 @@
                     $('#${sparklineContainerID} td#totalPubs').attr('style','font-size:1.1em');
                 }
             }
-    
+
 
             $(document).ready(function() {
-                var sparklineImgTD; 
-        
-        
+                var sparklineImgTD;
+
+
                 if ($('#${sparklineContainerID}').length === 0) {
-        
+
                     $('<div/>', {
                         'id': '${sparklineContainerID}',
                     }).prependTo('#${visContainerID}');
@@ -111,11 +111,11 @@
                     table.append(row);
                     table.prependTo('#${sparklineContainerID}');
                 }
-            
+
                 drawPubCountVisualization();
             });
         </script>
-         
+
             </div> <!-- Sparkline Viz -->
 
         </div>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
index f575860920..d83f6c47ce 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
@@ -9,7 +9,7 @@
 
 <#-- This is used to prevent collision between sparkline & visualization conatiner div ids. -->
 <#if visContainerID?upper_case == sparklineContainerID?upper_case>
-    <#assign sparklineContainerID = visContainerID + "_spark"> 
+    <#assign sparklineContainerID = visContainerID + "_spark">
 </#if>
 
 <div class="staticPageBackground">
@@ -34,33 +34,33 @@
             </#if>
 
             function drawPubCountVisualization(providedSparklineImgTD) {
-    
+
                 var unknownYearPublicationCounts = ${sparklineVO.unknownYearPublications};
                 var onlyUnknownYearPublications = false;
-                
+
                 var data = new google.visualization.DataTable();
                 data.addColumn('string', '${i18n().year_capitalized}');
                 data.addColumn('number', '${i18n().publications_capitalized}');
                 data.addRows(${sparklineVO.yearToEntityCountDataTable?size});
-                
+
                 var knownYearPublicationCounts = 0;
-        
-                <#list sparklineVO.yearToEntityCountDataTable as yearToPublicationCountDataElement>                        
+
+                <#list sparklineVO.yearToEntityCountDataTable as yearToPublicationCountDataElement>
                     data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 0, '${yearToPublicationCountDataElement.year}');
                     data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 1, ${yearToPublicationCountDataElement.currentEntitiesCount});
                     knownYearPublicationCounts += ${yearToPublicationCountDataElement.currentEntitiesCount};
                 </#list>
-        
+
                 <#-- Create a view of the data containing only the column pertaining to publication count. -->
                 var sparklineDataView = new google.visualization.DataView(data);
                 sparklineDataView.setColumns([1]);
-                
+
 
                 <#if sparklineVO.shortVisMode>
-         
-                <#-- For the short view we only want the last 10 year's view of publication count, hence we filter 
+
+                <#-- For the short view we only want the last 10 year's view of publication count, hence we filter
                     the data we actually want to use for render. -->
-         
+
                 sparklineDataView.setRows(data.getFilteredRows([{
                         column: 0,
                         minValue: '${sparklineVO.earliestRenderedPublicationYear?c}',
@@ -70,28 +70,28 @@
                 <#else>
 
                 </#if>
-                
+
 
                 /*
                 This means that all the publications have unknown years & we do not need to display
                 the sparkline.
-                */            
+                */
                 if (unknownYearPublicationCounts > 0 && knownYearPublicationCounts < 1) {
-                    
+
                     onlyUnknownYearPublications = true;
-                    
+
                 } else {
 
-                /* 
+                /*
                 Test if we want to go for the approach when serving visualizations from a secure site..
                 If "https:" is not found in location.protocol then we do everything normally.
                 */
                 if (location.protocol.indexOf("https") == -1) {
                     /*
-                    This condition will make sure that the location protocol (http, https, etc) does not have 
+                    This condition will make sure that the location protocol (http, https, etc) does not have
                     for word https in it.
                     */
-                    
+
                     <#-- Create the vis object and draw it in the div pertaining to sparkline. -->
                     var sparkline = new google.visualization.ImageSparkLine(providedSparklineImgTD[0]);
                     sparkline.draw(sparklineDataView, {
@@ -103,26 +103,26 @@
                     });
 
                 } else {
-                
+
                     <#-- Prepare data for generating google chart URL. -->
-                    
+
                     <#-- If we need to serve data for https:, we have to create an array of values to be plotted. -->
                     var chartValuesForEncoding = new Array();
-                    
+
                     $.each(sparklineDataView.getViewRows(), function(index, value) {
                         chartValuesForEncoding.push(data.getValue(value, 1));
                     });
-                    
+
                     var chartImageURL = constructVisualizationURLForSparkline(
-                                extendedEncodeDataForChartURL(chartValuesForEncoding, 
-                                                              sparklineDataView.getColumnRange(0).max), 
+                                extendedEncodeDataForChartURL(chartValuesForEncoding,
+                                                              sparklineDataView.getColumnRange(0).max),
                                 visualizationOptions);
 
                     var imageContainer = $(providedSparklineImgTD[0]);
-                    
-                    imageContainer.image(chartImageURL, 
+
+                    imageContainer.image(chartImageURL,
                             function(){
-                                imageContainer.empty().append(this); 
+                                imageContainer.empty().append(this);
                                 $(this).addClass("google-visualization-sparkline-image");
                             },
                             function(){
@@ -131,13 +131,13 @@
                                 imageContainer.empty();
                             }
                     );
-                
+
                 }
-                
+
                 }
-         
+
                 var totalPublicationCount = knownYearPublicationCounts + unknownYearPublicationCounts;
-                
+
                                 <#if sparklineVO.shortVisMode>
 
                                     <#-- We want to display how many publication counts were considered, so this is used to calculate this. -->
@@ -153,20 +153,20 @@
                                     which would not be mentioned in the other case because the renderedShortSparks only hold counts
                                     of publications which have any date associated with it.
                                     */
-                                     
+
                                     var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedShortSparks;
                                     var sparksText = "";
                                     if ( !onlyUnknownYearPublications ) {
-                                    
+
                                         $('#${sparklineContainerID} td.sparkline_number').text(totalPubs + " ${i18n().last_ten_full}").attr("class", "grey-text");
 
                                         sparksText += "${i18n().years}";
 
                                         if (totalPubs !== totalPublicationCount) {
-                                        //sparksText += ' (' + totalPublicationCount + ' ${i18n().total})' ; 
+                                        //sparksText += ' (' + totalPublicationCount + ' ${i18n().total})' ;
                                         }
                                         sparksText += "&nbsp;<img class='infoIcon' src='" + infoIconSrc + "' height='16px' width='16px' alt='${i18n().info_icon}' title='${i18n().numbers_based_on_publications_in_vivo}' />" ;
-                                        
+
                                     }
                                     else {
                                     var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedSparks;
@@ -175,29 +175,29 @@
                                    }
 
                                  <#else>
-            
+
                     /*
-                     * Sparks that will be rendered will always be the one's which has 
+                     * Sparks that will be rendered will always be the one's which has
                      * any year associated with it. Hence.
                      * */
                     var renderedSparks = ${sparklineVO.renderedSparks?c};
-                    
+
                     /*
                     In case that there are only unknown publications we want the text to mention these counts,
                     which would not be mentioned in the other case because the renderedSparks only hold counts
                     of publications which have any date associated with it.
                     */
                     var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedSparks;
-                          
+
                     if ( totalPubs == 1 ) {
                         var pubDisplay = "${i18n().publication}";
                     } else {
                         var pubDisplay = "${i18n().publications}";
                     }
-                    
+
                     $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).attr("class", "grey-text").append("<span style='color: #2485AE;'> "+ pubDisplay +"<br/></span>");
-            
-                    var sparksText = '  ${i18n().from} <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
+
+                    var sparksText = '  ${i18n().from} <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
                                         + ' - ${sparklineVO.latestRenderedPublicationYear?c}</span>';
 
                     if (totalPubs !== totalPublicationCount) {
@@ -205,47 +205,47 @@
                     }
 
                     if (totalPublicationCount) {
-                        sparksText += ' <br /><a href="${sparklineVO.downloadDataLink}" title="csv ${i18n().file}">(.CSV ${i18n().file_capitalized})</a> ';                    
+                        sparksText += ' <br /><a href="${sparklineVO.downloadDataLink}" title="csv ${i18n().file}">(.CSV ${i18n().file_capitalized})</a> ';
                     }
-                    
-                                                                                
+
+
                  </#if>
-         
+
                 $('#${sparklineContainerID} td.sparkline_text').html(sparksText);
 
-         
+
             }
-    
+
             /*
-             * This will activate the visualization. It takes care of creating 
-             * div elements to hold the actual sparkline image and then calling the 
-             * drawPubCountVisualization function. 
+             * This will activate the visualization. It takes care of creating
+             * div elements to hold the actual sparkline image and then calling the
+             * drawPubCountVisualization function.
              * */
 
             $(document).ready(function() {
-                var sparklineImgTD; 
-        
+                var sparklineImgTD;
+
             /*
              * This is a nuclear option (creating the container in which everything goes)
-             * the only reason this will be ever used is the API user never submitted a 
-             * container ID in which everything goes. The alternative was to let the 
-             * vis not appear in the calling page at all. So now at least vis appears but 
+             * the only reason this will be ever used is the API user never submitted a
+             * container ID in which everything goes. The alternative was to let the
+             * vis not appear in the calling page at all. So now at least vis appears but
              * appended at the bottom of the body.
              * */
-     
+
                 if ($('#${visContainerID}').length === 0) {
                     $('<div/>', {
                         'id': '${visContainerID}'
                     }).appendTo('body');
-                }       
-        
+                }
+
                 if ($('#${sparklineContainerID}').length === 0) {
-        
+
                     $('<div/>', {
                         'id': '${sparklineContainerID}',
                         'class': 'sparkline_style'
                     }).prependTo('#${visContainerID}');
-            
+
                     var table = $('<table>');
                     table.attr('class', 'sparkline_wrapper_table');
                     var row = $('<tr>');
@@ -253,7 +253,7 @@
                     sparklineImgTD.attr('id', '${sparklineContainerID}_img');
                     sparklineImgTD.attr('width', visualizationOptions.width);
                     sparklineImgTD.attr('class', 'sparkline_style');
-            
+
                     row.append(sparklineImgTD);
                     var row2 = $('<tr>');
                     var sparklineNumberTD = $('<td>');
@@ -261,7 +261,7 @@
                     sparklineNumberTD.css('text-align', 'left');
                     row2.append(sparklineNumberTD);
                     var row3 = $('<tr>');
-                    
+
                     var sparklineTextTD = $('<td>');
                     sparklineTextTD.attr('class', 'sparkline_text');
                     row3.append(sparklineTextTD);
@@ -269,25 +269,25 @@
                     table.append(row2);
                     table.append(row3);
                     table.prependTo('#${sparklineContainerID}');
-            
+
                 }
-            
+
                 drawPubCountVisualization(sparklineImgTD);
             });
         </script>
-         
+
             </div> <!-- Sparkline Viz -->
 
-            <#if sparklineVO.shortVisMode>  
+            <#if sparklineVO.shortVisMode>
 
-            <#-- Shifted the link to co-author to the individual-sparkline.ftl instead. --> 
+            <#-- Shifted the link to co-author to the individual-sparkline.ftl instead. -->
 
             <#else>
                 <!-- For Full Sparkline - Print the Table of Publication Counts per Year -->
 
                 <#if displayTable?? && displayTable>
 
-                    <p> 
+                    <p>
                         <#assign tableID = "publications_sparkline_data_table" />
                         <#assign tableCaption = "${i18n().publications_per_year} " />
                         <#assign tableActivityColumnName = "${i18n().publications_capitalized}" />
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl
index 9d63153bb0..818b89254c 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl
@@ -5,7 +5,7 @@
 
 <h2>${i18n().visualization_tools}</h2>
 
-<a href="${refreshCacheURL}">${i18n().refresh_cached_vis_models}</a> 
+<a href="${refreshCacheURL}">${i18n().refresh_cached_vis_models}</a>
 <section class="visualizationTools">
 <h3>${i18n().why_needed}</h3>
 <p>${i18n().vis_tools_note_one}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl
index 8160b4df3b..426fb2fb1b 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl
@@ -1,8 +1,8 @@
-<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-
-<div class="staticPageBackground">
-
-${error} 
-
-</div>
-
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<div class="staticPageBackground">
+
+${error}
+
+</div>
+
diff --git a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap-theme.min.css b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap-theme.min.css
index 5e39401957..7c1405dca5 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap-theme.min.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap-theme.min.css
@@ -3,4 +3,4 @@
  * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-danger.disabled,.btn-danger[disabled],.btn-default.disabled,.btn-default[disabled],.btn-info.disabled,.btn-info[disabled],.btn-primary.disabled,.btn-primary[disabled],.btn-success.disabled,.btn-success[disabled],.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-danger,fieldset[disabled] .btn-default,fieldset[disabled] .btn-info,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-success,fieldset[disabled] .btn-warning{-webkit-box-shadow:none;box-shadow:none}.btn-danger .badge,.btn-default .badge,.btn-info .badge,.btn-primary .badge,.btn-success .badge,.btn-warning .badge{text-shadow:none}.btn.active,.btn:active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:focus,.btn-default:hover{background-color:#e0e0e0;background-position:0 -15px}.btn-default.active,.btn-default:active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:focus,.btn-primary:hover{background-color:#265a88;background-position:0 -15px}.btn-primary.active,.btn-primary:active{background-color:#265a88;border-color:#245580}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:focus,.btn-success:hover{background-color:#419641;background-position:0 -15px}.btn-success.active,.btn-success:active{background-color:#419641;border-color:#3e8f3e}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:focus,.btn-info:hover{background-color:#2aabd2;background-position:0 -15px}.btn-info.active,.btn-info:active{background-color:#2aabd2;border-color:#28a4c9}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:focus,.btn-warning:hover{background-color:#eb9316;background-position:0 -15px}.btn-warning.active,.btn-warning:active{background-color:#eb9316;border-color:#e38d13}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:focus,.btn-danger:hover{background-color:#c12e2a;background-position:0 -15px}.btn-danger.active,.btn-danger:active{background-color:#c12e2a;border-color:#b92c28}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#c12e2a;background-image:none}.img-thumbnail,.thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:focus .badge,.list-group-item.active:hover .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)}
-/*# sourceMappingURL=bootstrap-theme.min.css.map */
\ No newline at end of file
+/*# sourceMappingURL=bootstrap-theme.min.css.map */
diff --git a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap.min.css b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap.min.css
index ed3905e0e0..82113bd8a0 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap.min.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/css/bootstrap.min.css
@@ -3,4 +3,4 @@
  * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
+/*# sourceMappingURL=bootstrap.min.css.map */
diff --git a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/bootstrap.min.js b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/bootstrap.min.js
index 9bcd2fccae..be9574d70b 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/bootstrap.min.js
+++ b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/bootstrap.min.js
@@ -4,4 +4,4 @@
  * Licensed under the MIT license
  */
 if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){if(a(b.target).is(this))return b.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.7",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a("#"===f?[]:f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.7",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c).prop(c,!0)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c).prop(c,!1))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target).closest(".btn");b.call(d,"toggle"),a(c.target).is('input[type="radio"], input[type="checkbox"]')||(c.preventDefault(),d.is("input,button")?d.trigger("focus"):d.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(a>this.$items.length-1||a<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.7",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.7",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){document===a.target||this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);if(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),!c.isInStateTrue())return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);if(this.$element.trigger(g),!g.isDefaultPrevented())return f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=window.SVGElement&&c instanceof window.SVGElement,g=d?{top:0,left:0}:f?null:b.offset(),h={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},i=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,h,i,g)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null,a.$element=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.7",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.7",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){
-this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e<c&&"top";if("bottom"==this.affixed)return null!=c?!(e+this.unpin<=f.top)&&"bottom":!(e+g<=a-d)&&"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&e<=c?"top":null!=d&&i+j>=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
+this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e<c&&"top";if("bottom"==this.affixed)return null!=c?!(e+this.unpin<=f.top)&&"bottom":!(e+g<=a-d)&&"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&e<=c?"top":null!=d&&i+j>=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
diff --git a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/npm.js b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/npm.js
index bf6aa80602..81f01216f1 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/npm.js
+++ b/webapp/src/main/webapp/themes/tenderfoot/bootstrap/js/npm.js
@@ -10,4 +10,4 @@ require('../../js/tooltip.js')
 require('../../js/popover.js')
 require('../../js/scrollspy.js')
 require('../../js/tab.js')
-require('../../js/affix.js')
\ No newline at end of file
+require('../../js/affix.js')
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/navbar-breakpoint.css b/webapp/src/main/webapp/themes/tenderfoot/css/navbar-breakpoint.css
index e2852e960e..90afcda072 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/navbar-breakpoint.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/navbar-breakpoint.css
@@ -33,4 +33,4 @@
     .collapse.in{
         display:block !important;
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css
index 995952523c..737b6331f3 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css
@@ -83,4 +83,4 @@ nav#alpha-browse-container {
 }
 #individuals-in-class {
     margin-right: 0px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
index 35d25f9412..001ebb6f79 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
@@ -152,4 +152,4 @@ section#preferredTitle h2 {
     float: left;
     font-size: 1em;
     color: #ccc;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/reset.css b/webapp/src/main/webapp/themes/tenderfoot/css/reset.css
index e1c29c4e8c..9476039ce9 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/reset.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/reset.css
@@ -1,113 +1,113 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* CSS Document 
-CSS reste by Eric Meyer:
-The goal of a reset stylesheet is to reduce browser inconsistencies in things like default line heights, margins and font sizes of headings, and so on...  http://meyerweb.com/eric/tools/css/reset/
-*/
-
-html,
-body,
-div,
-span,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-code,
-del,
-dfn,
-em,
-img,
-q,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-weight: inherit;
-    font-style: inherit;
-    font-size: 100%;
-    font-family: "Noto Sans", "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
-    vertical-align: baseline;
-    color: #595b5b;
-    font-weight: normal;
-}
-body {    
-    line-height: 1.5em;
-}
-ol,
-ul {
-    list-style: none;
-    font-weight: normal;
-}
-blockquote,
-q {    
-    quotes: none; 
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-    content: '';
-    content: none;
-}
-/* remember to highlight inserts somehow! */
-ins {    
-    text-decoration: none; 
-}
-del {    
-    text-decoration: line-through; 
-}
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-/* New ones added to the default list */
-a {    
-    text-decoration: none; 
-}
-fieldset {    
-    border-style: none; 
-}
-legend {    
-    display: none; 
-}
-.row {
-    font-size: 100%;
-}
-.navbar {
-    margin-bottom: 0px;
-    border: 0px solid transparent;
-}
-.navbar-collapse {
-    padding-left: 0px;
-    padding-right: 0px;
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+/* CSS Document
+CSS reste by Eric Meyer:
+The goal of a reset stylesheet is to reduce browser inconsistencies in things like default line heights, margins and font sizes of headings, and so on...  http://meyerweb.com/eric/tools/css/reset/
+*/
+
+html,
+body,
+div,
+span,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+code,
+del,
+dfn,
+em,
+img,
+q,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-weight: inherit;
+    font-style: inherit;
+    font-size: 100%;
+    font-family: "Noto Sans", "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
+    vertical-align: baseline;
+    color: #595b5b;
+    font-weight: normal;
+}
+body {
+    line-height: 1.5em;
+}
+ol,
+ul {
+    list-style: none;
+    font-weight: normal;
+}
+blockquote,
+q {
+    quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+    content: '';
+    content: none;
+}
+/* remember to highlight inserts somehow! */
+ins {
+    text-decoration: none;
+}
+del {
+    text-decoration: line-through;
+}
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+/* New ones added to the default list */
+a {
+    text-decoration: none;
+}
+fieldset {
+    border-style: none;
+}
+legend {
+    display: none;
+}
+.row {
+    font-size: 100%;
+}
+.navbar {
+    margin-bottom: 0px;
+    border: 0px solid transparent;
+}
+.navbar-collapse {
+    padding-left: 0px;
+    padding-right: 0px;
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/screen.css b/webapp/src/main/webapp/themes/tenderfoot/css/screen.css
index f34c48506f..0825d7c6a8 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/screen.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/screen.css
@@ -1,34 +1,34 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/****************************************
-****************************************
-  __  __   __  __  __    ___   
- /\ \/\ \\/\ \/\ \/\ \  / __`\ 
- \ \ \_/ |\ \ \ \ \_/ |/\ \L\ \
-  \ \___/  \ \_\ \___/ \ \____/
-   \/__/    \/_/\/__/   \/___/
- 
-               
-VIVO tenderfoot theme: screen styles
-
-*****************************************
-*****************************************/
-
-@charset "UTF-8";
-
-@import url("../bootstrap/css/bootstrap.min.css");
-@import url("../bootstrap/css/bootstrap-theme.min.css");
-@import url("reset.css");
-@import url("tenderfoot.css");
-@import url("edit.css");
-@import url("navbar-breakpoint.css");
-@import url("page-admin.css");
-@import url("page-browse.css");
-@import url("page-home.css");
-@import url("page-imageupload.css");
-@import url("page-index.css");
-@import url("page-individual.css");
-@import url("page-login.css");
-@import url("page-menu.css");
-@import url("https://fonts.googleapis.com/css?family=Noto+Sans");
-@import url("../../../local/css/local.css");
\ No newline at end of file
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+/****************************************
+****************************************
+  __  __   __  __  __    ___
+ /\ \/\ \\/\ \/\ \/\ \  / __`\
+ \ \ \_/ |\ \ \ \ \_/ |/\ \L\ \
+  \ \___/  \ \_\ \___/ \ \____/
+   \/__/    \/_/\/__/   \/___/
+
+
+VIVO tenderfoot theme: screen styles
+
+*****************************************
+*****************************************/
+
+@charset "UTF-8";
+
+@import url("../bootstrap/css/bootstrap.min.css");
+@import url("../bootstrap/css/bootstrap-theme.min.css");
+@import url("reset.css");
+@import url("tenderfoot.css");
+@import url("edit.css");
+@import url("navbar-breakpoint.css");
+@import url("page-admin.css");
+@import url("page-browse.css");
+@import url("page-home.css");
+@import url("page-imageupload.css");
+@import url("page-index.css");
+@import url("page-individual.css");
+@import url("page-login.css");
+@import url("page-menu.css");
+@import url("https://fonts.googleapis.com/css?family=Noto+Sans");
+@import url("../../../local/css/local.css");
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
index 7899b10a81..3bef13d6a0 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
@@ -1,364 +1,364 @@
-legend {
-    display: none;
-}
-
-.navbar {
-    z-index: 10;
-}
-
-#nav {
-    background: #f7f9f9;
-}
-
-#nav.affix {
-    position: fixed;
-    top: 0;
-    width: 100%;
-    z-index: 10;
-}
-/*
-    If you don't want navbar that anchors to the top of the screen, replace with
-
-    #nav.affix {
-        position: relative;
-    }
- */
-
-#nav .container {
-    padding-left: 0px;
-    padding-right: 0px;
-}
-
-.navbar-collapse.in #main-nav {
-    padding-left: 15px;
-}
-
-.navbar-toggle .button-label {
-    display: inline-block;
-    float: left;
-    font-weight: bold;
-    line-height: 14px;
-    padding-right: 10px;
-}
-.button-bars {
-    display: inline-block;
-    float: left;
-}
-
-p.navbar-text {
-    margin-left: 15px;
-}
-
-#nav-searchbox {
-    float: right;
-}
-
-button.navbar-toggle {
-    z-index: 999;
-}
-
-body {
-    padding: 0;
-    height: 100%; /* needed for container min-height */
-    font-family: "Noto Sans", "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
-    height: auto !important; /* real browsers */
-    height: 100%; /* IE6: treaded as min-height*/;
-    min-height: 100%; /* real browsers */
-    margin: 0 auto;
-    background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
-}
-
-#wrapper-content {
-    background: none repeat scroll 0 0 #fff;
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-
-#property-tabs {
-    /*
-    padding-left: 0px;
-    padding-right: 0px;
-    */
-}
-
-.row {
-    background: #ffffff;
-}
-
-.row.title {
-    background: #398AAC;
-    padding-top: 7px;
-    padding-bottom: 3px;
-}
-
-.row.title span {
-    color: #ffffff;
-}
-
-.row.title h1 {
-    margin-left: 10px;
-}
-
-.row-eq-height {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-}
-.photo-wrapper {
-    padding: 0 !important;
-    margin: 0 !important;
-    background: #f3f3f0;
-    vertical-align: top;
-}
-
-.photo-wrapper img {
-//    height: 100%;
-    width: 100%;
-    padding: 0 !important;
-    margin: 0 !important;
-    object-fit: contain;
-}
-
-.person-details {
-    background: #f3f3f0;
-    padding-bottom: 5px;
-}
-
-/* HEADER ------>  */
-#branding {
-    position: relative;
-//    width: 970px;
-    height: 114px;
-    margin: 0 auto;
-}
-#branding .row {
-    background-color:rgba(255, 255, 255, 0);
-}
-/* HEADER NAV------>  */
-ul#header-nav {
-    float: right;
-    list-style: none;
-    height: 30px;
-    padding-top: 10px;
-    margin-right: 13px;
-}
-ul#header-nav li {
-    float: left;
-    display: block;
-    padding-left: 10px;
-    padding-right: 10px;
-    border-right: 1px solid #7c7d7f;
-    font-size: .7em;
-    color: #fff;
-}
-ul#header-nav li:last-child {
-    padding-left: 1px;
-    padding-right: 0;
-    border-right: none;
-}
-ul#header-nav a {
-    color: #fff;
-}
-ul#header-nav a:hover,
-ul#header-nav a:active {
-    text-decoration: none;
-    color: #999;
-}
-ul#header-nav a.log-out {
-    padding-left: 10px;
-}
-/* SEARCH ------>  */
-#search {
-    width: 396px;
-    height: 38px;
-    right: 10px;
-    padding-top: 5px;
-}
-#search-field {
-    width: 396px;
-    height: 38px;
-    background: url(../images/search-interior-pages.png) 0 0 no-repeat;
-}
-#search-field input.search {
-    text-decoration: none;
-    background-color: transparent;
-    color: #fff;
-    font-size: 14px;
-    border: none;
-    padding-left: 25px;
-    padding-top: 8px;
-    cursor: pointer;
-}
-input.search-vivo {
-    float: left;
-    width: 290px;
-    height: 25px;
-    border: 0;
-    font-size: 16px;
-    color: #5e6363;
-    margin-left: 10px;
-    margin-top: 5px;
-    padding: 0;
-}
-#search-form-modifier {
-    display: none;
-}
-/* FOOTER------>  */
-footer {
-    height: 88px;
-    margin: 0 auto;
-    font-size: .7em;
-    color: white;
-    background-color: black;
-}
-footer .row {
-    background-color: black;
-}
-footer p.copyright {
-    float: left;
-    padding-top: 55px;
-    color: white;
-}
-footer p.copyright small {
-    font-size: 1em;
-}
-ul#footer-nav {
-    float: right;
-    list-style: none;
-    height: 20px;
-    margin: 0;
-    padding: 0;
-    padding-top: 55px;
-}
-ul#footer-nav li {
-    float: left;
-    display: block;
-    padding-left: 10px;
-    padding-right: 10px;
-    border-right: 1px solid #c9c8c8;
-}
-ul#footer-nav li:last-child,
-ul#header-nav li.last,
-ul#individual-hasResearchArea li:last-child,
-ul#individual-facultyMemberships li:last-child {
-    border-right: none;
-}
-#footer-nav a {
-    color: white;
-}
-#footer-nav a:hover,
-a.terms,
-a.powered-by-vivo {
-    color: white;
-    text-decoration: none;
-}
-#footer-nav  a.terms:hover,
-a.powered-by-vivo:hover {
-    color: white;
-    text-decoration: none;
-}
-#footer-nav p {
-    margin-bottom: 1.3em;
-}
-/* BRANDING ------>  */
-h1.vivo-logo {
-    position: absolute;
-    width: 100%;
-    max-width: 442px;
-    height: 59px;
-    top: 30px;
-    left: 0;
-    background: url(../images/VIVO-logo.png) 0 0 no-repeat;
-    background-size: 100% auto;
-}
-h1.vivo-logo a {
-    display: block;
-    width: 100%;
-    height: 59px;
-}
-.displace {
-    left: -9999px;
-    position: absolute;
-}
-h2 {
-    padding: 5px 0 3px 0;
-    margin: 0;
-    font-size: 1.375em;
-    color: #064d68;
-    line-height: 1.5em;
-}
-h2 a {
-    color: #2485ae;
-}
-h2 a:link,
-h2 a:visited {
-    text-decoration: underline;
-}
-h3 {
-    padding: 5px 0 6px 0;
-    margin: 0;
-    font-size: 1.125em;
-    color: #064d68;
-}
-h4 {
-    padding: 5px 0 6px 0;
-    margin: 0;
-    font-size: 1em;
-    color: #064d68;
-}
-h5 {
-    padding: 5px 0 6px 0;
-    margin: 0;
-    font-size: .875em;
-    color: #064d68;
-}
-label {
-    display: block;
-}
-#developerPanel h1 {
-    line-height: 1.5em;
-}
-#developerPanel .container {
-    width: auto;
-}
-
-table.classHierarchy {
-    min-width: auto;
-    max-width: none;
-    display: block;
-    margin-right: 0px;
-}
-
-section#container div {
-    width: auto;
-}
-
-#flash-message {
-    border: 1px dotted #E2C822;
-    background-color: #FFF9D7;
-    padding: .5em;
-    margin-bottom: 10px;
-}
-#welcome-message {
-    border: 1px dotted #E2C822;
-    background-color: #FFF9D7;
-    padding: .25em;
-    margin-bottom: 8px;
-}
-#flash-msg-container,
-#welcome-msg-container {
-    width: 600px;
-    height:34px;
-    position: absolute;
-    z-index: 99;
-    margin-left: auto;
-    margin-right: auto;
-    left: 0;
-    right: 0;
-    top: 0;
-}
-img.add-individual {
-    height: 15px;
-    width: 15px;
-}
+legend {
+    display: none;
+}
+
+.navbar {
+    z-index: 10;
+}
+
+#nav {
+    background: #f7f9f9;
+}
+
+#nav.affix {
+    position: fixed;
+    top: 0;
+    width: 100%;
+    z-index: 10;
+}
+/*
+    If you don't want navbar that anchors to the top of the screen, replace with
+
+    #nav.affix {
+        position: relative;
+    }
+ */
+
+#nav .container {
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+.navbar-collapse.in #main-nav {
+    padding-left: 15px;
+}
+
+.navbar-toggle .button-label {
+    display: inline-block;
+    float: left;
+    font-weight: bold;
+    line-height: 14px;
+    padding-right: 10px;
+}
+.button-bars {
+    display: inline-block;
+    float: left;
+}
+
+p.navbar-text {
+    margin-left: 15px;
+}
+
+#nav-searchbox {
+    float: right;
+}
+
+button.navbar-toggle {
+    z-index: 999;
+}
+
+body {
+    padding: 0;
+    height: 100%; /* needed for container min-height */
+    font-family: "Noto Sans", "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
+    height: auto !important; /* real browsers */
+    height: 100%; /* IE6: treaded as min-height*/;
+    min-height: 100%; /* real browsers */
+    margin: 0 auto;
+    background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
+}
+
+#wrapper-content {
+    background: none repeat scroll 0 0 #fff;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+
+#property-tabs {
+    /*
+    padding-left: 0px;
+    padding-right: 0px;
+    */
+}
+
+.row {
+    background: #ffffff;
+}
+
+.row.title {
+    background: #398AAC;
+    padding-top: 7px;
+    padding-bottom: 3px;
+}
+
+.row.title span {
+    color: #ffffff;
+}
+
+.row.title h1 {
+    margin-left: 10px;
+}
+
+.row-eq-height {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+}
+.photo-wrapper {
+    padding: 0 !important;
+    margin: 0 !important;
+    background: #f3f3f0;
+    vertical-align: top;
+}
+
+.photo-wrapper img {
+//    height: 100%;
+    width: 100%;
+    padding: 0 !important;
+    margin: 0 !important;
+    object-fit: contain;
+}
+
+.person-details {
+    background: #f3f3f0;
+    padding-bottom: 5px;
+}
+
+/* HEADER ------>  */
+#branding {
+    position: relative;
+//    width: 970px;
+    height: 114px;
+    margin: 0 auto;
+}
+#branding .row {
+    background-color:rgba(255, 255, 255, 0);
+}
+/* HEADER NAV------>  */
+ul#header-nav {
+    float: right;
+    list-style: none;
+    height: 30px;
+    padding-top: 10px;
+    margin-right: 13px;
+}
+ul#header-nav li {
+    float: left;
+    display: block;
+    padding-left: 10px;
+    padding-right: 10px;
+    border-right: 1px solid #7c7d7f;
+    font-size: .7em;
+    color: #fff;
+}
+ul#header-nav li:last-child {
+    padding-left: 1px;
+    padding-right: 0;
+    border-right: none;
+}
+ul#header-nav a {
+    color: #fff;
+}
+ul#header-nav a:hover,
+ul#header-nav a:active {
+    text-decoration: none;
+    color: #999;
+}
+ul#header-nav a.log-out {
+    padding-left: 10px;
+}
+/* SEARCH ------>  */
+#search {
+    width: 396px;
+    height: 38px;
+    right: 10px;
+    padding-top: 5px;
+}
+#search-field {
+    width: 396px;
+    height: 38px;
+    background: url(../images/search-interior-pages.png) 0 0 no-repeat;
+}
+#search-field input.search {
+    text-decoration: none;
+    background-color: transparent;
+    color: #fff;
+    font-size: 14px;
+    border: none;
+    padding-left: 25px;
+    padding-top: 8px;
+    cursor: pointer;
+}
+input.search-vivo {
+    float: left;
+    width: 290px;
+    height: 25px;
+    border: 0;
+    font-size: 16px;
+    color: #5e6363;
+    margin-left: 10px;
+    margin-top: 5px;
+    padding: 0;
+}
+#search-form-modifier {
+    display: none;
+}
+/* FOOTER------>  */
+footer {
+    height: 88px;
+    margin: 0 auto;
+    font-size: .7em;
+    color: white;
+    background-color: black;
+}
+footer .row {
+    background-color: black;
+}
+footer p.copyright {
+    float: left;
+    padding-top: 55px;
+    color: white;
+}
+footer p.copyright small {
+    font-size: 1em;
+}
+ul#footer-nav {
+    float: right;
+    list-style: none;
+    height: 20px;
+    margin: 0;
+    padding: 0;
+    padding-top: 55px;
+}
+ul#footer-nav li {
+    float: left;
+    display: block;
+    padding-left: 10px;
+    padding-right: 10px;
+    border-right: 1px solid #c9c8c8;
+}
+ul#footer-nav li:last-child,
+ul#header-nav li.last,
+ul#individual-hasResearchArea li:last-child,
+ul#individual-facultyMemberships li:last-child {
+    border-right: none;
+}
+#footer-nav a {
+    color: white;
+}
+#footer-nav a:hover,
+a.terms,
+a.powered-by-vivo {
+    color: white;
+    text-decoration: none;
+}
+#footer-nav  a.terms:hover,
+a.powered-by-vivo:hover {
+    color: white;
+    text-decoration: none;
+}
+#footer-nav p {
+    margin-bottom: 1.3em;
+}
+/* BRANDING ------>  */
+h1.vivo-logo {
+    position: absolute;
+    width: 100%;
+    max-width: 442px;
+    height: 59px;
+    top: 30px;
+    left: 0;
+    background: url(../images/VIVO-logo.png) 0 0 no-repeat;
+    background-size: 100% auto;
+}
+h1.vivo-logo a {
+    display: block;
+    width: 100%;
+    height: 59px;
+}
+.displace {
+    left: -9999px;
+    position: absolute;
+}
+h2 {
+    padding: 5px 0 3px 0;
+    margin: 0;
+    font-size: 1.375em;
+    color: #064d68;
+    line-height: 1.5em;
+}
+h2 a {
+    color: #2485ae;
+}
+h2 a:link,
+h2 a:visited {
+    text-decoration: underline;
+}
+h3 {
+    padding: 5px 0 6px 0;
+    margin: 0;
+    font-size: 1.125em;
+    color: #064d68;
+}
+h4 {
+    padding: 5px 0 6px 0;
+    margin: 0;
+    font-size: 1em;
+    color: #064d68;
+}
+h5 {
+    padding: 5px 0 6px 0;
+    margin: 0;
+    font-size: .875em;
+    color: #064d68;
+}
+label {
+    display: block;
+}
+#developerPanel h1 {
+    line-height: 1.5em;
+}
+#developerPanel .container {
+    width: auto;
+}
+
+table.classHierarchy {
+    min-width: auto;
+    max-width: none;
+    display: block;
+    margin-right: 0px;
+}
+
+section#container div {
+    width: auto;
+}
+
+#flash-message {
+    border: 1px dotted #E2C822;
+    background-color: #FFF9D7;
+    padding: .5em;
+    margin-bottom: 10px;
+}
+#welcome-message {
+    border: 1px dotted #E2C822;
+    background-color: #FFF9D7;
+    padding: .25em;
+    margin-bottom: 8px;
+}
+#flash-msg-container,
+#welcome-msg-container {
+    width: 600px;
+    height:34px;
+    position: absolute;
+    z-index: 99;
+    margin-left: auto;
+    margin-right: auto;
+    left: 0;
+    right: 0;
+    top: 0;
+}
+img.add-individual {
+    height: 15px;
+    width: 15px;
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/i18n/all.properties b/webapp/src/main/webapp/themes/tenderfoot/i18n/all.properties
index 46c710f0eb..228903249d 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/i18n/all.properties
+++ b/webapp/src/main/webapp/themes/tenderfoot/i18n/all.properties
@@ -24,7 +24,7 @@ identity_myprofile = My profile
 unable_to_handle_grant_editing = This form is unable to handle the editing of this grant because it is associated with multiple grant individuals.
 unable_to_handle_position_editing = This form is unable to handle the editing of this position because it is associated with multiple Position individuals.
 address_label = address label
-no_grants_for = Currently there are no grants for 
+no_grants_for = Currently there are no grants for
 no_faculty_found = No faculty members found.
 create_capitalized = Create
 first_publication = First publication
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
index e7ef37d8fc..8bc5262a66 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
@@ -1,189 +1,189 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- 
-    Individual profile page template for foaf:Person individuals. This is the default template for foaf persons
-    in the Wilma theme and should reside in the themes/wilma/templates directory. 
--->
-
-<#include "individual-setup.ftl">
-<#import "lib-vivo-properties.ftl" as vp>
-<#--Number of labels present-->
-<#if !labelCount??>
-	<#assign labelCount = 0 >
-</#if>
-<#--Number of available locales-->
-<#if !localesCount??>
-	<#assign localesCount = 1>
-</#if>
-<#--Number of distinct languages represented, with no language tag counting as a language, across labels-->
-<#if !languageCount??>
-	<#assign languageCount = 1>
-</#if>
-<#assign visRequestingTemplate = "foaf-person-tenderfoot">
-
-<#--add the VIVO-ORCID interface -->
-<#include "individual-orcidInterface.ftl">
-
-<section id="individual-admin">
-	<div class="row">
-		<div class="col-md-12">
-			<#include "individual-adminPanel.ftl">
-		</div>
-	</div>
-</section>
-
-<section id="individual-intro" class="vcard person" role="region"><span itemscope itemtype="http://schema.org/Person">
-	<div class="row row-eq-height">
-		<div class="col-md-2 photo-wrapper">
-			<!-- Image -->
-		<#assign individualImage>
-			<@p.image individual=individual
-			propertyGroups=propertyGroups
-			namespaces=namespaces
-			editable=editable
-			showPlaceholder="always" />
-		</#assign>
-		<#if ( individualImage?contains('<img class="individual-photo"') )>
-			<#assign infoClass = 'class="withThumb"'/>
-		</#if>
-
-            <!-- div id="photo-wrapper">${individualImage}</div -->
-		${individualImage}
-		</div>
-		<div class="col-xs-10 person-details">
-			<div class="row title">
-				<div class="col-md-12">
-					<span id="iconControlsRightSide">
-						<img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}"/>
-						<#if checkNamesResult?has_content >
-							<img id="qrIcon"  src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
-								<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
-									<a class="qrCloseLink" href="#"  title="${i18n().qr_code}">${i18n().close_capitalized}</a>
-								</span>
-						</#if>
-					</span>
-					<section class="vcard person">
-						<h1 class="foaf-person">
-							<#-- Label -->
-								<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
-						</h1>
-						<section id="preferredTitle">
-							<#--  Display preferredTitle if it exists; otherwise mostSpecificTypes -->
-							<#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
-							<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-								<#if (title.statements?size < 1) >
-									<@p.addLinkWithLabel title editable />
-								<#elseif editable>
-									<h2>${title.name?capitalize!}</h2>
-									<@p.verboseDisplay title />
-								</#if>
-								<#list title.statements as statement>
-									<span itemprop="jobTitle" class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
-									<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
-								</#list>
-							</#if>
-							<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
-							<#if ! (title.statements)?has_content>
-								<@p.mostSpecificTypes individual />
-							</#if>
-						</section>
-					</section>
-				</div>
-			</div>
-			<div class="row person-details">
-				<div class="col-md-12">
-					<!-- Positions -->
-					<#include "individual-positions.ftl">
-					<!-- Research Areas -->
-					<#include "individual-researchAreas.ftl">
-				</div>
-			</div>
-		</div>
-	</div>
-</span></section>
-
-<section itemscope itemtype="http://schema.org/Person" id="individual-intro" class="vcard person" role="region">
-    <section id="individual-info" ${infoClass!} role="region">
-        <!-- Overview -->
-        <!-- #include "individual-overview.ftl" -->
-
-        <!-- Geographic Focus -->
-        <!-- #include "individual-geographicFocus.ftl" -->
-    </section>
-</section>
-
-<#assign nameForOtherGroup = "${i18n().other}">
-
-<#-- Ontology properties -->
-<#if !editable>
-<#-- We don't want to see the first name and last name unless we might edit them. -->
-	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
-	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
-</#if>
-
-<div class="row">
-	<div id="property-tabs" class="col-md-8">
-		<#include "individual-property-group-tabs.ftl">
-	</div>
-	<div class="col-md-4">
-		<#include "individual-visualizationFoafPerson.ftl">
-
-		<!-- Contact Info -->
-		<#include "individual-contactInfo.ftl">
-
-		<!-- Websites -->
-		<#include "individual-webpage.ftl">
-	</div>
-</div>
-
-<#assign rdfUrl = individual.rdfUrl>
-
-<#if rdfUrl??>
-<script>
-    var individualRdfUrl = '${rdfUrl}';
-</script>
-</#if>
-<script>
-    var imagesPath = '${urls.images}';
-    var individualUri = '${individual.uri!}';
-    var individualPhoto = '${individual.thumbNail!}';
-    var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
-    var baseUrl = '${urls.base}';
-    var i18nStrings = {
-        displayLess: '${i18n().display_less}',
-        displayMoreEllipsis: '${i18n().display_more_ellipsis}',
-        showMoreContent: '${i18n().show_more_content}',
-        verboseTurnOff: '${i18n().verbose_turn_off}',
-        researchAreaTooltipOne: '${i18n().research_area_tooltip_one}',
-        researchAreaTooltipTwo: '${i18n().research_area_tooltip_two}'
-    };
-    var i18nStringsUriRdf = {
-        shareProfileUri: '${i18n().share_profile_uri}',
-        viewRDFProfile: '${i18n().view_profile_in_rdf}',
-        closeString: '${i18n().close}'
-    };
-</script>
-
-${stylesheets.add(
-	'<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
-	'<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
-	'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
-	'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />'
-)}
-
-${headScripts.add(
-	'<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
-	'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',
-	'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>'
-)}
-
-${scripts.add(
-	'<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
-	'<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
-	'<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
-	'<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
-    '<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
-	'<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
-	'<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
-	'<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>'
-)}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#--
+    Individual profile page template for foaf:Person individuals. This is the default template for foaf persons
+    in the Wilma theme and should reside in the themes/wilma/templates directory.
+-->
+
+<#include "individual-setup.ftl">
+<#import "lib-vivo-properties.ftl" as vp>
+<#--Number of labels present-->
+<#if !labelCount??>
+	<#assign labelCount = 0 >
+</#if>
+<#--Number of available locales-->
+<#if !localesCount??>
+	<#assign localesCount = 1>
+</#if>
+<#--Number of distinct languages represented, with no language tag counting as a language, across labels-->
+<#if !languageCount??>
+	<#assign languageCount = 1>
+</#if>
+<#assign visRequestingTemplate = "foaf-person-tenderfoot">
+
+<#--add the VIVO-ORCID interface -->
+<#include "individual-orcidInterface.ftl">
+
+<section id="individual-admin">
+	<div class="row">
+		<div class="col-md-12">
+			<#include "individual-adminPanel.ftl">
+		</div>
+	</div>
+</section>
+
+<section id="individual-intro" class="vcard person" role="region"><span itemscope itemtype="http://schema.org/Person">
+	<div class="row row-eq-height">
+		<div class="col-md-2 photo-wrapper">
+			<!-- Image -->
+		<#assign individualImage>
+			<@p.image individual=individual
+			propertyGroups=propertyGroups
+			namespaces=namespaces
+			editable=editable
+			showPlaceholder="always" />
+		</#assign>
+		<#if ( individualImage?contains('<img class="individual-photo"') )>
+			<#assign infoClass = 'class="withThumb"'/>
+		</#if>
+
+            <!-- div id="photo-wrapper">${individualImage}</div -->
+		${individualImage}
+		</div>
+		<div class="col-xs-10 person-details">
+			<div class="row title">
+				<div class="col-md-12">
+					<span id="iconControlsRightSide">
+						<img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}"/>
+						<#if checkNamesResult?has_content >
+							<img id="qrIcon"  src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
+								<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
+									<a class="qrCloseLink" href="#"  title="${i18n().qr_code}">${i18n().close_capitalized}</a>
+								</span>
+						</#if>
+					</span>
+					<section class="vcard person">
+						<h1 class="foaf-person">
+							<#-- Label -->
+								<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
+						</h1>
+						<section id="preferredTitle">
+							<#--  Display preferredTitle if it exists; otherwise mostSpecificTypes -->
+							<#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
+							<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
+								<#if (title.statements?size < 1) >
+									<@p.addLinkWithLabel title editable />
+								<#elseif editable>
+									<h2>${title.name?capitalize!}</h2>
+									<@p.verboseDisplay title />
+								</#if>
+								<#list title.statements as statement>
+									<span itemprop="jobTitle" class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
+									<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
+								</#list>
+							</#if>
+							<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
+							<#if ! (title.statements)?has_content>
+								<@p.mostSpecificTypes individual />
+							</#if>
+						</section>
+					</section>
+				</div>
+			</div>
+			<div class="row person-details">
+				<div class="col-md-12">
+					<!-- Positions -->
+					<#include "individual-positions.ftl">
+					<!-- Research Areas -->
+					<#include "individual-researchAreas.ftl">
+				</div>
+			</div>
+		</div>
+	</div>
+</span></section>
+
+<section itemscope itemtype="http://schema.org/Person" id="individual-intro" class="vcard person" role="region">
+    <section id="individual-info" ${infoClass!} role="region">
+        <!-- Overview -->
+        <!-- #include "individual-overview.ftl" -->
+
+        <!-- Geographic Focus -->
+        <!-- #include "individual-geographicFocus.ftl" -->
+    </section>
+</section>
+
+<#assign nameForOtherGroup = "${i18n().other}">
+
+<#-- Ontology properties -->
+<#if !editable>
+<#-- We don't want to see the first name and last name unless we might edit them. -->
+	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
+	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
+</#if>
+
+<div class="row">
+	<div id="property-tabs" class="col-md-8">
+		<#include "individual-property-group-tabs.ftl">
+	</div>
+	<div class="col-md-4">
+		<#include "individual-visualizationFoafPerson.ftl">
+
+		<!-- Contact Info -->
+		<#include "individual-contactInfo.ftl">
+
+		<!-- Websites -->
+		<#include "individual-webpage.ftl">
+	</div>
+</div>
+
+<#assign rdfUrl = individual.rdfUrl>
+
+<#if rdfUrl??>
+<script>
+    var individualRdfUrl = '${rdfUrl}';
+</script>
+</#if>
+<script>
+    var imagesPath = '${urls.images}';
+    var individualUri = '${individual.uri!}';
+    var individualPhoto = '${individual.thumbNail!}';
+    var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
+    var baseUrl = '${urls.base}';
+    var i18nStrings = {
+        displayLess: '${i18n().display_less}',
+        displayMoreEllipsis: '${i18n().display_more_ellipsis}',
+        showMoreContent: '${i18n().show_more_content}',
+        verboseTurnOff: '${i18n().verbose_turn_off}',
+        researchAreaTooltipOne: '${i18n().research_area_tooltip_one}',
+        researchAreaTooltipTwo: '${i18n().research_area_tooltip_two}'
+    };
+    var i18nStringsUriRdf = {
+        shareProfileUri: '${i18n().share_profile_uri}',
+        viewRDFProfile: '${i18n().view_profile_in_rdf}',
+        closeString: '${i18n().close}'
+    };
+</script>
+
+${stylesheets.add(
+	'<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
+	'<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
+	'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
+	'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />'
+)}
+
+${headScripts.add(
+	'<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
+	'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',
+	'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>'
+)}
+
+${scripts.add(
+	'<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
+    '<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
+	'<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
+	'<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>'
+)}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl
index e79054cafb..ee579ae7dc 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl
@@ -1,33 +1,33 @@
-
-    <section id="share-contact" role="region"> 
-        <!-- Image -->           
-        <#assign individualImage>
-            <@p.image individual=individual 
-                      propertyGroups=propertyGroups 
-                      namespaces=namespaces 
-                      editable=editable 
-                      showPlaceholder="always" />
-        </#assign>
-
-        <#if ( individualImage?contains('<img class="individual-photo"') )>
-            <#assign infoClass = 'class="withThumb"'/>
-        </#if>
-
-        <div id="photo-wrapper">${individualImage}</div>
-        <!-- Contact Info -->
-        <div id="individual-tools-people">
-            <span id="iconControlsLeftSide">
-                <img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}"/>
-  				<#if checkNamesResult?has_content >
-					<img id="qrIcon"  src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
-                	<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!} 
-						<a class="qrCloseLink" href="#"  title="${i18n().qr_code}">${i18n().close_capitalized}</a>
-					</span>
-				</#if>
-            </span>
-        </div>
-        <#include "individual-contactInfo.ftl">  
-                
-        <!-- Websites -->
-        <#include "individual-webpage.ftl">
-    </section>
+
+    <section id="share-contact" role="region">
+        <!-- Image -->
+        <#assign individualImage>
+            <@p.image individual=individual
+                      propertyGroups=propertyGroups
+                      namespaces=namespaces
+                      editable=editable
+                      showPlaceholder="always" />
+        </#assign>
+
+        <#if ( individualImage?contains('<img class="individual-photo"') )>
+            <#assign infoClass = 'class="withThumb"'/>
+        </#if>
+
+        <div id="photo-wrapper">${individualImage}</div>
+        <!-- Contact Info -->
+        <div id="individual-tools-people">
+            <span id="iconControlsLeftSide">
+                <img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}"/>
+  				<#if checkNamesResult?has_content >
+					<img id="qrIcon"  src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
+                	<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
+						<a class="qrCloseLink" href="#"  title="${i18n().qr_code}">${i18n().close_capitalized}</a>
+					</span>
+				</#if>
+            </span>
+        </div>
+        <#include "individual-contactInfo.ftl">
+
+        <!-- Websites -->
+        <#include "individual-webpage.ftl">
+    </section>
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl
index 1caad5ae20..42bd976e31 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl
@@ -8,7 +8,7 @@
     <@p.verboseDisplay positions />
     <ul id="individual-personInPosition" role="list">
         <@positionsList positions editable />
-    </ul> 
+    </ul>
 </#if>
 
 <#macro positionsList property editable statements=property.statements template=property.template>
@@ -64,4 +64,4 @@
         $(this).siblings('li.toggleable').slideToggle();
 
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl
index 887db2ee50..6b78fb3d9f 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl
@@ -9,14 +9,14 @@
 <#assign obo_RO53 = "http://purl.obolibrary.org/obo/RO_0000053">
 
 <#assign isInvestigator = ( p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}InvestigatorRole") ||
-                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") || 
+                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") ||
                             p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}CoPrincipalInvestigatorRole") ) >
 
 <#if (isAuthor || isInvestigator)>
- 
+
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/visualization/visualization.css" />')}
     <#assign standardVisualizationURLRoot ="/visualization">
-        
+
         <#if isAuthor>
             ${scripts.add('<script type="text/javascript" src="${urls.base}/js/d3.min.js"></script>')}
 
@@ -24,7 +24,7 @@
             <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/scimap_icon.png">
             <#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
             <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()>
-            
+
             <span id="publicationsHeading">${i18n().publications_in_vivo}</span>
 
             <svg width="100%" id="publicationsChart" onload="renderPublicationsChart()" onresize="renderPublicationsChart()">
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
index 5b8e920bb0..9f5ea59043 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
@@ -1,149 +1,149 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$  -->
-
-<@widget name="login" include="assets" />
-
-<#-- 
-        With release 1.6, the home page no longer uses the "browse by" class group/classes display. 
-        If you prefer to use the "browse by" display, replace the import statement below with the
-        following include statement:
-        
-            <#include "browse-classgroups.ftl">
-            
-        Also ensure that the homePage.geoFocusMaps flag in the runtime.properties file is commented
-        out.
--->
-<#import "lib-home-page.ftl" as lh>
-
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <#include "head.ftl">
-        <#if geoFocusMapsEnabled >
-            <#include "geoFocusMapScripts.ftl">
-        </#if>
-        <script async type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
-    </head>
-    
-    <body class="${bodyClasses!}" onload="${bodyOnload!}">
-        <#-- supplies the faculty count to the js function that generates a random row number for the search query -->
-        <@lh.facultyMemberCount  vClassGroups! />
-		<header id="branding" role="banner">
-			<#include "identity.ftl">
-		</header>
-        <#include "developer.ftl">
-        <#include "menu.ftl">
-        <#include "message.ftl">
-        <div class="row hero">
-            <div class="theme-showcase">
-                <div class="col-md-12">
-                    <div class="container" role="main">
-                        <div class="jumbotron">
-                            <h1>${i18n().intro_title}</h1>
-                        </div>
-                        <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" class="form-horizontal">
-                            <fieldset>
-                                <div class="form-group pull-left" style="margin-right: 5px;">
-                                    <select class="form-control" id="classgroup" name="classgroup">
-                                        <option value="">${i18n().all_capitalized}</option>
-                                        <#list vClassGroups as group>
-                                            <#if (group.individualCount > 0)>
-                                                <option value="${group.uri}">${group.displayName?capitalize}</option>
-                                            </#if>
-                                        </#list>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <div class="input-group">
-                                        <input type="text" name="querytext" class="form-control" value="" placeholder="${i18n().search_form}" autocapitalize="off" />
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-default" type="submit">
-                                                <span class="icon-search">${i18n().search_button}</span>
-                                            </button>
-                                        </span>
-                                    </div>
-                                </div>
-                            </fieldset>
-                        </form>
-                    </div>
-                </div>
-                <div class="col-md-12">
-                    <div class="container">
-                        <div class="jumbotron">
-                            <p>${i18n().intro_para1}</p>
-                            <p>${i18n().intro_para2}</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="row faculty-home">
-            <div class="container">
-                <div class="col-md-4">
-                    <!-- List of research classes: e.g., articles, books, collections, conference papers -->
-                    <@lh.researchClasses />
-                </div>
-                <div class="col-md-4">
-                    <!-- List of four randomly selected faculty members -->
-                    <@lh.facultyMbrHtml />
-                </div>
-                <div class="col-md-4">
-                    <!-- List of randomly selected academic departments -->
-                    <@lh.academicDeptsHtml />
-                </div>
-            </div>
-        </div>
-
-        <#if geoFocusMapsEnabled >
-            <div class="row geo-focus">
-                <div class="container">
-                    <div class="col-md-12">
-                        <!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties -->
-                        <@lh.geographicFocusHtml />
-                    </div>
-                </div>
-            </div>
-        </#if>
-
-        <!-- List of research classes: e.g., articles, books, collections, conference papers -->
-        <div class="row research-count">
-            <div class="container">
-                <!-- div class="col-md-6">
-                </div -->
-                <div class="col-md-12">
-                    <!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
-                    <@lh.allClassGroups vClassGroups! />
-                </div>
-            </div>
-        </div>
-
-        <#include "footer.ftl">
-        <#-- builds a json object that is used by js to render the academic departments section -->
-        <@lh.listAcademicDepartments />
-    <script>       
-        var i18nStrings = {
-            researcherString: '${i18n().researcher}',
-            researchersString: '${i18n().researchers}',
-            currentlyNoResearchers: '${i18n().currently_no_researchers}',
-            countriesAndRegions: '${i18n().countries_and_regions}',
-            countriesString: '${i18n().countries}',
-            regionsString: '${i18n().regions}',
-            statesString: '${i18n().map_states_string}',
-            stateString: '${i18n().map_state_string}',
-            statewideLocations: '${i18n().statewide_locations}',
-            researchersInString: '${i18n().researchers_in}',
-            inString: '${i18n().in}',
-            noFacultyFound: '${i18n().no_faculty_found}',
-            placeholderImage: '${i18n().placeholder_image}',
-            viewAllFaculty: '${i18n().view_all_faculty}',
-            viewAllString: '${i18n().view_all}',
-            viewAllDepartments: '${i18n().view_all_departments}',
-            noDepartmentsFound: '${i18n().no_departments_found}'
-        };
-        // set the 'limmit search' text and alignment
-        if  ( $('input.search-homepage').css('text-align') == "right" ) {       
-             $('input.search-homepage').attr("value","${i18n().limit_search} \u2192");
-        }  
-    </script>
-    </body>
-</html>
\ No newline at end of file
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$  -->
+
+<@widget name="login" include="assets" />
+
+<#--
+        With release 1.6, the home page no longer uses the "browse by" class group/classes display.
+        If you prefer to use the "browse by" display, replace the import statement below with the
+        following include statement:
+
+            <#include "browse-classgroups.ftl">
+
+        Also ensure that the homePage.geoFocusMaps flag in the runtime.properties file is commented
+        out.
+-->
+<#import "lib-home-page.ftl" as lh>
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <#include "head.ftl">
+        <#if geoFocusMapsEnabled >
+            <#include "geoFocusMapScripts.ftl">
+        </#if>
+        <script async type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
+    </head>
+
+    <body class="${bodyClasses!}" onload="${bodyOnload!}">
+        <#-- supplies the faculty count to the js function that generates a random row number for the search query -->
+        <@lh.facultyMemberCount  vClassGroups! />
+		<header id="branding" role="banner">
+			<#include "identity.ftl">
+		</header>
+        <#include "developer.ftl">
+        <#include "menu.ftl">
+        <#include "message.ftl">
+        <div class="row hero">
+            <div class="theme-showcase">
+                <div class="col-md-12">
+                    <div class="container" role="main">
+                        <div class="jumbotron">
+                            <h1>${i18n().intro_title}</h1>
+                        </div>
+                        <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" class="form-horizontal">
+                            <fieldset>
+                                <div class="form-group pull-left" style="margin-right: 5px;">
+                                    <select class="form-control" id="classgroup" name="classgroup">
+                                        <option value="">${i18n().all_capitalized}</option>
+                                        <#list vClassGroups as group>
+                                            <#if (group.individualCount > 0)>
+                                                <option value="${group.uri}">${group.displayName?capitalize}</option>
+                                            </#if>
+                                        </#list>
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <div class="input-group">
+                                        <input type="text" name="querytext" class="form-control" value="" placeholder="${i18n().search_form}" autocapitalize="off" />
+                                        <span class="input-group-btn">
+                                            <button class="btn btn-default" type="submit">
+                                                <span class="icon-search">${i18n().search_button}</span>
+                                            </button>
+                                        </span>
+                                    </div>
+                                </div>
+                            </fieldset>
+                        </form>
+                    </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="container">
+                        <div class="jumbotron">
+                            <p>${i18n().intro_para1}</p>
+                            <p>${i18n().intro_para2}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row faculty-home">
+            <div class="container">
+                <div class="col-md-4">
+                    <!-- List of research classes: e.g., articles, books, collections, conference papers -->
+                    <@lh.researchClasses />
+                </div>
+                <div class="col-md-4">
+                    <!-- List of four randomly selected faculty members -->
+                    <@lh.facultyMbrHtml />
+                </div>
+                <div class="col-md-4">
+                    <!-- List of randomly selected academic departments -->
+                    <@lh.academicDeptsHtml />
+                </div>
+            </div>
+        </div>
+
+        <#if geoFocusMapsEnabled >
+            <div class="row geo-focus">
+                <div class="container">
+                    <div class="col-md-12">
+                        <!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties -->
+                        <@lh.geographicFocusHtml />
+                    </div>
+                </div>
+            </div>
+        </#if>
+
+        <!-- List of research classes: e.g., articles, books, collections, conference papers -->
+        <div class="row research-count">
+            <div class="container">
+                <!-- div class="col-md-6">
+                </div -->
+                <div class="col-md-12">
+                    <!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
+                    <@lh.allClassGroups vClassGroups! />
+                </div>
+            </div>
+        </div>
+
+        <#include "footer.ftl">
+        <#-- builds a json object that is used by js to render the academic departments section -->
+        <@lh.listAcademicDepartments />
+    <script>
+        var i18nStrings = {
+            researcherString: '${i18n().researcher}',
+            researchersString: '${i18n().researchers}',
+            currentlyNoResearchers: '${i18n().currently_no_researchers}',
+            countriesAndRegions: '${i18n().countries_and_regions}',
+            countriesString: '${i18n().countries}',
+            regionsString: '${i18n().regions}',
+            statesString: '${i18n().map_states_string}',
+            stateString: '${i18n().map_state_string}',
+            statewideLocations: '${i18n().statewide_locations}',
+            researchersInString: '${i18n().researchers_in}',
+            inString: '${i18n().in}',
+            noFacultyFound: '${i18n().no_faculty_found}',
+            placeholderImage: '${i18n().placeholder_image}',
+            viewAllFaculty: '${i18n().view_all_faculty}',
+            viewAllString: '${i18n().view_all}',
+            viewAllDepartments: '${i18n().view_all_departments}',
+            noDepartmentsFound: '${i18n().no_departments_found}'
+        };
+        // set the 'limmit search' text and alignment
+        if  ( $('input.search-homepage').css('text-align') == "right" ) {
+             $('input.search-homepage').attr("value","${i18n().limit_search} \u2192");
+        }
+    </script>
+    </body>
+</html>
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
index 7b986aa350..648b7bf281 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
@@ -1,38 +1,38 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#import "lib-list.ftl" as l>
-
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <#include "head.ftl">
-    </head>
-    
-    <body class="${bodyClasses!}" onload="${bodyOnload!}">
-		<header id="branding" role="banner" -->
-			<#include "identity.ftl">
-		</header>
-		<#include "developer.ftl">
-		<#include "menu.ftl">
-		<#include "message.ftl">
-
-		<div id="wrapper-content" role="main" class="container">        
-			<!--[if lte IE 8]>
-			<noscript>
-				<p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com"  title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
-			</noscript>
-			<![endif]-->
-
-			<#-- VIVO OpenSocial Extension by UCSF -->
-			<#if openSocial??>
-				<#if openSocial.visible>
-					<div id="gadgets-tools" class="gadgets-gadget-parent"></div>
-				</#if>	
-			</#if>	
-        
-			${body}
-        </div>
-		
-        <#include "footer.ftl">
-    </body>
-</html>
\ No newline at end of file
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#import "lib-list.ftl" as l>
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <#include "head.ftl">
+    </head>
+
+    <body class="${bodyClasses!}" onload="${bodyOnload!}">
+		<header id="branding" role="banner" -->
+			<#include "identity.ftl">
+		</header>
+		<#include "developer.ftl">
+		<#include "menu.ftl">
+		<#include "message.ftl">
+
+		<div id="wrapper-content" role="main" class="container">
+			<!--[if lte IE 8]>
+			<noscript>
+				<p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com"  title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
+			</noscript>
+			<![endif]-->
+
+			<#-- VIVO OpenSocial Extension by UCSF -->
+			<#if openSocial??>
+				<#if openSocial.visible>
+					<div id="gadgets-tools" class="gadgets-gadget-parent"></div>
+				</#if>
+			</#if>
+
+			${body}
+        </div>
+
+        <#include "footer.ftl">
+    </body>
+</html>
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl
index 3af8b1a693..b7a3f22887 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl
@@ -1,41 +1,41 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<footer role="contentinfo">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-8">
-                        <p class="copyright">
-                        <#if copyright??>
-                            <small>&copy;${copyright.year?c}
-                                <#if copyright.url??>
-                                    <a href="${copyright.url}" title="${i18n().menu_copyright}">${copyright.text}</a>
-                                <#else>
-                                ${copyright.text}
-                                </#if>
-                                | <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> |
-                        </#if>
-                        ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
-                        <#if user.hasRevisionInfoAccess>
-                            | ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a>
-                        </#if>
-                        </p>
-                    </div>
-                    <div class="col-md-4">
-                        <nav role="navigation">
-                            <ul id="footer-nav" role="list">
-                                <li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li>
-                            <#if urls.contact??>
-                                <li role="listitem"><a href="${urls.contact}" title="${i18n().menu_contactus}">${i18n().menu_contactus}</a></li>
-                            </#if>
-                                <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li>
-                            </ul>
-                        </nav>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</footer>
-
-<#include "scripts.ftl">
\ No newline at end of file
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<footer role="contentinfo">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-8">
+                        <p class="copyright">
+                        <#if copyright??>
+                            <small>&copy;${copyright.year?c}
+                                <#if copyright.url??>
+                                    <a href="${copyright.url}" title="${i18n().menu_copyright}">${copyright.text}</a>
+                                <#else>
+                                ${copyright.text}
+                                </#if>
+                                | <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> |
+                        </#if>
+                        ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
+                        <#if user.hasRevisionInfoAccess>
+                            | ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a>
+                        </#if>
+                        </p>
+                    </div>
+                    <div class="col-md-4">
+                        <nav role="navigation">
+                            <ul id="footer-nav" role="list">
+                                <li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li>
+                            <#if urls.contact??>
+                                <li role="listitem"><a href="${urls.contact}" title="${i18n().menu_contactus}">${i18n().menu_contactus}</a></li>
+                            </#if>
+                                <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li>
+                            </ul>
+                        </nav>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</footer>
+
+<#include "scripts.ftl">
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/head.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/head.ftl
index 0f8d2a312a..430da5b435 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/head.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/head.ftl
@@ -1,34 +1,34 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<meta charset="utf-8" />
-<!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-
-<title>${(title?html)!siteName!}</title>
-
-<#-- VIVO OpenSocial Extension by UCSF -->
-<#if openSocial??>
-    <#if openSocial.visible>
-        <#-- Required to add these BEFORE stylesheets.flt and headScripts.ftl are processed -->
-        ${stylesheets.add('<link rel="stylesheet" href="${urls.theme}/css/openSocial/gadgets.css" />')}			
-        ${headScripts.add('<script type="text/javascript" src="${openSocial.containerJavascriptSrc}"></script>',
-                          '<script type="text/javascript" language="javascript">${openSocial.gadgetJavascript}</script>',
-                          '<script type="text/javascript" src="${urls.base}/js/openSocial/orng.js"></script>')}
-    </#if>	
-</#if>	
-
-<#include "stylesheets.ftl">
-<link rel="stylesheet" href="${urls.theme}/css/screen.css" />
-
-<#include "headScripts.ftl">
-
-<!--[if (gte IE 6)&(lte IE 8)]>
-<script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
-<![endif]-->
-
-<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on 
-an individual profile page. -->
-${headContent!}
-
-<link rel="shortcut icon" type="image/x-icon" href="${urls.base}/favicon.ico">
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<meta charset="utf-8" />
+<!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
+<title>${(title?html)!siteName!}</title>
+
+<#-- VIVO OpenSocial Extension by UCSF -->
+<#if openSocial??>
+    <#if openSocial.visible>
+        <#-- Required to add these BEFORE stylesheets.flt and headScripts.ftl are processed -->
+        ${stylesheets.add('<link rel="stylesheet" href="${urls.theme}/css/openSocial/gadgets.css" />')}
+        ${headScripts.add('<script type="text/javascript" src="${openSocial.containerJavascriptSrc}"></script>',
+                          '<script type="text/javascript" language="javascript">${openSocial.gadgetJavascript}</script>',
+                          '<script type="text/javascript" src="${urls.base}/js/openSocial/orng.js"></script>')}
+    </#if>
+</#if>
+
+<#include "stylesheets.ftl">
+<link rel="stylesheet" href="${urls.theme}/css/screen.css" />
+
+<#include "headScripts.ftl">
+
+<!--[if (gte IE 6)&(lte IE 8)]>
+<script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
+<![endif]-->
+
+<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on
+an individual profile page. -->
+${headContent!}
+
+<link rel="shortcut icon" type="image/x-icon" href="${urls.base}/favicon.ico">
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/headScripts.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/headScripts.ftl
index c60897b135..4ef4dac909 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/headScripts.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/headScripts.ftl
@@ -1,36 +1,36 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for scripts that must be loaded in the head -->
-<script>
-var i18nStrings = {
-    allCapitalized: '${i18n().all_capitalized}',
-};
-</script>
-<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>
-<script type="text/javascript" src="${urls.base}/js/vitroUtils.js"></script>
-
-<#-- script for enabling new HTML5 semantic markup in IE browsers -->
-<!--[if lt IE 9]>
-<script type="text/javascript" src="${urls.base}/js/html5.js"></script>
-<![endif]-->
-
-<script src="${urls.theme}/bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript">
-	$(document).ready(function(){
-        $('#nav-wrapper').height($("#nav").height());
-
-		$('#nav').affix({
-			offset: {
-				top: $('header').height()
-			}
-		});
-
-        $( window ).resize(function() {
-            $('#nav-wrapper').height($("#nav").height());
-        });
-
-    });
-</script>
-
-${headScripts.list()} 
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for scripts that must be loaded in the head -->
+<script>
+var i18nStrings = {
+    allCapitalized: '${i18n().all_capitalized}',
+};
+</script>
+<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>
+<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>
+<script type="text/javascript" src="${urls.base}/js/vitroUtils.js"></script>
+
+<#-- script for enabling new HTML5 semantic markup in IE browsers -->
+<!--[if lt IE 9]>
+<script type="text/javascript" src="${urls.base}/js/html5.js"></script>
+<![endif]-->
+
+<script src="${urls.theme}/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+        $('#nav-wrapper').height($("#nav").height());
+
+		$('#nav').affix({
+			offset: {
+				top: $('header').height()
+			}
+		});
+
+        $( window ).resize(function() {
+            $('#nav-wrapper').height($("#nav").height());
+        });
+
+    });
+</script>
+
+${headScripts.list()}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/identity.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/identity.ftl
index 4a1dca1088..1696d1ff7b 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/identity.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/identity.ftl
@@ -1,55 +1,55 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<div class="container">
-	<div class="row">
-		<div class="col-md-12">
-<h1 class="vivo-logo"><a title="${i18n().identity_title}" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
-<#-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
-<#if siteTagline?has_content>
-	<em>${siteTagline}</em>
-</#if>-->
-
-<nav role="navigation">
-	<ul id="header-nav" role="list">
-		<#include "languageSelector.ftl">
-		<li role="listitem"><a href="${urls.index}" title="${i18n().identity_index}">${i18n().identity_index}</a></li>
-		<#if user.loggedIn>
-			<#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE 
-				 USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE
-				 USER IS A SITE ADMIN. tlw72
-				 
-				 <#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
-					<li role="listitem"><a href="${page.URLToEditPage}" title="${i18n().identity_edit}">${i18n().identity_edit}</a></li>
-				 </#if>
-			-->
-			<#if user.hasSiteAdminAccess>
-				<li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().identity_admin}">${i18n().identity_admin}</a></li>
-			</#if>
-				<li>
-					<ul class="dropdown">
-						<li id="user-menu"><a href="#" title="${i18n().identity_user}">${user.loginName}</a>
-							<ul class="sub_menu">
-								 <#if user.hasProfile>
-									 <li role="listitem"><a href="${user.profileUrl}" title="${i18n().identity_myprofile}">${i18n().identity_myprofile}</a></li>
-								 </#if>
-								 <#if urls.myAccount??>
-									 <li role="listitem"><a href="${urls.myAccount}" title="${i18n().identity_myaccount}">${i18n().identity_myaccount}</a></li>
-								 </#if>
-								 <li role="listitem"><a href="${urls.logout}" title="${i18n().menu_logout}">${i18n().menu_logout}</a></li>
-							</ul>
-						</li>
-					 </ul>
-				 </li>
-				 
-
-			
-			${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
-			
-		<#else>
-			<li role="listitem"><a class="log-out" title="${i18n().menu_loginfull}" href="${urls.login}">${i18n().menu_login}</a></li>
-		</#if>
-	</ul>
-</nav>
-		</div>
-	</div>
-</div>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-12">
+<h1 class="vivo-logo"><a title="${i18n().identity_title}" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
+<#-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
+<#if siteTagline?has_content>
+	<em>${siteTagline}</em>
+</#if>-->
+
+<nav role="navigation">
+	<ul id="header-nav" role="list">
+		<#include "languageSelector.ftl">
+		<li role="listitem"><a href="${urls.index}" title="${i18n().identity_index}">${i18n().identity_index}</a></li>
+		<#if user.loggedIn>
+			<#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE
+				 USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE
+				 USER IS A SITE ADMIN. tlw72
+
+				 <#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
+					<li role="listitem"><a href="${page.URLToEditPage}" title="${i18n().identity_edit}">${i18n().identity_edit}</a></li>
+				 </#if>
+			-->
+			<#if user.hasSiteAdminAccess>
+				<li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().identity_admin}">${i18n().identity_admin}</a></li>
+			</#if>
+				<li>
+					<ul class="dropdown">
+						<li id="user-menu"><a href="#" title="${i18n().identity_user}">${user.loginName}</a>
+							<ul class="sub_menu">
+								 <#if user.hasProfile>
+									 <li role="listitem"><a href="${user.profileUrl}" title="${i18n().identity_myprofile}">${i18n().identity_myprofile}</a></li>
+								 </#if>
+								 <#if urls.myAccount??>
+									 <li role="listitem"><a href="${urls.myAccount}" title="${i18n().identity_myaccount}">${i18n().identity_myaccount}</a></li>
+								 </#if>
+								 <li role="listitem"><a href="${urls.logout}" title="${i18n().menu_logout}">${i18n().menu_logout}</a></li>
+							</ul>
+						</li>
+					 </ul>
+				 </li>
+
+
+
+			${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
+
+		<#else>
+			<li role="listitem"><a class="log-out" title="${i18n().menu_loginfull}" href="${urls.login}">${i18n().menu_login}</a></li>
+		</#if>
+	</ul>
+</nav>
+		</div>
+	</div>
+</div>
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
index 25da539e15..b5308a8092 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
@@ -1,34 +1,34 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<div id="nav-wrapper">
-    <div id="nav">
-        <div class="container">
-            <nav class="navbar navbar-default">
-                <div class="navbar-header pull-right">
-                    <ul class="nav pull-left">
-                        <li>
-                        <#include "search.ftl">
-                        </li>
-                    </ul>
-                </div>
-
-                <button class="navbar-toggle pull-left" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="button-label">${i18n().collapsed_menu_name}</span>
-                    <div class="button-bars">
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </div>
-                </button>
-
-                <div class="collapse navbar-collapse navbar-left" id="navbarContent">
-                    <ul id="main-nav" role="list" class="nav navbar-nav mr-auto mt-2 mt-md-0">
-                    <#list menu.items as item>
-                        <li class="nav-item" role="listitem" <#if item.active> class="active" </#if>><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}" class="nav-link">${item.linkText}</a></li>
-                    </#list>
-                    </ul>
-                </div>
-            </nav>
-        </div>
-    </div>
-</div>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<div id="nav-wrapper">
+    <div id="nav">
+        <div class="container">
+            <nav class="navbar navbar-default">
+                <div class="navbar-header pull-right">
+                    <ul class="nav pull-left">
+                        <li>
+                        <#include "search.ftl">
+                        </li>
+                    </ul>
+                </div>
+
+                <button class="navbar-toggle pull-left" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="button-label">${i18n().collapsed_menu_name}</span>
+                    <div class="button-bars">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </div>
+                </button>
+
+                <div class="collapse navbar-collapse navbar-left" id="navbarContent">
+                    <ul id="main-nav" role="list" class="nav navbar-nav mr-auto mt-2 mt-md-0">
+                    <#list menu.items as item>
+                        <li class="nav-item" role="listitem" <#if item.active> class="active" </#if>><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}" class="nav-link">${item.linkText}</a></li>
+                    </#list>
+                    </ul>
+                </div>
+            </nav>
+        </div>
+    </div>
+</div>
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/search.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/search.ftl
index 81f4538cbf..fd64cb0cbc 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/search.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/search.ftl
@@ -1,17 +1,17 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#--Breaking this out so this can be utilized by other pages such as the jsp advanced tools pages-->
-
-<section id="search" role="region">
-    <fieldset>
-        <legend>${i18n().search_form}</legend>
-
-        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST"> 
-            <div id="search-field">
-                <input type="text" name="querytext" class="search-vivo" value="${querytext!}" autocapitalize="off" />
-                <input type="submit" value="${i18n().search_button}" class="search">
-            </div>
-        </form>
-    </fieldset>
-</section>
-        
\ No newline at end of file
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#--Breaking this out so this can be utilized by other pages such as the jsp advanced tools pages-->
+
+<section id="search" role="region">
+    <fieldset>
+        <legend>${i18n().search_form}</legend>
+
+        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST">
+            <div id="search-field">
+                <input type="text" name="querytext" class="search-vivo" value="${querytext!}" autocapitalize="off" />
+                <input type="submit" value="${i18n().search_button}" class="search">
+            </div>
+        </form>
+    </fieldset>
+</section>
+
diff --git a/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css b/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
index bf3c7cf893..0998e5350b 100644
--- a/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
+++ b/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
@@ -1,118 +1,118 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-.gadgets-gadget-chrome {
-  float: left;
-  margin: 4px 6px 4px 12px; /* changed the left value from 0 tlw72*/
-  border: 1px solid #CCC;
-  border: 1px solid #dfebe5; /*#7aa5d6;*/
-}
-.col2 .gadgets-gadget-chrome { 
-  margin-left: 9px;
-}
-
-.gadgets-gadget 
-{
-  width: 100%;
-  border: none;
-  background-color:#fff; /*tlw72*/
-}
-
-.gadgets-gadget-title-bar {
-  padding: 4px 4px 2px;
-  background-color: #EEEBE5;
-  background-color: #f1f2ee; /* #e5ecf9; */
-}
-/*.gadgets-gadget-title-bar:hover { background-color: #e7e3db; } */
-.gadgets-gadget-title-bar img,
-.gadgets-gadget-title-button {
-  vertical-align: top;
-}
-
-/* title bar */
-.gadgets-gadget-title a, .gadgets-gadget-title a:hover, .gadgets-gadget-title a:visited  {
- /* font-weight: bold; */
-  font-size: 16px; /*14px*/
-  color: #2485AE; /*#CA7C29*/
-  padding-left:8px; /*tlw72*/
-  text-decoration: none; /*tlw72*/
-}
-.EditBody .gadgets-gadget-title a {
-  color:#3B6394;
-} 
-.EditBody .gadgets-gadget-title a:hover {
-  color:#1E416C;
-}
-
-.gadgets-gadget-title-button-bar {
-  font-size: smaller;
-}
-
-.gadgets-gadget-canvas-title {
-  color: #000;
-  padding-left: 6px;
-}
-
-.gadgets-gadget-user-prefs-dialog {
-  background-color: #e5ecf9;
-}
-
-.gadgets-gadget-user-prefs-dialog-action-bar {
-  text-align: center;
-  padding-bottom: 4px;
-}
-
-.gadgets-gadget-title-button img {
-  border: 2px solid #4F5CC7;
-  border: none;           
-  float: left; /*right*/                           
-  margin-left: 2px; /*margin-right*/
-  margin-top:6px; /*tlw72*/
-} 
-.EditBody .gadgets-gadget-title-button img {
-  float: left;
-  margin-right: 8px; 
-}
-
-.gadgets-gadget-content {
-  padding: 4px;
-}
-
-.gadgets-log-entry {
-}
-
-/* Used to style messages produced during rewriting by CajaContentRewriter */
-.gadgets-messages {
-	
-}
-
-.gadgets-gadget-status {
-  font-weight: bold;
-  float: right;
-/*  text-align: center; */
-  font-size: 12px;
-  padding-right: 6px;
-}
-* html .gadgets-gadget-status { margin-top: -18px; padding-right: 30px; } /* fudge line break for IE6 */
-*+html .gadgets-gadget-status { margin-top: -18px; padding-right: 30px; } /* fudge line break for IE7 */
-
-/* list tool fix ticket #135 */
-* html #ctl00_ctl00_left_pnlOpenSocialTools { height: 130px; }
-*+html #ctl00_ctl00_left_pnlOpenSocialTools { height: 130px; }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.gadgets-gadget-chrome {
+  float: left;
+  margin: 4px 6px 4px 12px; /* changed the left value from 0 tlw72*/
+  border: 1px solid #CCC;
+  border: 1px solid #dfebe5; /*#7aa5d6;*/
+}
+.col2 .gadgets-gadget-chrome {
+  margin-left: 9px;
+}
+
+.gadgets-gadget
+{
+  width: 100%;
+  border: none;
+  background-color:#fff; /*tlw72*/
+}
+
+.gadgets-gadget-title-bar {
+  padding: 4px 4px 2px;
+  background-color: #EEEBE5;
+  background-color: #f1f2ee; /* #e5ecf9; */
+}
+/*.gadgets-gadget-title-bar:hover { background-color: #e7e3db; } */
+.gadgets-gadget-title-bar img,
+.gadgets-gadget-title-button {
+  vertical-align: top;
+}
+
+/* title bar */
+.gadgets-gadget-title a, .gadgets-gadget-title a:hover, .gadgets-gadget-title a:visited  {
+ /* font-weight: bold; */
+  font-size: 16px; /*14px*/
+  color: #2485AE; /*#CA7C29*/
+  padding-left:8px; /*tlw72*/
+  text-decoration: none; /*tlw72*/
+}
+.EditBody .gadgets-gadget-title a {
+  color:#3B6394;
+}
+.EditBody .gadgets-gadget-title a:hover {
+  color:#1E416C;
+}
+
+.gadgets-gadget-title-button-bar {
+  font-size: smaller;
+}
+
+.gadgets-gadget-canvas-title {
+  color: #000;
+  padding-left: 6px;
+}
+
+.gadgets-gadget-user-prefs-dialog {
+  background-color: #e5ecf9;
+}
+
+.gadgets-gadget-user-prefs-dialog-action-bar {
+  text-align: center;
+  padding-bottom: 4px;
+}
+
+.gadgets-gadget-title-button img {
+  border: 2px solid #4F5CC7;
+  border: none;
+  float: left; /*right*/
+  margin-left: 2px; /*margin-right*/
+  margin-top:6px; /*tlw72*/
+}
+.EditBody .gadgets-gadget-title-button img {
+  float: left;
+  margin-right: 8px;
+}
+
+.gadgets-gadget-content {
+  padding: 4px;
+}
+
+.gadgets-log-entry {
+}
+
+/* Used to style messages produced during rewriting by CajaContentRewriter */
+.gadgets-messages {
+
+}
+
+.gadgets-gadget-status {
+  font-weight: bold;
+  float: right;
+/*  text-align: center; */
+  font-size: 12px;
+  padding-right: 6px;
+}
+* html .gadgets-gadget-status { margin-top: -18px; padding-right: 30px; } /* fudge line break for IE6 */
+*+html .gadgets-gadget-status { margin-top: -18px; padding-right: 30px; } /* fudge line break for IE7 */
+
+/* list tool fix ticket #135 */
+* html #ctl00_ctl00_left_pnlOpenSocialTools { height: 130px; }
+*+html #ctl00_ctl00_left_pnlOpenSocialTools { height: 130px; }
 * html #ctl00_ctl00_left_pnlOpenSocialTools { margin-left: -8px; }
diff --git a/webapp/src/main/webapp/themes/wilma/css/reset.css b/webapp/src/main/webapp/themes/wilma/css/reset.css
index c6ee6add37..08780ef510 100644
--- a/webapp/src/main/webapp/themes/wilma/css/reset.css
+++ b/webapp/src/main/webapp/themes/wilma/css/reset.css
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-/* CSS Document 
+/* CSS Document
 CSS reste by Eric Meyer:
 The goal of a reset stylesheet is to reduce browser inconsistencies in things like default line heights, margins and font sizes of headings, and so on...  http://meyerweb.com/eric/tools/css/reset/
 */
@@ -59,7 +59,7 @@ td {
     color: #595b5b;
     font-weight: normal;
 }
-body {    
+body {
     line-height: 1.5em;
 }
 ol,
@@ -68,8 +68,8 @@ ul {
     font-weight: normal;
 }
 blockquote,
-q {    
-    quotes: none; 
+q {
+    quotes: none;
 }
 blockquote:before,
 blockquote:after,
@@ -79,11 +79,11 @@ q:after {
     content: none;
 }
 /* remember to highlight inserts somehow! */
-ins {    
-    text-decoration: none; 
+ins {
+    text-decoration: none;
 }
-del {    
-    text-decoration: line-through; 
+del {
+    text-decoration: line-through;
 }
 /* tables still need 'cellspacing="0"' in the markup */
 table {
@@ -91,12 +91,12 @@ table {
     border-spacing: 0;
 }
 /* New ones added to the default list */
-a {    
-    text-decoration: none; 
+a {
+    text-decoration: none;
 }
-fieldset {    
-    border-style: none; 
+fieldset {
+    border-style: none;
 }
-legend {    
-    display: none; 
+legend {
+    display: none;
 }
diff --git a/webapp/src/main/webapp/themes/wilma/css/screen.css b/webapp/src/main/webapp/themes/wilma/css/screen.css
index 362f22753a..7749656aff 100644
--- a/webapp/src/main/webapp/themes/wilma/css/screen.css
+++ b/webapp/src/main/webapp/themes/wilma/css/screen.css
@@ -2,21 +2,21 @@
 
 /****************************************
 ****************************************
-  __  __   __  __  __    ___   
- /\ \/\ \\/\ \/\ \/\ \  / __`\ 
+  __  __   __  __  __    ___
+ /\ \/\ \\/\ \/\ \/\ \  / __`\
  \ \ \_/ |\ \ \ \ \_/ |/\ \L\ \
   \ \___/  \ \_\ \___/ \ \____/
    \/__/    \/_/\/__/   \/___/
- 
-               
+
+
 VIVO wilma theme: screen styles
- 
+
  Original version
  2010-09-04 UI team
- 
+
  Last updated
  2011-2-1
- 
+
 *****************************************
 *****************************************/
 
diff --git a/webapp/src/main/webapp/themes/wilma/css/wilma.css b/webapp/src/main/webapp/themes/wilma/css/wilma.css
index c7f4478f54..74194fa7d6 100644
--- a/webapp/src/main/webapp/themes/wilma/css/wilma.css
+++ b/webapp/src/main/webapp/themes/wilma/css/wilma.css
@@ -20,14 +20,14 @@ html,
 body {
     padding: 0;
     height: 100%; /* needed for container min-height */
-    font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; 
+    font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
     height: auto !important; /* real browsers */
     height: 100%; /* IE6: treaded as min-height*/;
     min-height: 100%; /* real browsers */
     margin: 0 auto;
 }
 body {
-   background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat; 
+   background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
 }
 a {
     color: #2485AE;
@@ -52,35 +52,35 @@ h2 {
     line-height: 1.5em;
 }
 h2 a {
-    color: #2485ae; 
+    color: #2485ae;
 }
-h2 a:link, 
+h2 a:link,
 h2 a:visited {
-    text-decoration: underline; 
+    text-decoration: underline;
 }
 h3 {
     padding: 10px 0 12px 0;
     margin: 0;
     font-size: 1.125em;
-    color: #064d68; 
+    color: #064d68;
 }
 h4 {
     padding: 10px 0 12px 0;
     margin: 0;
     font-size: 1em;
-    color: #064d68; 
+    color: #064d68;
 }
 h5 {
     padding: 10px 0 12px 0;
     margin: 0;
     font-size: .875em;
-    color: #064d68; 
+    color: #064d68;
 }
 /* ------------------------------------------------->  */
 /* EDITING STYLES ---------------------------------->  */
 /* ------------------------------------------------->  */
 input[type="text"],
-select,  
+select,
 input[type="password"] {
     border: 0;
     font-size: 14px;
@@ -108,12 +108,12 @@ label.inline {
 .verbose-toggle:visited,
 #showAddFormButton,
 #showAddFormButton:visited,
-input.submit, 
+input.submit,
 input.submit:visited,
-/* the id selectors are used temporarily due to the custom jsp tags (<v:input>) 
-for editing forms which require an id and do not allow a class. This will be 
+/* the id selectors are used temporarily due to the custom jsp tags (<v:input>)
+for editing forms which require an id and do not allow a class. This will be
 removed once we refactor the editing forms to Freemarker */
-input#submit, 
+input#submit,
 input#submit:visited,
 input.form-button,
 input.form-button:visited {
@@ -122,7 +122,7 @@ input.form-button:visited {
     padding: 5px 18px 7px;
     color: #fff;
     text-decoration: none;
-    border-radius: 4px; 
+    border-radius: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     position: relative;
@@ -156,7 +156,7 @@ input#delete:visited {
     padding: 5px 18px 7px;
     color: #fff;
     text-decoration: none;
-    border-radius: 4px; 
+    border-radius: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     position: relative;
@@ -197,10 +197,10 @@ section.accounts input.delete:active {
     top: 1px;
 }
 form textarea {
-    border: 1px solid #e0dfdf; 
-    border-radius: 4px; 
+    border: 1px solid #e0dfdf;
+    border-radius: 4px;
     -moz-border-radius: 4px;
-    -webkit-border-radius: 4px; 
+    -webkit-border-radius: 4px;
 }
 .maxWidth {
     margin-top: 20px;
@@ -209,7 +209,7 @@ form textarea {
 #itemList a.remove:link,
 #itemList a.remove:visited,
 #showAddForm a.cancel:link,
-form a:link.cancel, 
+form a:link.cancel,
 form a:visited.cancel,
 a.return:link,
 a.return:visited {
@@ -222,7 +222,7 @@ a.return:visited {
 #itemList a.remove:active,
 #showAddForm a.cancel:hover,
 #showAddForm a.cancel:active,
-form a:hover.cancel, 
+form a:hover.cancel,
 form a:active.cancel {
     text-decoration: none;
     color: #f70;
@@ -373,18 +373,18 @@ form select {
    margin-top: .7em;
    margin-right: .5em;
 }
-.notice { 
-    margin-top: 1em; 
+.notice {
+    margin-top: 1em;
     border: 1px dotted #FFD324;
 }
-a.ingestMenu:link, 
+a.ingestMenu:link,
 a.ingestMenu:visited,
 a.account-menu:link,
 a.account-menu:visited {
     text-decoration: none;
     color: #2485AE;
 }
-a.ingestMenu:hover, 
+a.ingestMenu:hover,
 a.ingestMenu:active,
 a.account-menu:hover,
 a.account-menu:active,
@@ -424,7 +424,7 @@ tr.editformcell td textarea.matchingInput {
     width: 95%;
     height:10ex;
     margin-top:0.7em;
-    font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; 
+    font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
     font-size:0.95em;
 }
 hr.formDivider {
@@ -433,7 +433,7 @@ hr.formDivider {
     height: 1px;
     margin-bottom: 20px;
     margin-top: 15px;
-    opacity: 0.3;   
+    opacity: 0.3;
 }
 .editingForm table {
     width: 100%;
@@ -605,7 +605,7 @@ ul.individual-urls li a,
 ul.individual-urls-people li a {
     color: #2485ae
 }
-/* LOG IN------>  */          
+/* LOG IN------>  */
 #login {
     float: right;
     width: 314px;
@@ -667,11 +667,11 @@ h3.internal-auth:hover {
     border: 1px solid #e0dfdf;
     border-radius: 5px;
     -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;     
+    -webkit-border-radius: 5px;
 }
 #login-form input.text-field:focus {
-    border: 1px solid rgba(57, 138, 172, .5);  
-    background-color: rgba(57, 138, 172, .1);   
+    border: 1px solid rgba(57, 138, 172, .5);
+    background-color: rgba(57, 138, 172, .1);
 }
 #login-form p.submit {
     width: 100px;
@@ -723,12 +723,12 @@ p.request-account {
 p.password-note {
     font-size: 12px;
     color: #949696;
-    padding-left: 38px;   
+    padding-left: 38px;
 }
 #flash-message {
     border: 1px dotted #E2C822;
     background-color: #FFF9D7;
-    padding: .5em;  
+    padding: .5em;
     margin-bottom: 10px;
 }
 #welcome-message {
@@ -799,7 +799,7 @@ input.search-home-vivo {
     margin-top: 2px;
 }
 
-/* SEARCH HOME------>  */ 
+/* SEARCH HOME------>  */
 
 #search-home-field {
 		background: url(../images/search-field-and-button.gif) 0 0 no-repeat;
@@ -818,7 +818,7 @@ input.search-homepage {
 		background-color: #f9fafa;
 		background-position: right;
 		opacity: .5;
-		text-align:right; 
+		text-align:right;
 }
 
 .filter-default {
@@ -843,7 +843,7 @@ input.search-homepage {
 #stats p,
 p.request-account a,
 ul#header-nav a {
-   color: #fff; 
+   color: #fff;
 }
 #filter-search-nav a {
 		border-bottom: 1px dotted #4f5656;
@@ -912,16 +912,16 @@ a.view-all-style {
 		opacity: .5;
 }
 #home-research  {
-	width: 297px; 
+	width: 297px;
 	float: left;
 	clear: both;
 }
 #home-research ul {
-	padding: 0.7em 0 0.6em 0.75em; 
+	padding: 0.7em 0 0.6em 0.75em;
 }
 #home-research li {
 	line-height: 1.25em;
-	margin-top: 0.7em; 
+	margin-top: 0.7em;
 	font-size: 0.9em;
 }
 #home-research li:last-child {
@@ -939,7 +939,7 @@ a.view-all-style {
 	text-align: center;
 }
 #home-academic-depts  {
-	width: 297px; 
+	width: 297px;
 	margin-left: 15px;
 	float: left;
 }
@@ -951,8 +951,8 @@ a.view-all-style {
     padding: 3px 10px;
 }
 #home-academic-depts ul {
-    list-style: disc outside url(../../../images/arrowIcon.gif); 
-	padding: 0.4em 0 0.6em 1.8em; 
+    list-style: disc outside url(../../../images/arrowIcon.gif);
+	padding: 0.4em 0 0.6em 1.8em;
 }
 #home-academic-depts li {
 	line-height: 1.25em;
@@ -961,7 +961,7 @@ a.view-all-style {
 	font-size: 0.9em;
 }
 #home-faculty-mbrs  {
-	width: 297px; 
+	width: 297px;
 	margin: 0 0 20px 15px;
 	float: left;
 }
@@ -985,9 +985,9 @@ div#research-faculty-mbrs li h1 {
     padding: 6px 0 2px 0;
 }
 div#research-faculty-mbrs li img {
-    width: 60px;  
+    width: 60px;
     float: left;
-    padding: 0px 8px 10px 10px; 
+    padding: 0px 8px 10px 10px;
 }
 div#research-faculty-mbrs li span.title {
     display: block;
@@ -1011,7 +1011,7 @@ div#adjImgHeight {
 }
 #home-geo-focus  {
 	clear: both;
-	display: inline-block; 
+	display: inline-block;
     margin-top: 30px;
     height: 632px;
     width: 921px;
@@ -1112,7 +1112,7 @@ ul#individual-tools-people li a {
 .button:visited {
     font-size: 16px;
     font-weight: normal;
-    line-height: 1; 
+    line-height: 1;
 }
 .green.button,
 .green.button:visited {
@@ -1143,15 +1143,15 @@ ul#individual-tools-people li a {
 .individualList ul.individualData li {
     border-right: solid 1px #a0a0a0;
 }
-.individualList ul { 
-    margin-left: 0; 
+.individualList ul {
+    margin-left: 0;
 }
 .individualList li,
-.individualList li span { 
+.individualList li span {
   color: #9c9c9c;
  }
-.individualList li a { 
-    font-weight: normal; 
+.individualList li a {
+    font-weight: normal;
     color: #2485AE;
 }
 
@@ -1230,7 +1230,7 @@ ul#find-filters a.selected {
 #profile-photo-display {
     width: 600px;
 }
-#profile-photo-display img {    
+#profile-photo-display img {
     border: 1px solid #dde4e3;
 }
 #nav-display p {
@@ -1265,8 +1265,8 @@ ul#browse-classes a.selected {
     background: url(../images/arrow.gif) 4px 5px no-repeat;
     color: #2ea0cf;
 }
-ul#browse-classes .count-classes {    
-    font-size: 12px; 
+ul#browse-classes .count-classes {
+    font-size: 12px;
 }
 /* ALPHA BROWSE------>  */
 ul#alpha-browse-individuals {
@@ -1284,7 +1284,7 @@ ul#vgraph-classes .count-classes {
 .alphaIndex,
 .pagination.menupage,
 tr.editformcell td select,
-ul#alpha-browse-individuals li {    
+ul#alpha-browse-individuals li {
     font-size: .8em;
 }
 nav#alpha-browse-container {
@@ -1368,8 +1368,8 @@ article.property ul.property-list {
     padding-top: .2em;
 }
 #individual-intro h1 {
-    font-size: 1.375em; 
-    color: #2485ae; 
+    font-size: 1.375em;
+    color: #2485ae;
 }
 #individual-intro span.display-title,
 h1.fn .display-title {
@@ -1416,7 +1416,7 @@ ul.individual-urls-people {
 #property-group-menu a,
 .grey,
 .pagination.menupage li.selected,
-h2#mainImage, 
+h2#mainImage,
 #share-contact h2,
 h3.internal-auth {
     color: #5e6363;
@@ -1678,12 +1678,12 @@ input.add-account:hover {
 /* ASSOCIATE PROFILE ------------------------------->  */
 /* ------------------------------------------------->  */
 #associateProfileBackgroundThree {
-    padding:7px 94px 26px 12px; 
-    margin-top:-136px; 
+    padding:7px 94px 26px 12px;
+    margin-top:-136px;
 }
 #associateProfileBackgroundTwo {
     padding:7px 94px 40px 0;
-    margin-top:-136px; 
+    margin-top:-136px;
 }
 #associateProfileBackgroundFour {
     margin-top:-12px;
diff --git a/webapp/src/main/webapp/themes/wilma/i18n/all.properties b/webapp/src/main/webapp/themes/wilma/i18n/all.properties
index d9d58abde1..e66f906ad5 100644
--- a/webapp/src/main/webapp/themes/wilma/i18n/all.properties
+++ b/webapp/src/main/webapp/themes/wilma/i18n/all.properties
@@ -73,7 +73,7 @@ select_award = Selected Award
 grants_in_vivo = grants in VIVO
 service_provider_role = Service Provider Role
 view_all_faculty = view all faculty
-no_grants_for = Currently there are no grants for 
+no_grants_for = Currently there are no grants for
 statewide_locations = state-wide locations.
 faculty_who_are_members_of_org = Here are the faculty in the {0} department who are members of this organization.
 indiv_foafperson_for = for
diff --git a/webapp/src/main/webapp/themes/wilma/templates/footer.ftl b/webapp/src/main/webapp/themes/wilma/templates/footer.ftl
index 3375c08e55..dc8931517a 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/footer.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/footer.ftl
@@ -11,20 +11,20 @@
             <#else>
                 ${copyright.text}
             </#if>
-             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> | 
+             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> |
         </#if>
         ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
         <#if user.hasRevisionInfoAccess>
              | ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a>
         </#if>
     </p>
-    
+
     <nav role="navigation">
         <ul id="footer-nav" role="list">
             <li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li>
             <#if urls.contact??>
                 <li role="listitem"><a href="${urls.contact}" title="${i18n().menu_contactus}">${i18n().menu_contactus}</a></li>
-            </#if> 
+            </#if>
             <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li>
         </ul>
     </nav>
diff --git a/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl b/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl
index 896ced2829..47e9afb193 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl
@@ -8,5 +8,5 @@
 <#if openSocial??>
 	<#if openSocial.visible>
        	<div id="gadgets-detail" class="gadgets-gadget-parent"></div>
-    </#if>	
-</#if>	
+    </#if>
+</#if>
diff --git a/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl b/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl
index 70990b552d..2b4b50ece0 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl
@@ -3,13 +3,13 @@
 <#-- Template for the body of the GadgetDetails page -->
 
 <style media="screen" type="text/css">
-th { 
+th {
   vertical-align: top;
   width: 150px;
   text-align: right;
   padding-right: 10px;
 }
-</style>	
+</style>
 
 <div class="pageTitle" id="gadgets-title"><h2>${title!}</h2></div>
 
@@ -51,4 +51,4 @@ th {
             </tr>
         </table>
    	</form>
-</#if>	
+</#if>
diff --git a/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl b/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl
index a91c60b1aa..1da2ed4ce9 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl
@@ -1,26 +1,26 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code. 
+<#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code.
 Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google+Analytics+for+UI. -->
 
 <#--
-<script type="text/javascript">  
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); 
-</script>  
+<script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
 
-<script type="text/javascript">  
-    try { 
+<script type="text/javascript">
+    try {
         var pageTracker = _gat._getTracker("UA-5164622-5");
         pageTracker._setDomainName("vivo.cornell.edu");
         pageTracker._setAllowLinker(true);
         pageTracker._trackPageview();
-         
+
         var rollupTracker = _gat._getTracker("UA-12531954-1");
-        rollupTracker._setDomainName("none"); 
+        rollupTracker._setDomainName("none");
         rollupTracker._setAllowLinker(true);
-        rollupTracker._trackPageview(location.host+location.pathname);  
-} 
+        rollupTracker._trackPageview(location.host+location.pathname);
+}
 
-catch(err) {}  
+catch(err) {}
 </script>
 -->
diff --git a/webapp/src/main/webapp/themes/wilma/templates/head.ftl b/webapp/src/main/webapp/themes/wilma/templates/head.ftl
index 8342ab5bb2..06af8d7a2f 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/head.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/head.ftl
@@ -11,12 +11,12 @@
 <#if openSocial??>
     <#if openSocial.visible>
         <#-- Required to add these BEFORE stylesheets.flt and headScripts.ftl are processed -->
-        ${stylesheets.add('<link rel="stylesheet" href="${urls.theme}/css/openSocial/gadgets.css" />')}			
+        ${stylesheets.add('<link rel="stylesheet" href="${urls.theme}/css/openSocial/gadgets.css" />')}
         ${headScripts.add('<script type="text/javascript" src="${openSocial.containerJavascriptSrc}"></script>',
                           '<script type="text/javascript" language="javascript">${openSocial.gadgetJavascript}</script>',
                           '<script type="text/javascript" src="${urls.base}/js/openSocial/orng.js"></script>')}
-    </#if>	
-</#if>	
+    </#if>
+</#if>
 
 <#include "stylesheets.ftl">
 <link rel="stylesheet" href="${urls.theme}/css/screen.css" />
@@ -31,7 +31,7 @@
 <script type="text/javascript" src="${urls.base}/js/selectivizr.js"></script>
 <![endif]-->
 
-<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on 
+<#-- Inject head content specified in the controller. Currently this is used only to generate an rdf link on
 an individual profile page. -->
 ${headContent!}
 
diff --git a/webapp/src/main/webapp/themes/wilma/templates/identity.ftl b/webapp/src/main/webapp/themes/wilma/templates/identity.ftl
index 0921fd8504..8b5b5dd538 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/identity.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/identity.ftl
@@ -13,10 +13,10 @@
             <#include "languageSelector.ftl">
             <li role="listitem"><a href="${urls.index}" title="${i18n().identity_index}">${i18n().identity_index}</a></li>
             <#if user.loggedIn>
-                <#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE 
+                <#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE
                      USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE
                      USER IS A SITE ADMIN. tlw72
-                     
+
                      <#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
                         <li role="listitem"><a href="${page.URLToEditPage}" title="${i18n().identity_edit}">${i18n().identity_edit}</a></li>
                      </#if>
@@ -39,14 +39,14 @@
                             </li>
                          </ul>
                      </li>
-                     
 
-                
+
+
                 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
-                
+
             <#else>
                 <li role="listitem"><a class="log-out" title="${i18n().menu_loginfull}" href="${urls.login}">${i18n().menu_login}</a></li>
             </#if>
         </ul>
-        
+
     </nav>
diff --git a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
index 3a9dab4650..fb9e2424b5 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
@@ -1,10 +1,10 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
     Individual profile page template for foaf:Person individuals. This is the default template for foaf persons
-    in the Wilma theme and should reside in the themes/wilma/templates directory. 
+    in the Wilma theme and should reside in the themes/wilma/templates directory.
 -->
- 
+
 <#include "individual-setup.ftl">
 <#import "lib-vivo-properties.ftl" as vp>
 <#--Number of labels present-->
@@ -22,17 +22,17 @@
 <#assign visRequestingTemplate = "foaf-person-wilma">
 
 <#--add the VIVO-ORCID interface -->
-<#include "individual-orcidInterface.ftl">  
-        
+<#include "individual-orcidInterface.ftl">
+
 <section id="individual-intro" class="vcard person" role="region">
 
-    <section id="share-contact" role="region"> 
-        <!-- Image -->           
+    <section id="share-contact" role="region">
+        <!-- Image -->
         <#assign individualImage>
-            <@p.image individual=individual 
-                      propertyGroups=propertyGroups 
-                      namespaces=namespaces 
-                      editable=editable 
+            <@p.image individual=individual
+                      propertyGroups=propertyGroups
+                      namespaces=namespaces
+                      editable=editable
                       showPlaceholder="always" />
         </#assign>
 
@@ -47,29 +47,29 @@
                 <img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}"/>
   				<#if checkNamesResult?has_content >
 					<img id="qrIcon"  src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
-                	<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!} 
+                	<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
 						<a class="qrCloseLink" href="#"  title="${i18n().qr_code}">${i18n().close_capitalized}</a>
 					</span>
 				</#if>
             </span>
         </div>
-        <#include "individual-contactInfo.ftl">  
-                
+        <#include "individual-contactInfo.ftl">
+
         <!-- Websites -->
         <#include "individual-webpage.ftl">
     </section>
 
-    <section id="individual-info" ${infoClass!} role="region"> 
+    <section id="individual-info" ${infoClass!} role="region">
     <section id="right-hand-column" role="region">
-        <#include "individual-visualizationFoafPerson.ftl">    
+        <#include "individual-visualizationFoafPerson.ftl">
         </section>
         <#include "individual-adminPanel.ftl">
-        
+
         <header>
             <#if relatedSubject??>
                 <h2>${relatedSubject.relatingPredicateDomainPublic} ${i18n().indiv_foafperson_for} ${relatedSubject.name}</h2>
                 <p><a href="${relatedSubject.url}" title="${i18n().indiv_foafperson_return}">&larr; ${i18n().indiv_foafperson_return} ${relatedSubject.name}</a></p>
-            <#else>                
+            <#else>
                 <h1 class="foaf-person">
                     <#-- Label -->
                     <span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
@@ -95,13 +95,13 @@
                     </#if>
                 </section>
             </#if>
-            <!-- Positions -->   
+            <!-- Positions -->
             <#include "individual-positions.ftl">
         </header>
-         
+
         <!-- Overview -->
         <#include "individual-overview.ftl">
-        
+
         <!-- Research Areas -->
         <#include "individual-researchAreas.ftl">
 
@@ -110,25 +110,25 @@
 
 		<#include "individual-openSocial.ftl">
     </section>
-    
+
 </span></section>
 
-<#assign nameForOtherGroup = "${i18n().other}"> 
+<#assign nameForOtherGroup = "${i18n().other}">
 
 <#-- Ontology properties -->
 <#if !editable>
 	<#-- We don't want to see the first name and last name unless we might edit them. -->
-	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!> 
-	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!> 
+	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
+	<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
 </#if>
 
 <!-- Property group menu or tabs -->
-<#-- 
+<#--
      With release 1.6 there are now two types of property group displays: the original property group
      menu and the horizontal tab display, which is the default. If you prefer to use the property
      group menu, simply substitute the include statement below with the one that appears after this
      comment section.
-     
+
      <#include "individual-property-group-menus.ftl">
 -->
 
diff --git a/webapp/src/main/webapp/themes/wilma/templates/menu.ftl b/webapp/src/main/webapp/themes/wilma/templates/menu.ftl
index a507737f38..580454bbdb 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/menu.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/menu.ftl
@@ -12,7 +12,7 @@
     </ul>
 </nav>
 
-<div id="wrapper-content" role="main">        
+<div id="wrapper-content" role="main">
     <#if flash?has_content>
         <#if flash?starts_with(i18n().menu_welcomestart) >
             <section  id="welcome-msg-container" role="container">
@@ -24,7 +24,7 @@
             </section>
         </#if>
     </#if>
-    
+
     <!--[if lte IE 8]>
     <noscript>
         <p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com"  title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
index 74e2aa36c7..ff55691a4e 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
@@ -2,13 +2,13 @@
 
 <@widget name="login" include="assets" />
 
-<#-- 
-        With release 1.6, the home page no longer uses the "browse by" class group/classes display. 
+<#--
+        With release 1.6, the home page no longer uses the "browse by" class group/classes display.
         If you prefer to use the "browse by" display, replace the import statement below with the
         following include statement:
-        
+
             <#include "browse-classgroups.ftl">
-            
+
         Also ensure that the homePage.geoFocusMaps flag in the runtime.properties file is commented
         out.
 -->
@@ -23,7 +23,7 @@
         </#if>
         <script async type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
     </head>
-    
+
     <body class="${bodyClasses!}" onload="${bodyOnload!}">
     <#-- supplies the faculty count to the js function that generates a random row number for the search query -->
         <@lh.facultyMemberCount  vClassGroups! />
@@ -39,35 +39,35 @@
 
             <section id="search-home" role="region">
                 <h3>${i18n().intro_searchvivo} <span class="search-filter-selected">filteredSearch</span></h3>
-        
+
                 <fieldset>
                     <legend>${i18n().search_form}</legend>
-                    <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" > 
+                    <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" >
                         <div id="search-home-field">
                             <input type="text" name="querytext" class="search-homepage" value="" autocapitalize="off" />
                             <input type="submit" value="${i18n().search_button}" class="search" />
                             <input type="hidden" name="classgroup"  value="" autocapitalize="off" />
                         </div>
-                
+
                         <a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}">
                             <span class="displace">${i18n().intro_filtersearch}</span>
                         </a>
-                
+
                         <ul id="filter-search-nav">
                             <li><a class="active" href="">${i18n().all_capitalized}</a></li>
-                            <@lh.allClassGroupNames vClassGroups! />  
+                            <@lh.allClassGroupNames vClassGroups! />
                         </ul>
                     </form>
                 </fieldset>
             </section> <!-- #search-home -->
-        
+
         </section> <!-- #intro -->
-        
+
         <@widget name="login" />
-        
+
         <!-- List of research classes: e.g., articles, books, collections, conference papers -->
         <@lh.researchClasses />
-                
+
         <!-- List of four randomly selected faculty members -->
         <@lh.facultyMbrHtml />
 
@@ -78,14 +78,14 @@
             <!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties -->
             <@lh.geographicFocusHtml />
         </#if>
-        
+
         <!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
         <@lh.allClassGroups vClassGroups! />
 
         <#include "footer.ftl">
         <#-- builds a json object that is used by js to render the academic departments section -->
         <@lh.listAcademicDepartments />
-    <script>       
+    <script>
         var i18nStrings = {
             researcherString: '${i18n().researcher}',
             researchersString: '${i18n().researchers}',
@@ -106,9 +106,9 @@
             noDepartmentsFound: '${i18n().no_departments_found}'
         };
         // set the 'limmit search' text and alignment
-        if  ( $('input.search-homepage').css('text-align') == "right" ) {       
+        if  ( $('input.search-homepage').css('text-align') == "right" ) {
              $('input.search-homepage').attr("value","${i18n().limit_search} \u2192");
-        }  
+        }
     </script>
     </body>
 </html>
diff --git a/webapp/src/main/webapp/themes/wilma/templates/page.ftl b/webapp/src/main/webapp/themes/wilma/templates/page.ftl
index b7dd07855d..f1a2d5b2b4 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/page.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/page.ftl
@@ -7,7 +7,7 @@
     <head>
         <#include "head.ftl">
     </head>
-    
+
     <body class="${bodyClasses!}" onload="${bodyOnload!}">
         <#include "identity.ftl">
         <#include "search.ftl" >
@@ -17,11 +17,11 @@
 		<#if openSocial??>
 			<#if openSocial.visible>
             	<div id="gadgets-tools" class="gadgets-gadget-parent"></div>
-            </#if>	
-		</#if>	
-        
+            </#if>
+		</#if>
+
         ${body}
-        
+
         <#include "footer.ftl">
     </body>
 </html>
diff --git a/webapp/src/main/webapp/themes/wilma/templates/search.ftl b/webapp/src/main/webapp/themes/wilma/templates/search.ftl
index b58572aecd..9bf8e501e5 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/search.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/search.ftl
@@ -6,7 +6,7 @@
     <fieldset>
         <legend>${i18n().search_form}</legend>
 
-        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST"> 
+        <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST">
             <div id="search-field">
                 <input type="text" name="querytext" class="search-vivo" value="${querytext!}" autocapitalize="off" />
                 <input type="submit" value="${i18n().search_button}" class="search">
@@ -14,4 +14,4 @@
         </form>
     </fieldset>
 </section>
-        
+

From 06726e09792cd3fa31b7d2e600ff0865a5d77a10 Mon Sep 17 00:00:00 2001
From: Graham Triggs <grahamtriggs@gmail.com>
Date: Fri, 7 Jun 2019 18:02:07 +0100
Subject: [PATCH 15/24] [VIVO-1656] Extension mechansim for passing properties
 to templates (#128)

* [VIVO-1656] Extension mechansim for passing properties to templates for Individuals

* [VIVO-1656] Extension mechansim for passing properties to templates for Individuals
---
 ...IVOIndividualResponseBuilderExtension.java | 74 +++++++++++++++++++
 .../WEB-INF/resources/startup_listeners.txt   |  3 +
 2 files changed, 77 insertions(+)
 create mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java
new file mode 100644
index 0000000000..da71d86d55
--- /dev/null
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java
@@ -0,0 +1,74 @@
+package edu.cornell.mannlib.vitro.webapp.controller.individual;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.util.Map;
+
+public class VIVOIndividualResponseBuilderExtension implements IndividualResponseBuilder.ExtendedResponse {
+    public static class Setup implements ServletContextListener {
+        @Override
+        public void contextInitialized(ServletContextEvent sce) {
+            IndividualResponseBuilder.registerExtendedResponse(new VIVOIndividualResponseBuilderExtension());
+        }
+
+        @Override
+        public void contextDestroyed(ServletContextEvent sce) {
+
+        }
+    }
+
+    @Override
+    public void addOptions(VitroRequest vreq, Map<String, Object> body) {
+        addAltMetricOptions(vreq, body);
+        addPlumPrintOptions(vreq, body);
+    }
+
+    private void addAltMetricOptions(VitroRequest vreq, Map<String, Object> body) {
+        ConfigurationProperties properties = ConfigurationProperties.getBean(vreq);
+
+        if (properties != null) {
+            String enabled        = properties.getProperty("resource.altmetric", "enabled");
+            String displayTo      = properties.getProperty("resource.altmetric.displayto", "right");
+            String badgeType      = properties.getProperty("resource.altmetric.badge-type", "donut");
+            String badgeHideEmpty = properties.getProperty("resource.altmetric.hide-no-mentions", "true");
+            String badgePopover   = properties.getProperty("resource.altmetric.badge-popover", "right");
+            String badgeDetails   = properties.getProperty("resource.altmetric.badge-details");
+
+            if (!"disabled".equalsIgnoreCase(enabled)) {
+                body.put("altmetricEnabled", true);
+
+                body.put("altmetricDisplayTo", displayTo);
+                body.put("altmetricBadgeType", badgeType);
+                if ("true".equalsIgnoreCase(badgeHideEmpty)) {
+                    body.put("altmetricHideEmpty", true);
+                }
+                body.put("altmetricPopover", badgePopover);
+                body.put("altmetricDetails", badgeDetails);
+            }
+        }
+    }
+
+    private void addPlumPrintOptions(VitroRequest vreq, Map<String, Object> body) {
+        ConfigurationProperties properties = ConfigurationProperties.getBean(vreq);
+
+        if (properties != null) {
+            String enabled = properties.getProperty("resource.plum-print", "enabled");
+            String displayTo = properties.getProperty("resource.plum-print.displayto", "right");
+            String printHideEmpty = properties.getProperty("resource.plum-print.hide-when-empty", "true");
+            String printPopover = properties.getProperty("resource.plum-print.popover", "right");
+            String printSize = properties.getProperty("resource.plum-print.size", "medium");
+
+            if (!"disabled".equalsIgnoreCase(enabled)) {
+                body.put("plumPrintEnabled", true);
+
+                body.put("plumPrintDisplayTo", displayTo);
+                body.put("plumPrintHideEmpty", "true".equalsIgnoreCase(printHideEmpty) ? "true" : "false");
+                body.put("plumPrintPopover", printPopover);
+                body.put("plumPrintSize", printSize);
+            }
+        }
+    }
+}
diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
index c4bb43e5c8..6d3b1821cf 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -86,6 +86,9 @@ edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
 
 edu.cornell.mannlib.vivo.orcid.OrcidContextSetup
 
+# Register the extensions to the IndividualResponseBuilder (e.g. alt metric, plum analytics)
+edu.cornell.mannlib.vitro.webapp.controller.individual.VIVOIndividualResponseBuilderExtension$Setup
+
 # This should be near the end, because it will issue a warning if the connection to Solr times out.
 edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
 

From 27cb119918cee908942e81127691f17a7d623f49 Mon Sep 17 00:00:00 2001
From: Ralph O'Flinn <roflinn@uab.edu>
Date: Mon, 24 Jun 2019 08:43:28 -0500
Subject: [PATCH 16/24] fixing merge error

---
 .../src/main/webapp/WEB-INF/resources/startup_listeners.txt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
index 6d3b1821cf..a3727d056c 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -89,7 +89,7 @@ edu.cornell.mannlib.vivo.orcid.OrcidContextSetup
 # Register the extensions to the IndividualResponseBuilder (e.g. alt metric, plum analytics)
 edu.cornell.mannlib.vitro.webapp.controller.individual.VIVOIndividualResponseBuilderExtension$Setup
 
-# This should be near the end, because it will issue a warning if the connection to Solr times out.
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
+# This should be near the end, because it will issue a warning if the connection to the SearchEngine times out.
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest
 
 org.vivoweb.webapp.startup.i18nSetup

From 1e487a823868a17dc932dbb018ffaa7bd7fb8d75 Mon Sep 17 00:00:00 2001
From: Ben <mbgross@wustl.edu>
Date: Tue, 9 Jul 2019 09:03:33 -0600
Subject: [PATCH 17/24] Set Tenderfoot pub chart height (#125)

---
 .../partials/individual/individual-visualizationFoafPerson.ftl  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl
index 6b78fb3d9f..3ca7fdfe10 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-visualizationFoafPerson.ftl
@@ -47,6 +47,8 @@
                             height = (chartHeight - margin.top - margin.bottom),
                             g = svg.append("g").attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
+                    svg.attr("width", chartWidth).attr("height",chartHeight)
+
                     var x = d3.scaleBand()
                             .rangeRound([0, width])
                             .paddingInner(0.05)

From abc152cfecbfb4102b907c44ed8239381fcf6336 Mon Sep 17 00:00:00 2001
From: hauschke <christian.hauschke@tib.eu>
Date: Sat, 13 Jul 2019 05:40:52 +0200
Subject: [PATCH 18/24] Paper revision (#131)

* minor fix in Acknowledgement

* Added references

* Added 2 ORCIDs
---
 paper/paper.md | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/paper/paper.md b/paper/paper.md
index 429240d9f4..b27cbe8f33 100644
--- a/paper/paper.md
+++ b/paper/paper.md
@@ -78,8 +78,10 @@ authors:
    Orcid: 0000-0001-5059-4132
    affiliation: 17
  - name: Stefan Wolff
+   Orcid: 0000-0003-0015-9671
    affiliation: 18
  - name: Rebecca Younes
+   Orcid: 0000-0002-5105-1401
    affiliation: 4
 affiliations:
  - name: University of Florida, Gainesville, Florida, US
@@ -125,20 +127,20 @@ bibliography: paper.bib
 # Summary
 
 VIVO [Pronunciation: vee-voh] is member-supported, enterprise open source 
-software and an ontology for representing scholarship.  VIVO supports recording, editing, 
+software and an ontology for representing scholarship. VIVO supports recording, editing, 
 searching, browsing and visualizing scholarly activity. VIVO encourages research 
-discovery, expert finding, network analysis and assessment of research impact.  
-VIVO is easily extended to support additional domains of scholarly activity.
+discovery, expert finding, network analysis and assessment of research impact. 
+VIVO is easily extended to support additional domains of scholarly activity [@borner_vivo:_2012].
 
 VIVO uses an ontology to represent people, papers, grants, projects, datasets, resources,
-and other elements of research and scholarship as linked open data.  The ontology can
-be used to create RDF that can be loaded into VIVO.  VIVO RDF data is easily exported for
+and other elements of research and scholarship as linked open data. The ontology can
+be used to create RDF that can be loaded into VIVO. VIVO RDF data is easily exported for
 use in other applications.
 
-VIVO includes Vitro, a domain-free engine for managing linked open data, the JFact 
-reasoner, SolR for search, SPARQL query, Jena as a triple store, supporting both TDB 
-and SDB on MySQL, uses D3 for visualizations, and provides multiple APIs, including
-Triple Pattern Fragments for rapid remote access to specified data.
+VIVO includes Vitro [@about_vitro:2018], a domain-free engine for managing linked open data, the JFact 
+reasoner [@jfact_2018], SolR [@solr_2018] for search, SPARQL query [@sparql_2018], Jena as a triple store [@jena_2018], supporting both TDB [@jena_tdb_2018] 
+and SDB [@jena_sdb_2018] on MySQL [@mysql_2018], uses D3 [@bostock_d3_2018] for visualizations, and provides multiple APIs, including
+Triple Pattern Fragments [@verborgh_triple_2016] for rapid remote access to specified data.
 
 Using VIVO, organizations can represent the activities and accomplishments of their 
 scholars as linked open data, and share that data with others.
@@ -146,12 +148,12 @@ scholars as linked open data, and share that data with others.
 # Acknowledgements
 
 The authors wish to acknowledge the foundational work done on VIVO, and VIVO concepts by 
-the team at the Mann Agricultural Library, Cornell University, led by Jon Corson-Rikert.  
+the team at the Mann Agricultural Library, Cornell University, led by Jon Corson-Rikert. 
 The authors also wish to acknowledge NIH grant 1U24RR029822-01 to the first author, which 
 funded the work of more than 120 co-investigators in the further development of the 
-VIVO software, and NIH grant xxxxxxx to Dr. Melissa Haendel of Oregon Health Science 
-University which funded significant advances in the VIVO Integrated Semantic Framework, 
-which VIVO uses to represent scholarship.  Finally, the authors wish to acknowledge the 
+VIVO software, and to Dr. Melissa Haendel of Oregon Health Science 
+University for her significant advances in the VIVO Integrated Semantic Framework [@vivo-isf-ontology:_2018], 
+which VIVO uses to represent scholarship. Finally, the authors wish to acknowledge the 
 many hundreds of members of the VIVO community around the world, who volunteer their 
 time and effort to advance the art of representing scholarship as linked open data. The 
 work described here builds on the work of many others.

From 3d08253c47db96378e73476c5c8b3e6abb527de9 Mon Sep 17 00:00:00 2001
From: hauschke <christian.hauschke@tib.eu>
Date: Mon, 15 Jul 2019 16:28:53 +0200
Subject: [PATCH 19/24] Update paper.bib (#132)

Added dates to websites according the respective website, checked links, updated urldates, added "author = {VIVO Project}" to the references of "About Vitro" and "VIVO-ISF-Ontology", changes "Vivo-isf-ontology" to "VIVO-ISF-Ontology".
---
 paper/paper.bib | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/paper/paper.bib b/paper/paper.bib
index 278d7f9901..5540448811 100644
--- a/paper/paper.bib
+++ b/paper/paper.bib
@@ -14,20 +14,23 @@ @book{borner_vivo:_2012
 }
 
 @misc{vivo-isf-ontology:_2018,
-	title = {vivo-isf-ontology: {The} "{VIVO}-{ISF} {Ontology}" is an {OWL}2 representation of the {VIVO}-{ISF} {Data} {Standard}},
-	shorttitle = {vivo-isf-ontology},
+        author = {VIVO Project},
+	title = {VIVO-ISF-ontology: {The} "{VIVO}-{ISF} {Ontology}" is an {OWL}2 representation of the {VIVO}-{ISF} {Data} {Standard}},
+	shorttitle = {VIVO-ISF-Ontology},
 	url = {https://github.com/openrif/vivo-isf-ontology},
-	urldate = {2018-07-14},
+	urldate = {2019-07-15},
 	publisher = {OpenRIF},
 	month = apr,
-	year = {2018},
+	year = 2018,
 	note = {original-date: 2014-09-08T21:40:43Z}
 }
 
 @misc{about_vitro:2018,
+        author = {VIVO Project},
 	title = {About {Vitro} {\textbar} {VIVO}},
 	url = {http://vivoweb.org/info/about-vitro},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2019,
 }
 
 @article{verborgh_triple_2016,
@@ -50,49 +53,57 @@ @article{verborgh_triple_2016
 @misc{jfact_2018,
 	title = {{JFact} {DL} {Reasoner}},
 	url = {http://jfact.sourceforge.net/},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2018
 }
 
 @misc{solr_2018,
 	title = {Apache {Solr} -},
 	url = {http://lucene.apache.org/solr/},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2019
 }
 
 @misc{sparql_2018,
 	title = {{SPARQL} {Query} {Language} for {RDF}},
 	url = {https://www.w3.org/TR/rdf-sparql-query/},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2008
 }
 
 @misc{jena_2018,
 	title = {Apache {Jena} -},
 	url = {https://jena.apache.org/},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2011
 }
 
 @misc{jena_tdb_2018,
 	title = {Apache {Jena} - {Apache} {Jena} - {TDB}},
 	url = {https://jena.apache.org/documentation/tdb/},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2019
 }
 
 @misc{jena_sdb_2018,
 	title = {Apache {Jena} - {SDB} - persistent triple stores using relational databases},
 	url = {https://jena.apache.org/documentation/sdb/index.html},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2019
 }
 
 @misc{mysql_2018,
 	title = {{MySQL}},
 	url = {https://www.mysql.com/},
-	urldate = {2018-07-20}
+	urldate = {2019-07-15}
+	year = 2019
 }
 
 @misc{bostock_d3_2018,
 	title = {D3.js - {Data}-{Driven} {Documents}},
 	url = {https://d3js.org/},
 	abstract = {D3 is a JavaScript library for visualizing data with HTML, SVG, and CSS.},
-	urldate = {2018-07-20},
-	author = {Bostock, Mike}
+	urldate = {2019-07-15},
+	author = {Bostock, Mike},
+	year = 2015
 }

From 05ba04df9e4e66a97b6713a1c507f9c5d3f128d7 Mon Sep 17 00:00:00 2001
From: hauschke <christian.hauschke@tib.eu>
Date: Mon, 15 Jul 2019 18:20:22 +0200
Subject: [PATCH 20/24] Update paper.bib (#133)

deleted comma
---
 paper/paper.bib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper/paper.bib b/paper/paper.bib
index 5540448811..d30048e60e 100644
--- a/paper/paper.bib
+++ b/paper/paper.bib
@@ -30,7 +30,7 @@ @misc{about_vitro:2018
 	title = {About {Vitro} {\textbar} {VIVO}},
 	url = {http://vivoweb.org/info/about-vitro},
 	urldate = {2019-07-15}
-	year = 2019,
+	year = 2019
 }
 
 @article{verborgh_triple_2016,

From 89bdf160089737c61082b8da8b3ff05868316669 Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@users.noreply.github.com>
Date: Wed, 24 Jul 2019 17:15:48 +0100
Subject: [PATCH 21/24] Update paper.bib (#134)

---
 paper/paper.bib | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/paper/paper.bib b/paper/paper.bib
index d30048e60e..96eced32fd 100644
--- a/paper/paper.bib
+++ b/paper/paper.bib
@@ -29,7 +29,7 @@ @misc{about_vitro:2018
         author = {VIVO Project},
 	title = {About {Vitro} {\textbar} {VIVO}},
 	url = {http://vivoweb.org/info/about-vitro},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2019
 }
 
@@ -53,49 +53,49 @@ @article{verborgh_triple_2016
 @misc{jfact_2018,
 	title = {{JFact} {DL} {Reasoner}},
 	url = {http://jfact.sourceforge.net/},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2018
 }
 
 @misc{solr_2018,
 	title = {Apache {Solr} -},
 	url = {http://lucene.apache.org/solr/},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2019
 }
 
 @misc{sparql_2018,
 	title = {{SPARQL} {Query} {Language} for {RDF}},
 	url = {https://www.w3.org/TR/rdf-sparql-query/},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2008
 }
 
 @misc{jena_2018,
 	title = {Apache {Jena} -},
 	url = {https://jena.apache.org/},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2011
 }
 
 @misc{jena_tdb_2018,
 	title = {Apache {Jena} - {Apache} {Jena} - {TDB}},
 	url = {https://jena.apache.org/documentation/tdb/},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2019
 }
 
 @misc{jena_sdb_2018,
 	title = {Apache {Jena} - {SDB} - persistent triple stores using relational databases},
 	url = {https://jena.apache.org/documentation/sdb/index.html},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2019
 }
 
 @misc{mysql_2018,
 	title = {{MySQL}},
 	url = {https://www.mysql.com/},
-	urldate = {2019-07-15}
+	urldate = {2019-07-15},
 	year = 2019
 }
 

From c0ad14b734ca329e9ae5d234f59078992a1511ba Mon Sep 17 00:00:00 2001
From: Andrew Woods <awoods@duraspace.org>
Date: Thu, 25 Jul 2019 06:49:59 -0400
Subject: [PATCH 22/24] Create initial format style enforcement (#127)

- All rules are initially suppressed

Resolves: https://jira.duraspace.org/browse/VIVO-1692
---
 pom.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/pom.xml b/pom.xml
index eee33cf97b..049d8650db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,6 +314,54 @@
                     <stagingDirectory>${stagingBase}/vivo/${project.version}</stagingDirectory>
                 </configuration>
             </plugin>
+
+            <!-- Used to validate all code style rules in source code using Checkstyle -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>verify-style</id>
+                        <!-- Bind to verify so it runs after package & unit tests, but before install -->
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <configLocation>
+                      duraspace-checkstyle/checkstyle.xml
+                    </configLocation>
+                    <suppressionsLocation>
+                      vitro-checkstyle/checkstyle-suppressions.xml
+                    </suppressionsLocation>
+                    <encoding>UTF-8</encoding>
+                    <consoleOutput>true</consoleOutput>
+                    <logViolationsToConsole>true</logViolationsToConsole>
+                    <failOnViolation>true</failOnViolation>
+                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                </configuration>
+                <dependencies>
+                    <!-- Override dependencies to use latest version of checkstyle -->
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>8.18</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.duraspace</groupId>
+                        <artifactId>codestyle</artifactId>
+                        <version>1.0.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.vivoweb</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>1.11.0-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>

From 0a08c2890d570a0168d5b01fc5fd40ad008fca33 Mon Sep 17 00:00:00 2001
From: Ralph O'Flinn <roflinn@users.noreply.github.com>
Date: Fri, 2 Aug 2019 12:20:31 -0500
Subject: [PATCH 23/24] VIVO-1614 - Update to allow the TPF API to be toggled
 via the runtime.properties. (#136)

* Update to allow the TPF API to be toggled via the runtime.properties.

Resolves: https://jira.duraspace.org/browse/VIVO-1614
---
 home/src/main/resources/config/example.runtime.properties | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties
index 03561d6633..af7459a3e4 100644
--- a/home/src/main/resources/config/example.runtime.properties
+++ b/home/src/main/resources/config/example.runtime.properties
@@ -374,3 +374,9 @@ Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Ro
     http://xmlns.com/foaf/0.1/Organization, foaf:Organization; \
     http://xmlns.com/foaf/0.1/Person, foaf:Person; \
     http://purl.obolibrary.org/obo/IAO_0000030, obo:IAO_0000030
+
+
+# Triple pattern fragments is a very fast, very simple means for querying a triple store.
+# The triple pattern fragments API in VIVO puts little load on the server, providing a simple means for getting data from the triple store. The API has a web interface for manual use, can be used from the command line via curl, and can be used by programs.
+
+# tpf.activeFlag = true

From f597b7ee427b5311f15b962acf3ab1eb3d741652 Mon Sep 17 00:00:00 2001
From: Graham Triggs <graham.triggs@tib.eu>
Date: Thu, 8 Aug 2019 15:15:17 +0100
Subject: [PATCH 24/24] [VIVO-1415] Add publication claiming from PubMed and
 CrossRef (#129)

* Claiming interface for DOI and PMID
* Allow http://doi.org urls in the claim process
* Make button i18n compliant
* Check Editor already claimed, error for no citation, PUMCIDs fixed
* Fixed gnarly DOI containing semi-colon (removed semi-colon as separator), match more DOI formats internally, improve AUTH restrictions
* Add Wilma themes
* Add permissions to allow proxy editors
* Update DOI resolver URI for content negotiation
* CSS changes to prevent layout problems in admin pages
* Add selectable list of publication types on import

Resolves to https://jira.duraspace.org/browse/VIVO-1415
---
 ...IVOIndividualResponseBuilderExtension.java |    8 +
 .../CreateAndLinkResourceController.java      | 1922 +++++++++++++++++
 .../webapp/createandlink/Citation.java        |   79 +
 .../createandlink/CiteprocJSONModel.java      |  139 ++
 .../webapp/createandlink/ContributorRole.java |   19 +
 .../CreateAndLinkResourceProvider.java        |   15 +
 .../createandlink/CreateAndLinkUtils.java     |   34 +
 .../createandlink/ExternalIdentifiers.java    |    9 +
 .../webapp/createandlink/ResourceModel.java   |   46 +
 .../crossref/CrossrefCiteprocJSONModel.java   |  191 ++
 ...CrossrefCreateAndLinkResourceProvider.java |  115 +
 .../crossref/CrossrefNativeAPI.java           |  368 ++++
 .../crossref/CrossrefResolverAPI.java         |  392 ++++
 .../PubMedCreateAndLinkResourceProvider.java  |  377 ++++
 .../createandlink/utils/HttpReader.java       |   35 +
 .../utils/StringArrayDeserializer.java        |   35 +
 .../config/example.runtime.properties         |   14 +-
 .../src/main/webapp/i18n/vivo_all.properties  |   52 +
 .../webapp/images/createAndLink/error.png     |  Bin 0 -> 2997 bytes
 .../main/webapp/images/createAndLink/tick.png |  Bin 0 -> 7443 bytes
 .../createAndLinkResourceConfirm.ftl          |  111 +
 .../createAndLinkResourceEnterID.ftl          |   35 +
 .../unauthorizedForProfile.ftl                |    1 +
 .../createAndLinkResource/unknownProfile.ftl  |    2 +
 .../unknownResourceType.ftl                   |    2 +
 .../tenderfoot/css/page-createAndLink.css     |   82 +
 .../webapp/themes/tenderfoot/css/screen.css   |    1 +
 .../individual/individual--foaf-person.ftl    |   22 +-
 .../themes/wilma/css/page-createAndLink.css   |   82 +
 .../main/webapp/themes/wilma/css/screen.css   |    1 +
 .../templates/individual--foaf-person.ftl     |   17 +
 31 files changed, 4197 insertions(+), 9 deletions(-)
 create mode 100644 api/src/main/java/org/vivoweb/webapp/controller/freemarker/CreateAndLinkResourceController.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/Citation.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/CiteprocJSONModel.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/ContributorRole.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkResourceProvider.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkUtils.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/ExternalIdentifiers.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/ResourceModel.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCiteprocJSONModel.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCreateAndLinkResourceProvider.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefNativeAPI.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefResolverAPI.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/pubmed/PubMedCreateAndLinkResourceProvider.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/utils/HttpReader.java
 create mode 100644 api/src/main/java/org/vivoweb/webapp/createandlink/utils/StringArrayDeserializer.java
 create mode 100644 webapp/src/main/webapp/images/createAndLink/error.png
 create mode 100644 webapp/src/main/webapp/images/createAndLink/tick.png
 create mode 100644 webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceConfirm.ftl
 create mode 100644 webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceEnterID.ftl
 create mode 100644 webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unauthorizedForProfile.ftl
 create mode 100644 webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownProfile.ftl
 create mode 100644 webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownResourceType.ftl
 create mode 100644 webapp/src/main/webapp/themes/tenderfoot/css/page-createAndLink.css
 create mode 100644 webapp/src/main/webapp/themes/wilma/css/page-createAndLink.css

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java
index da71d86d55..3615c2662b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/VIVOIndividualResponseBuilderExtension.java
@@ -2,6 +2,7 @@
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import org.vivoweb.webapp.controller.freemarker.CreateAndLinkResourceController;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -24,6 +25,13 @@ public void contextDestroyed(ServletContextEvent sce) {
     public void addOptions(VitroRequest vreq, Map<String, Object> body) {
         addAltMetricOptions(vreq, body);
         addPlumPrintOptions(vreq, body);
+        addEnabledClaimingSources(vreq, body);
+    }
+
+    private void addEnabledClaimingSources(VitroRequest vreq, Map<String, Object> body) {
+        ConfigurationProperties props = ConfigurationProperties.getBean(vreq);
+        body.put("claimSources", CreateAndLinkResourceController.getEnabledProviders(props));
+
     }
 
     private void addAltMetricOptions(VitroRequest vreq, Map<String, Object> body) {
diff --git a/api/src/main/java/org/vivoweb/webapp/controller/freemarker/CreateAndLinkResourceController.java b/api/src/main/java/org/vivoweb/webapp/controller/freemarker/CreateAndLinkResourceController.java
new file mode 100644
index 0000000000..e531452188
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/controller/freemarker/CreateAndLinkResourceController.java
@@ -0,0 +1,1922 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.controller.freemarker;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+import edu.cornell.mannlib.vitro.webapp.dao.NewURIMakerVitro;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.ResIterator;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
+import org.vivoweb.webapp.createandlink.Citation;
+import org.vivoweb.webapp.createandlink.CreateAndLinkResourceProvider;
+import org.vivoweb.webapp.createandlink.CreateAndLinkUtils;
+import org.vivoweb.webapp.createandlink.ExternalIdentifiers;
+import org.vivoweb.webapp.createandlink.ResourceModel;
+import org.vivoweb.webapp.createandlink.crossref.CrossrefCreateAndLinkResourceProvider;
+import org.vivoweb.webapp.createandlink.pubmed.PubMedCreateAndLinkResourceProvider;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_LITERAL;
+import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_PREDICATE;
+import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_URI;
+
+/**
+ * Main controller class for claiming (creating and/or linking) resources to a profile
+ */
+@WebServlet(name = "CreateAndLinkResource", urlPatterns = {"/createAndLink/*"} )
+public class CreateAndLinkResourceController extends FreemarkerHttpServlet {
+    // Must be able to edit your own account to claim publications
+    public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.EDIT_OWN_ACCOUNT.ACTION;
+
+    // Mappings for publication type to ontology types / classes
+    private static final Map<String, String> typeToClassMap = new HashMap<>();
+
+    // Providers for resolving ids in different resource providers (e.g. CrossRef, PubMed)
+    private static final Map<String, CreateAndLinkResourceProvider> providers = new HashMap<>();
+
+    private static boolean providersRegistered = false;
+
+    /**
+     * URIs of types and predicates in the VIVO ontology that we need for creating resources
+     */
+    public static final String BIBO_ABSTRACT = "http://purl.org/ontology/bibo/abstract";
+    public static final String BIBO_ARTICLE = "http://purl.org/ontology/bibo/Article";
+    public static final String BIBO_BOOK = "http://purl.org/ontology/bibo/Book";
+    public static final String BIBO_DOI = "http://purl.org/ontology/bibo/doi";
+    public static final String BIBO_ISBN10 = "http://purl.org/ontology/bibo/isbn10";
+    public static final String BIBO_ISBN13 = "http://purl.org/ontology/bibo/isbn13";
+    public static final String BIBO_ISSN = "http://purl.org/ontology/bibo/issn";
+    public static final String BIBO_ISSUE = "http://purl.org/ontology/bibo/issue";
+    public static final String BIBO_JOURNAL = "http://purl.org/ontology/bibo/Journal";
+    public static final String BIBO_PAGE_COUNT = "http://purl.org/ontology/bibo/numPages";
+    public static final String BIBO_PAGE_END = "http://purl.org/ontology/bibo/pageEnd";
+    public static final String BIBO_PAGE_START = "http://purl.org/ontology/bibo/pageStart";
+    public static final String BIBO_PMID = "http://purl.org/ontology/bibo/pmid";
+    public static final String BIBO_VOLUME = "http://purl.org/ontology/bibo/volume";
+
+    public static final String FOAF_FIRSTNAME = "http://xmlns.com/foaf/0.1/firstName";
+    public static final String FOAF_LASTNAME = "http://xmlns.com/foaf/0.1/lastName";
+
+    public static final String OBO_CONTACT_INFO_FOR = "http://purl.obolibrary.org/obo/ARG_2000029";
+    public static final String OBO_HAS_CONTACT_INFO = "http://purl.obolibrary.org/obo/ARG_2000028";
+
+    public static final String OBO_INHERES_IN = "http://purl.obolibrary.org/obo/RO_0000052";
+    public static final String OBO_BEARER_OF  = "http://purl.obolibrary.org/obo/RO_0000053";
+
+    public static final String RDFS_LABEL = "http://www.w3.org/2000/01/rdf-schema#label";
+
+    public static final String VIVO_AUTHORSHIP = "http://vivoweb.org/ontology/core#Authorship";
+    public static final String VIVO_DATETIME = "http://vivoweb.org/ontology/core#dateTime";
+    public static final String VIVO_DATETIMEPRECISION = "http://vivoweb.org/ontology/core#dateTimePrecision";
+    public static final String VIVO_DATETIMEVALUE = "http://vivoweb.org/ontology/core#dateTimeValue";
+    public static final String VIVO_EDITORSHIP = "http://vivoweb.org/ontology/core#Editorship";
+    public static final String VIVO_HASPUBLICATIONVENUE = "http://vivoweb.org/ontology/core#hasPublicationVenue";
+    public static final String VIVO_PMCID = "http://vivoweb.org/ontology/core#pmcid";
+    public static final String VIVO_PUBLICATIONVENUEFOR = "http://vivoweb.org/ontology/core#publicationVenueFor";
+    public static final String VIVO_PUBLISHER = "http://vivoweb.org/ontology/core#publisher";
+    public static final String VIVO_PUBLISHER_CLASS = "http://vivoweb.org/ontology/core#Publisher";
+    public static final String VIVO_PUBLISHER_OF = "http://vivoweb.org/ontology/core#publisherOf";
+    public static final String VIVO_RANK = "http://vivoweb.org/ontology/core#rank";
+    public static final String VIVO_RELATEDBY = "http://vivoweb.org/ontology/core#relatedBy";
+    public static final String VIVO_RELATES = "http://vivoweb.org/ontology/core#relates";
+
+    public static final String VCARD_FAMILYNAME = "http://www.w3.org/2006/vcard/ns#familyName";
+    public static final String VCARD_GIVENNAME = "http://www.w3.org/2006/vcard/ns#givenName";
+    public static final String VCARD_HAS_NAME = "http://www.w3.org/2006/vcard/ns#hasName";
+    public static final String VCARD_HAS_URL = "http://www.w3.org/2006/vcard/ns#hasURL";
+    public static final String VCARD_INDIVIDUAL = "http://www.w3.org/2006/vcard/ns#Individual";
+    public static final String VCARD_KIND = "http://www.w3.org/2006/vcard/ns#Kind";
+    public static final String VCARD_NAME = "http://www.w3.org/2006/vcard/ns#Name";
+    public static final String VCARD_URL_CLASS = "http://www.w3.org/2006/vcard/ns#URL";
+    public static final String VCARD_URL_PROPERTY = "http://www.w3.org/2006/vcard/ns#url";
+
+    private static final String PROVIDER_DOI = "doi";
+    private static final String PROVIDER_PMID = "pmid";
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+
+        ServletContext ctx = config.getServletContext();
+        ConfigurationProperties props = ConfigurationProperties.getBean(ctx);
+
+        // One-off initialization of class state
+        // Add recognized publication types to the type map, along with the corresponding ontology URI
+
+        typeToClassMap.put("article", "http://purl.org/ontology/bibo/Article");
+        typeToClassMap.put("article-journal", "http://purl.org/ontology/bibo/AcademicArticle");
+        typeToClassMap.put("book", "http://purl.org/ontology/bibo/Book");
+        typeToClassMap.put("chapter", "http://purl.org/ontology/bibo/Chapter");
+        typeToClassMap.put("dataset", "http://vivoweb.org/ontology/core#Dataset");
+        typeToClassMap.put("figure", "http://purl.org/ontology/bibo/Image");
+        typeToClassMap.put("graphic", "http://purl.org/ontology/bibo/Image");
+        typeToClassMap.put("legal_case", "http://purl.org/ontology/bibo/LegalCaseDocument");
+        typeToClassMap.put("legislation", "http://purl.org/ontology/bibo/Legislation");
+        typeToClassMap.put("manuscript", "http://purl.org/ontology/bibo/Manuscript");
+        typeToClassMap.put("map", "http://purl.org/ontology/bibo/Map");
+        typeToClassMap.put("musical_score", "http://vivoweb.org/ontology/core#Score");
+        typeToClassMap.put("paper-conference", "http://vivoweb.org/ontology/core#ConferencePaper");
+        typeToClassMap.put("patent", "http://purl.org/ontology/bibo/Patent");
+        typeToClassMap.put("personal_communication", "http://purl.org/ontology/bibo/PersonalCommunicationDocument");
+        typeToClassMap.put("post-weblog", "http://vivoweb.org/ontology/core#BlogPosting");
+        typeToClassMap.put("report", "http://purl.org/ontology/bibo/Report");
+        typeToClassMap.put("review", "http://vivoweb.org/ontology/core#Review");
+        typeToClassMap.put("speech", "http://vivoweb.org/ontology/core#Speech");
+        typeToClassMap.put("thesis", "http://purl.org/ontology/bibo/Thesis");
+        typeToClassMap.put("webpage", "http://purl.org/ontology/bibo/Webpage");
+
+        // Populate the registry of resource providers
+        registerProviders(props);
+    }
+
+    public static Set<String> getEnabledProviders(ConfigurationProperties props) {
+        if (!providersRegistered) {
+            registerProviders(props);
+        }
+
+        return providers.keySet();
+    }
+
+    public static synchronized  void registerProviders(ConfigurationProperties props) {
+        if (!providersRegistered) {
+            String provStr = props.getProperty("createAndLink.providers", "doi, pmid");
+            if (!StringUtils.isEmpty(provStr)) {
+                String[] provArr = provStr.split("[,]");
+                for (String provId : provArr) {
+                    if (PROVIDER_DOI.equalsIgnoreCase(provId.trim())) {
+                        providers.put(PROVIDER_DOI,  new CrossrefCreateAndLinkResourceProvider());
+                    } else if (PROVIDER_PMID.equalsIgnoreCase(provId.trim())) {
+                        providers.put(PROVIDER_PMID, new PubMedCreateAndLinkResourceProvider());
+                    }
+                }
+            }
+
+            providersRegistered = true;
+        }
+    }
+
+    /**
+     * Ensure that we can only be called if the user has the correct permissions
+     *
+     * @param vreq
+     * @return
+     */
+    @Override
+    protected AuthorizationRequest requiredActions(VitroRequest vreq) {
+        return REQUIRED_ACTIONS;
+    }
+
+    /**
+     * Main method for the resource claiming (create and link) workflow
+     *
+     * @param vreq
+     * @return
+     */
+    @Override
+    protected ResponseValues processRequest(VitroRequest vreq) {
+        // Get the current URL for parsing
+        String requestURI = vreq.getRequestURI();
+
+        CreateAndLinkResourceProvider provider = null;
+
+        // First part of URL path after /createAndLink/ is used to identify the resource type (DOI, PubMed ID, etc)
+        String externalProvider = null;
+        int typePos = requestURI.indexOf("/createAndLink/") + 15;
+        if (typePos < requestURI.length()) {
+            if (requestURI.indexOf('/', typePos) > typePos) {
+                externalProvider = requestURI.substring(typePos, requestURI.indexOf('/', typePos) - 1);
+            } else {
+                externalProvider = requestURI.substring(typePos);
+            }
+
+            // Normalize the resource type key, and get the appropriate provider
+            externalProvider = externalProvider.trim().toLowerCase();
+            if (providers.containsKey(externalProvider)) {
+                provider = providers.get(externalProvider);
+            }
+        }
+
+        // If no provider was found (invalid path), return an error to the user
+        if (provider == null) {
+            return new TemplateResponseValues("unknownResourceType.ftl");
+        }
+
+        // Obtain the DAO for getting an individual (that represents a person profile)
+        IndividualDao individualDao = vreq.getWebappDaoFactory().getIndividualDao();
+        Individual person = null;
+
+        // If a person profile URI has been passed as a paremeter, ensure that the individual exists
+        String profileUri = vreq.getParameter("profileUri");
+        if (!StringUtils.isEmpty(profileUri)) {
+            person = individualDao.getIndividualByURI(profileUri);
+        }
+
+        boolean isProfileUriForLoggedIn = false;
+
+        // Get the currently logged in user
+        UserAccount loggedInAccount = LoginStatusBean.getCurrentUser(vreq);
+        SelfEditingConfiguration sec = SelfEditingConfiguration.getBean(vreq);
+
+        // Find the profile(s) associated with this user
+        List<Individual> assocInds = sec.getAssociatedIndividuals(vreq.getWebappDaoFactory().getIndividualDao(), loggedInAccount.getExternalAuthId());
+        if (!assocInds.isEmpty()) {
+            if (person == null) {
+                // If we have associated profiles, ensure that a valid person profile really does exist
+                profileUri = assocInds.get(0).getURI();
+                if (!StringUtils.isEmpty(profileUri)) {
+                    person = individualDao.getIndividualByURI(profileUri);
+                    isProfileUriForLoggedIn = true;
+                }
+            } else if (!StringUtils.isEmpty(profileUri)){
+                for (Individual ind : assocInds) {
+                    if (ind.getURI().equalsIgnoreCase(profileUri)) {
+                        isProfileUriForLoggedIn = true;
+                    }
+                }
+            }
+        }
+
+        // If we still haven't got a person, return an error to the user
+        if (person == null) {
+            return new TemplateResponseValues("unknownProfile.ftl");
+        }
+
+        // If the profile isn't associated with the logged in user
+        if (!isProfileUriForLoggedIn) {
+            // Check that we have back end editing priveleges
+            if (!PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.DO_BACK_END_EDITING.ACTION)) {
+                // If all else fails, can we add statements to this individual?
+                AddDataPropertyStatement adps = new AddDataPropertyStatement(vreq.getJenaOntModel(), profileUri, SOME_URI, SOME_LITERAL);
+                AddObjectPropertyStatement aops = new AddObjectPropertyStatement(vreq.getJenaOntModel(), profileUri, SOME_PREDICATE, SOME_URI);
+                if (!PolicyHelper.isAuthorizedForActions(vreq, adps.or(aops))) {
+                    return new TemplateResponseValues("unauthorizedForProfile.ftl");
+                }
+            }
+        }
+
+            // Create a map of common values to pass to the templates
+        Map<String, Object> templateValues = new HashMap<>();
+        templateValues.put("link", profileUri);
+        templateValues.put("label", provider.getLabel());
+        templateValues.put("provider", externalProvider);
+        templateValues.put("profileUri", profileUri);
+        templateValues.put("personLabel",    person.getRdfsLabel());
+        templateValues.put("personThumbUrl", person.getThumbUrl());
+
+        // Get the requested action (e.g. find, confirm)
+        String action = vreq.getParameter("action");
+        if (action == null) {
+            action = "";
+        }
+
+        String externalIdsToFind = null;
+
+        // If the user has pressed a "confirm" button
+        if ("confirmID".equals(action)) {
+            // Get all of the external IDs represented on the page
+            String[] externalIds = vreq.getParameterValues("externalId");
+
+            // Check that we have IDs to process
+            if (!ArrayUtils.isEmpty(externalIds)) {
+                // Create a holder for statements already in the triple store, and another for the changes
+                Model existingModel = ModelFactory.createDefaultModel();
+                Model updatedModel = ModelFactory.createDefaultModel();
+
+                // Loop through each external ID that was on the page
+                for (String externalId : externalIds) {
+                    // Get the normalized ID from the resource provider
+                    externalId = provider.normalize(externalId);
+
+                    // Ensure that we have an ID
+                    if (!StringUtils.isEmpty(externalId)) {
+                        // Check that the user is claiming a relationship to the resource
+                        if (!"notmine".equalsIgnoreCase(vreq.getParameter("contributor" + externalId))) {
+                            // If we are processing a resource that is already in VIVO, get the Vivo URI from the form
+                            String vivoUri = vreq.getParameter("vivoUri" + externalId);
+
+                            // If we don't already know that the resource has been created in VIVO
+                            if (StringUtils.isEmpty(vivoUri)) {
+                                // Check that it hasn't been created since when we first rendered the page
+                                ExternalIdentifiers allExternalIds = provider.allExternalIDsForFind(externalId);
+                                vivoUri = findInVIVO(vreq, allExternalIds, profileUri, null);
+                            }
+
+                            // If we haven't got an existing VIVO resource by this point, create it
+                            if (StringUtils.isEmpty(vivoUri)) {
+                                ResourceModel resourceModel = null;
+
+                                // Get the publication type from the form
+                                String typeUri = vreq.getParameter("type" + externalId);
+
+                                // Get the appropriate resource provider for the external ID from the form
+                                String resourceProvider = vreq.getParameter("externalProvider" + externalId);
+
+                                // Get an intermediate ResourceModel from the provider
+                                if (providers.containsKey(resourceProvider)) {
+                                    resourceModel = providers.get(resourceProvider).makeResourceModel(externalId, vreq.getParameter("externalResource" + externalId));
+                                } else {
+                                    resourceModel = provider.makeResourceModel(externalId, vreq.getParameter("externalResource" + externalId));
+                                }
+
+                                // If we have an intermediate model, create the VIVO representation from the model
+                                if (resourceModel != null) {
+                                    vivoUri = createVIVOObject(vreq, updatedModel, resourceModel, typeUri);
+                                }
+                            } else {
+                                // Get the existing statements for the model, and add them to the both in-memory models
+                                Model existingResourceModel = getExistingResource(vreq, vivoUri);
+                                existingModel.add(existingResourceModel);
+                                updatedModel.add(existingResourceModel);
+                            }
+
+                            // Process the user's chosen relationship with the resource, updating the updated model
+                            processRelationships(vreq, updatedModel, vivoUri, profileUri, vreq.getParameter("contributor" + externalId));
+                        }
+                    }
+                }
+
+                // Finished processing confirmation, write the differences between the existing and updated model
+                writeChanges(vreq.getRDFService(), existingModel, updatedModel);
+            }
+
+            // Get any IDs that have not yet been processed from the form
+            externalIdsToFind = vreq.getParameter("remainderIds");
+
+            // If There are no IDs left to process, go back to the entry screen
+            if (StringUtils.isEmpty(externalIdsToFind)) {
+                templateValues.put("showConfirmation", true);
+                return new TemplateResponseValues("createAndLinkResourceEnterID.ftl", templateValues);
+            }
+        } else if ("findID".equals(action)) {
+            // User has pressed a "findID" button - e.g. has entered IDs of resources on the initial entry screen
+            externalIdsToFind = vreq.getParameter("externalIds");
+        }
+
+        // If we have external IDs to find (either directly from the entry form, or unprocessed from a long list)
+        if (!StringUtils.isEmpty(externalIdsToFind)) {
+            Set<String> uniqueIds = new HashSet<>();
+            Set<String> remainderIds = new HashSet<>();
+            List<Citation> citations = new ArrayList<>();
+
+            // Split the passed IDs into a parseable array (separated by whitespace, oe comma)
+            String[] externalIdArr = externalIdsToFind.split("[\\s,]+");
+
+            // Go through each identifier
+            for (String externalId : externalIdArr) {
+                // Normalize the identifier, and create a set of unique identifiers (remove duplicates)
+                externalId = provider.normalize(externalId);
+                if (!StringUtils.isEmpty(externalId) && !uniqueIds.contains(externalId)) {
+                    uniqueIds.add(externalId);
+                }
+            }
+
+            int idCount = 0;
+            // Loop through all the unique identifiers
+            for (String externalId : uniqueIds) {
+                // If we've already processed 5 or more identifiers
+                if (idCount > 4) {
+                    // Add the identifier to the remainder list to be processed on the next page
+                    remainderIds.add(externalId);
+                } else {
+                    // Prepare a citation object for this identifier
+                    Citation citation = new Citation();
+                    citation.externalId = externalId;
+
+                    // First, resolve all known identifiers for the identifier processed
+                    ExternalIdentifiers allExternalIds = provider.allExternalIDsForFind(externalId);
+
+                    // Try to find an existing resource that has one of the known external identifiers
+                    // Note, this will populate the citation object if it exists
+                    citation.vivoUri = findInVIVO(vreq, allExternalIds, profileUri, citation);
+
+                    // If we did not find a resource in VIVO
+                    if (StringUtils.isEmpty(citation.vivoUri)) {
+                        // If we have a DOI for the resource, first attempt to find the metadata via DOI
+                        if (!StringUtils.isEmpty(allExternalIds.DOI)) {
+                            CreateAndLinkResourceProvider doiProvider = providers.get("doi");
+                            if (doiProvider != null) {
+                                // Attempt to find the DOI in via the doi resource provider (fills the citation object)
+                                citation.externalResource = doiProvider.findInExternal(allExternalIds.DOI, citation);
+
+                                // If we were successful, record that the record was looked up via DOI
+                                if (!StringUtils.isEmpty(citation.externalResource)) {
+                                    citation.externalProvider = "doi";
+                                }
+                            }
+                        }
+
+                        // Did not resolve the resource via DOI, so look in the provider for the original identifier
+                        if (StringUtils.isEmpty(citation.externalResource)) {
+                            // Only if the original identifier was not a DOI
+                            if (!"doi".equalsIgnoreCase(externalProvider)) {
+                                citation.externalResource = provider.findInExternal(externalId, citation);
+                                citation.externalProvider = externalProvider;
+                            }
+                        }
+                    }
+
+                    // Guess which author in the available metadata is the user claiming the work
+                    proposeAuthorToLink(vreq, citation, profileUri);
+
+                    // Conver the type in the citation to a VIVO type uri for use in the confirmation form
+                    citation.typeUri = typeToClassMap.getOrDefault(citation.type, BIBO_ARTICLE);
+
+                    // If we have found a citation, add it to the list of citations to display
+                    if (citation.vivoUri != null || citation.externalResource != null) {
+                        citations.add(citation);
+
+                        // Increment the count of processed identifiers
+                        idCount++;
+                    } else {
+                        citation.showError = true;
+                        citations.add(citation);
+                    }
+                }
+            }
+
+            // If we have found records to claim
+            if (citations.size() > 0) {
+                // Add the citations to the values to pass to the template
+                templateValues.put("citations", citations);
+
+                // Add the list of known publication types
+                templateValues.put("publicationTypes", getPublicationTypes(vreq));
+
+                // If there are IDs still left to process, add them to the values passed to the template
+                if (remainderIds.size() > 0) {
+                    templateValues.put("remainderIds", StringUtils.join(remainderIds, "\n"));
+                    templateValues.put("remainderCount", remainderIds.size());
+                }
+
+                // Show the confirmation page for the processed identifiers
+                return new TemplateResponseValues("createAndLinkResourceConfirm.ftl", templateValues);
+            } else {
+                // Nothing to show, so go back to the form, passing an indicator that nothing was found
+                templateValues.put("notfound", true);
+                return new TemplateResponseValues("createAndLinkResourceEnterID.ftl", templateValues);
+            }
+        }
+
+        // Show the entry form for a user to enter a set of identifiers
+        return new TemplateResponseValues("createAndLinkResourceEnterID.ftl", templateValues);
+    }
+
+    private String getFormattedProfileName(VitroRequest vreq, String profileUri) {
+        final Citation.Name name = new Citation.Name();
+
+        name.name = null;
+
+        String vcardQuery = "SELECT ?givenName ?familyName\n" +
+                "WHERE\n" +
+                "{\n" +
+                "  <" + profileUri + "> <" + OBO_HAS_CONTACT_INFO + "> ?vCard .\n" +
+                "  ?vCard <" + VCARD_HAS_NAME + "> ?vCardName .\n" +
+                "  ?vCardName <" + VCARD_FAMILYNAME + "> ?familyName .\n" +
+                "  OPTIONAL { ?vCardName <" + VCARD_GIVENNAME + "> ?givenName . }\n" +
+                "}\n";
+
+        try {
+            // Process the query
+            vreq.getRDFService().sparqlSelectQuery(vcardQuery, new ResultSetConsumer() {
+                @Override
+                protected void processQuerySolution(QuerySolution qs) {
+                    // Get the name(s) from the result set
+                    Literal familyName = qs.contains("familyName") ? qs.getLiteral("familyName") : null;
+                    Literal givenName  = qs.contains("givenName") ? qs.getLiteral("givenName") : null;
+
+                    if (StringUtils.isEmpty(name.name)) {
+                        // If we have a first / last name, create a formatted author string
+                        if (familyName != null) {
+                            if (givenName != null) {
+                                name.name = CreateAndLinkUtils.formatAuthorString(familyName.getString(), givenName.getString());
+                            } else {
+                                name.name = CreateAndLinkUtils.formatAuthorString(familyName.getString(), null);
+                            }
+                        }
+                    }
+                }
+            });
+        } catch (RDFServiceException e) {
+            e.printStackTrace();
+        }
+
+        String foafQuery = "SELECT ?givenName ?familyName\n" +
+                "WHERE\n" +
+                "{\n" +
+                "  <" + profileUri + "> <" + FOAF_LASTNAME + "> ?familyName .\n" +
+                "  OPTIONAL { <" + profileUri + "> <" + FOAF_FIRSTNAME + "> ?givenName . }\n" +
+                "}";
+
+        if (StringUtils.isEmpty(name.name)) {
+            try {
+                // Process the query
+                vreq.getRDFService().sparqlSelectQuery(foafQuery, new ResultSetConsumer() {
+                    @Override
+                    protected void processQuerySolution(QuerySolution qs) {
+                        // Get the name(s) from the result set
+                        Literal familyName = qs.contains("familyName") ? qs.getLiteral("familyName") : null;
+                        Literal givenName  = qs.contains("givenName") ? qs.getLiteral("givenName") : null;
+
+                        if (StringUtils.isEmpty(name.name)) {
+                            // If we have a first / last name, create a formatted author string
+                            if (familyName != null) {
+                                if (givenName != null) {
+                                    name.name = CreateAndLinkUtils.formatAuthorString(familyName.getString(), givenName.getString());
+                                } else {
+                                    name.name = CreateAndLinkUtils.formatAuthorString(familyName.getString(), null);
+                                }
+                            }
+                        }
+                    }
+                });
+            } catch (RDFServiceException e) {
+                e.printStackTrace();
+            }
+        }
+
+        String labelQuery = "SELECT ?label\n" +
+                "WHERE\n" +
+                "{\n" +
+                "  <" + profileUri + "> <" + RDFS_LABEL + "> ?label .\n" +
+                "}\n";
+
+        if (StringUtils.isEmpty(name.name)) {
+            try {
+                // Process the query
+                vreq.getRDFService().sparqlSelectQuery(labelQuery, new ResultSetConsumer() {
+                    @Override
+                    protected void processQuerySolution(QuerySolution qs) {
+                        // Get the name(s) from the result set
+                        Literal label      = qs.contains("label") ? qs.getLiteral("label") : null;
+
+                        String authorStr = null;
+                        if (label != null) {
+                            // If we have a formatted label, normalize it to last name, initials
+                            authorStr = label.getString();
+                            if (authorStr.indexOf(',') > -1) {
+                                int endIdx = authorStr.indexOf(',');
+                                while (endIdx < authorStr.length()) {
+                                    if (Character.isAlphabetic(authorStr.charAt(endIdx))) {
+                                        break;
+                                    }
+                                    endIdx++;
+                                }
+
+                                if (endIdx < authorStr.length()) {
+                                    authorStr = authorStr.substring(0, endIdx + 1);
+                                } else {
+                                    authorStr = authorStr.substring(0, authorStr.indexOf(','));
+                                }
+                            }
+                        }
+
+                        // If we have a formatted author string
+                        if (authorStr != null) {
+                            name.name = authorStr;
+                        }
+
+                    }
+                });
+            } catch (RDFServiceException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return name.name;
+    }
+
+    /**
+     * Method to find an author to propose for linking
+     *
+     * @param vreq
+     * @param citation
+     * @param profileUri
+     */
+    protected void proposeAuthorToLink(VitroRequest vreq, final Citation citation, String profileUri) {
+        // If the resource has no idnetifiers, we have nothing to do
+        if (citation.authors == null) {
+            return;
+        }
+
+        String authorStr = getFormattedProfileName(vreq, profileUri);
+        if (StringUtils.isEmpty(authorStr)) {
+            return;
+        }
+
+        // If we have a formatted author string
+        String authorStrLwr = authorStr.toLowerCase();
+
+        // Find a match for the author string in the resource
+        for (Citation.Name author : citation.authors) {
+            if (author != null && author.name != null) {
+                String nameLwr = author.name.toLowerCase();
+                if (nameLwr.startsWith(authorStrLwr) || authorStrLwr.startsWith(nameLwr)) {
+                    author.proposed = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Find an existing resource in VIVO, and return a Model with the appropriate statements
+     *
+     * @param vreq
+     * @param uri
+     * @return
+     */
+    protected Model getExistingResource(VitroRequest vreq, String uri) {
+        Model model = ModelFactory.createDefaultModel();
+
+        try {
+            String query =
+                    "PREFIX vcard:    <http://www.w3.org/2006/vcard/ns#>\n" +
+                    "PREFIX vivo:     <http://vivoweb.org/ontology/core#>\n" +
+                    "PREFIX obo:     <http://purl.obolibrary.org/obo/>\n" +
+                    "\n" +
+                    "CONSTRUCT\n" +
+                    "{\n" +
+                    "  <" + uri + "> ?pWork ?oWork .\n" +
+                    "  ?sJournal ?pJournal ?oJournal .\n" +
+                    "  ?sDateTime ?pDateTime ?oDateTime .\n" +
+                    "  ?sRel ?pRel ?oRel .\n" +
+                    "  ?sVCard a vcard:Individual .\n" +
+                    "  ?sVCard vcard:hasName ?sVCardName .\n" +
+                    "  ?sVCardName ?pVCardName ?oVCardName .\n" +
+                    "  ?sPerson ?pPerson ?oPerson .\n" +
+                    "}\n" +
+                    "WHERE\n" +
+                    "{\n" +
+                    "  {\n" +
+                    "    <" + uri + "> ?pWork ?oWork .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "    <" + uri + "> vivo:hasPublicationVenue ?sJournal .\n" +
+                    "    ?sJournal ?pJournal ?oJournal .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "    <" + uri + "> vivo:dateTimeValue ?sDateTime .\n" +
+                    "    ?sDateTime ?pDateTime ?oDateTime .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "    <" + uri + "> vivo:relatedBy ?sRel .\n" +
+                    "    ?sRel ?pRel ?oRel .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "    <" + uri + "> vivo:relatedBy ?relationship .\n" +
+                    "    ?relationship ?pRel ?sPerson .\n" +
+                    "    ?sPerson ?pPerson ?oPerson .\n" +
+                    "    FILTER (?sPerson != <" + uri + ">)\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "    <" + uri + "> vivo:relatedBy ?relationship .\n" +
+                    "    ?relationship ?pRel ?sPerson .\n" +
+                    "    ?sPerson obo:ARG_2000028 ?sVCard .\n" +
+                    "    ?sVCard vcard:hasName ?sVCardName .\n" +
+                    "    ?sVCardName ?pVCardName ?oVCardName .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "    <" + uri + "> vivo:relatedBy ?relationship .\n" +
+                    "    ?relationship ?pRel ?sVCard .\n" +
+                    "    ?sVCard vcard:hasName ?sVCardName .\n" +
+                    "    ?sVCardName ?pVCardName ?oVCardName .\n" +
+                    "  }\n" +
+                    "}\n";
+
+            vreq.getRDFService().sparqlConstructQuery(query, model);
+        } catch (RDFServiceException e) {
+        }
+
+        return model;
+    }
+
+    /**
+     * Adjust the in-memory model to create the appropriate relationships for the claimed user role (authorship, editorship, etc)
+     *
+     * @param vreq
+     * @param model
+     * @param vivoUri
+     * @param userUri
+     * @param relationship
+     */
+    protected void processRelationships(VitroRequest vreq, Model model, String vivoUri, String userUri, String relationship) {
+        if (relationship != null) {
+            // If authorship is being claimed
+            if (relationship.startsWith("author")) {
+                // Create an authorship context object
+                Resource authorship = model.createResource(getUnusedUri(vreq));
+                authorship.addProperty(RDF.type, model.getResource(VIVO_AUTHORSHIP));
+
+                // Add the resource and the user as relates predicates of the context
+                authorship.addProperty(model.createProperty(VIVO_RELATES), model.getResource(vivoUri));
+                authorship.addProperty(model.createProperty(VIVO_RELATES), model.getResource(userUri));
+
+                // Add related by predicates to the user and resource, linking to the context
+                model.getResource(vivoUri).addProperty(model.createProperty(VIVO_RELATEDBY), authorship);
+                model.getResource(userUri).addProperty(model.createProperty(VIVO_RELATEDBY), authorship);
+
+                // If the relationship contains an author position
+                if (relationship.length() > 6) {
+                    // Parse out the author position to a numeric rank
+                    String posStr = relationship.substring(6);
+                    int rank = Integer.parseInt(posStr, 10);
+                    // Remove an existing authorship at that rank
+                    removeAuthorship(vreq, model, vivoUri, rank);
+                    try {
+                        // Add the chosen rank to the authorship context created
+                        authorship.addLiteral(model.createProperty(VIVO_RANK), rank);
+                    } catch (NumberFormatException nfe) {
+                    }
+                }
+            } else if (relationship.startsWith("editor")) {
+                // User is claiming editorship
+                Resource editorship = model.createResource(getUnusedUri(vreq));
+                editorship.addProperty(RDF.type, model.getResource(VIVO_EDITORSHIP));
+
+                // Add the resource and the user as relates predicates of the context
+                editorship.addProperty(model.createProperty(VIVO_RELATES), model.getResource(vivoUri));
+                editorship.addProperty(model.createProperty(VIVO_RELATES), model.getResource(userUri));
+
+                // Add related by predicates to the user and resource, linking to the context
+                model.getResource(vivoUri).addProperty(model.createProperty(VIVO_RELATEDBY), editorship);
+                model.getResource(userUri).addProperty(model.createProperty(VIVO_RELATEDBY), editorship);
+            }
+        }
+    }
+
+    /**
+     * Removes an existing authorship at a given position, when that position is claimed by the author
+     *
+     * @param model
+     * @param rank
+     */
+    protected void removeAuthorship(VitroRequest vreq, Model model, String vivoUri, int rank) {
+        // Prepare property / resources outsite of the loop
+        Property RANK_PREDICATE      = model.getProperty(VIVO_RANK);
+        Property RELATES_PREDICATE   = model.getProperty(VIVO_RELATES);
+        Resource AUTHORSHIP_RESOURCE = model.getResource(VIVO_AUTHORSHIP);
+
+        // Lookp through all the subjects in the model
+        ResIterator iter = model.listSubjects();
+        try {
+            while (iter.hasNext()) {
+                Resource subject = iter.next();
+                // If the subject is an Authorship context
+                if (subject.hasProperty(RDF.type, AUTHORSHIP_RESOURCE)) {
+                    // And the subject is related to the resource we are interested in
+                    if (subject.hasProperty(RELATES_PREDICATE, model.getResource(vivoUri))) {
+                        // And the subject is for the rank (position that we are interested in
+                        if (subject.hasLiteral(RANK_PREDICATE, rank)) {
+                            // Remove all the predicates referring to this authorship context
+                            model.removeAll(null, null, subject);
+
+                            // List all the relates predicates on authorship context
+                            StmtIterator stmtIterator = subject.listProperties(RELATES_PREDICATE);
+                            try {
+                                while (stmtIterator.hasNext()) {
+                                    Statement stmt = stmtIterator.next();
+                                    RDFNode rdfNode = stmt.getObject();
+                                    // Ensure the object of the statement is a resource
+                                    if (rdfNode.isResource()) {
+                                        Resource relatedResource = rdfNode.asResource();
+
+                                        // Ensure that the object resource is a VCARD
+                                        if (relatedResource.hasProperty(RDF.type, model.getResource(VCARD_INDIVIDUAL))) {
+                                            // If the VCARD has no other references
+                                            if (isVCardOnlyLinkedToAuthorship(vreq.getRDFService(), subject.getURI(), relatedResource.getURI())) {
+                                                // Remove the VCARD
+                                                removeVCard(model, relatedResource.getURI());
+                                            }
+                                        }
+                                    }
+                                }
+                            } finally {
+                                stmtIterator.close();
+                            }
+                            // Remove all statements related to this authorship context
+                            subject.removeProperties();
+                        }
+                    }
+                }
+            }
+        } finally {
+            iter.close();
+        }
+    }
+
+    private boolean isVCardOnlyLinkedToAuthorship(final RDFService rdfService, final String authorshipUri, final String vcardUri) {
+        final List<String> subjects = new ArrayList<>();
+        String query = "SELECT ?s ?p\n" +
+                "WHERE\n" +
+                "{\n" +
+                "  {\n" +
+                "  \t?s ?p <" + vcardUri + "> .\n" +
+                "  }\n" +
+                "}\n";
+
+        try {
+            rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+                @Override
+                protected void processQuerySolution(QuerySolution qs) {
+                    Resource subject = qs.getResource("s");
+                    if (!authorshipUri.equalsIgnoreCase(subject.getURI())) {
+                        subjects.add(subject.getURI());
+                    }
+                }
+            });
+        } catch (RDFServiceException e) {
+        }
+
+        return subjects.size() == 0;
+    }
+
+    /**
+     * Attempt to remove a VCARD from VIVO, ensuring that it is not being used first
+     *
+     * @param model
+     * @param vcardUri
+     */
+    protected void removeVCard(Model model, String vcardUri) {
+        // Get the VCARD resource from the model
+        Resource vcard = model.getResource(vcardUri);
+
+        // Remove the VCARD name
+        Statement vcardName = vcard.getProperty(model.createProperty(VCARD_HAS_NAME));
+        if (vcardName != null) {
+            if (vcardName.getObject().isResource()) {
+                vcardName.getObject().asResource().removeProperties();
+            }
+        }
+
+        // Remove the VCARD
+        vcard.removeProperties();
+    }
+
+    /**
+     * Create a new resource in VIVO, based on the values of the intermediate model
+     *
+     * @param vreq
+     * @param model
+     * @param resourceModel
+     * @return
+     */
+    protected String createVIVOObject(VitroRequest vreq, Model model, ResourceModel resourceModel, String typeUri) {
+        String vivoUri = getUnusedUri(vreq);
+
+        // Create the resource in our model
+        Resource work = model.createResource(vivoUri);
+
+        // Add the correct type to the resource
+        if (!StringUtils.isEmpty(typeUri)) {
+            // If the form passed a type uri, ensure that it is a known type URI
+            for (PublicationType publicationType: getPublicationTypes(vreq)) {
+                // We have a known type, so record it on the work
+                if (typeUri.equals(publicationType.getUri())) {
+                    work.addProperty(RDF.type, model.getResource(typeUri));
+                    break;
+                }
+            }
+        }
+
+        // If the work does not have a type set
+        if (!work.hasProperty(RDF.type)) {
+            // Try to map the type in the external model, or use academic article if none.
+            work.addProperty(RDF.type, model.getResource(typeToClassMap.getOrDefault(resourceModel.type, BIBO_ARTICLE)));
+        }
+
+        // Add the title
+        if (!StringUtils.isEmpty(resourceModel.title)) {
+            work.addProperty(RDFS.label, resourceModel.title);
+        }
+
+        // Add a DOI
+        if (!StringUtils.isEmpty(resourceModel.DOI)) {
+            String doi = new CrossrefCreateAndLinkResourceProvider().normalize(resourceModel.DOI);
+            work.addProperty(model.createProperty(BIBO_DOI), doi);
+        }
+
+        // Add a PubMed ID
+        if (!StringUtils.isEmpty(resourceModel.PubMedID)) {
+            work.addProperty(model.createProperty(BIBO_PMID), resourceModel.PubMedID.toLowerCase());
+        }
+
+        // Add a PubMed Central ID
+        if (!StringUtils.isEmpty(resourceModel.PubMedCentralID)) {
+            work.addProperty(model.createProperty(VIVO_PMCID), resourceModel.PubMedCentralID.toLowerCase());
+        }
+
+        // Add the journal
+        if (!"book".equals(resourceModel.type) && !"chapter".equals(resourceModel.type)) {
+            if (resourceModel.ISSN != null && resourceModel.ISSN.length > 0) {
+                Resource journal = null;
+
+                // Try to find the ISSN in VIVO
+                String journalUri = findVIVOUriForISSNs(vreq.getRDFService(), resourceModel.ISSN);
+
+                if (!StringUtils.isEmpty(journalUri)) {
+                    // If we jave a Journal URI, get the resource from the model
+                    journal = model.getResource(journalUri);
+                } else {
+                    // Create a new journal, using the ISSN for a Uri
+                    journal = model.createResource(getUnusedUri(vreq));
+                    journal.addProperty(RDFS.label, resourceModel.containerTitle);
+                    journal.addProperty(RDF.type, model.getResource(BIBO_JOURNAL));
+                    for (String issn : resourceModel.ISSN) {
+                        journal.addProperty(model.getProperty(BIBO_ISSN), issn);
+                    }
+
+                    if (!StringUtils.isEmpty(resourceModel.publisher)) {
+                        String publisherUri = findVIVOUriForPublisher(vreq.getRDFService(), resourceModel.publisher);
+
+                        Resource publisher = null;
+                        if (!StringUtils.isEmpty(publisherUri)) {
+                            publisher = model.getResource(publisherUri);
+                        } else {
+                            publisher = model.createResource(getPublisherURI(vreq, resourceModel.publisher));
+                            publisher.addProperty(RDFS.label, resourceModel.publisher);
+                            publisher.addProperty(RDF.type, model.getResource(VIVO_PUBLISHER_CLASS));
+                        }
+
+                        if (publisher != null) {
+                            publisher.addProperty(model.createProperty(VIVO_PUBLISHER_OF), journal);
+                            journal.addProperty(model.createProperty(VIVO_PUBLISHER), publisher);
+                        }
+                    }
+                }
+
+                // Add relationships between our resource and the journal
+                if (journal != null) {
+                    journal.addProperty(model.getProperty(VIVO_PUBLICATIONVENUEFOR), work);
+                    work.addProperty(model.getProperty(VIVO_HASPUBLICATIONVENUE), journal);
+                }
+            }
+        }
+
+        // Add an ISBN
+        if (resourceModel.ISBN != null && resourceModel.ISBN.length > 0) {
+            for (String isbn : resourceModel.ISBN) {
+                int length = getDigitCount(isbn);
+                if (length == 10) {
+                    work.addProperty(model.getProperty(BIBO_ISBN10), isbn);
+                } else {
+                    work.addProperty(model.getProperty(BIBO_ISBN13), isbn);
+                }
+            }
+
+            if ("chapter".equals(resourceModel.type)) {
+                Resource book = null;
+
+                String bookUri = findVIVOUriForISBNs(vreq.getRDFService(), resourceModel.ISBN);
+                if (StringUtils.isEmpty(bookUri)) {
+                    book = model.createResource(getUnusedUri(vreq));
+
+                    book.addProperty(RDFS.label, resourceModel.containerTitle);
+                    book.addProperty(RDF.type, model.getResource(BIBO_BOOK));
+                    for (String isbn : resourceModel.ISBN) {
+                        if (getDigitCount(isbn) == 10) {
+                            book.addProperty(model.getProperty(BIBO_ISBN10), isbn);
+                        } else {
+                            book.addProperty(model.getProperty(BIBO_ISBN13), isbn);
+                        }
+                    }
+
+                    if (!StringUtils.isEmpty(resourceModel.publisher)) {
+                        Resource publisher = model.createResource(getPublisherURI(vreq, resourceModel.publisher));
+                        publisher.addProperty(RDFS.label, resourceModel.publisher);
+                        publisher.addProperty(RDF.type, model.getResource(VIVO_PUBLISHER_CLASS));
+                        publisher.addProperty(model.createProperty(VIVO_PUBLISHER_OF), book);
+                        book.addProperty(model.createProperty(VIVO_PUBLISHER), publisher);
+                    }
+                } else {
+                    book = model.getResource(bookUri);
+                }
+
+                if (book != null) {
+                    book.addProperty(model.getProperty(VIVO_PUBLICATIONVENUEFOR), work);
+                    work.addProperty(model.getProperty(VIVO_HASPUBLICATIONVENUE), book);
+                }
+            }
+        }
+
+        // Add the volume
+        if (!StringUtils.isEmpty(resourceModel.volume)) {
+            work.addProperty(model.createProperty(BIBO_VOLUME), resourceModel.volume);
+        }
+
+        // Add the issue
+        if (!StringUtils.isEmpty(resourceModel.issue)) {
+            work.addProperty(model.createProperty(BIBO_ISSUE), resourceModel.issue);
+        }
+
+        // Add the page start
+        if (!StringUtils.isEmpty(resourceModel.pageStart)) {
+            work.addProperty(model.createProperty(BIBO_PAGE_START), resourceModel.pageStart);
+        }
+
+        // Add the page end
+        if (!StringUtils.isEmpty(resourceModel.pageEnd)) {
+            work.addProperty(model.createProperty(BIBO_PAGE_END), resourceModel.pageEnd);
+        }
+
+        // Add a page count
+        if (!StringUtils.isEmpty(resourceModel.pageStart) && !StringUtils.isEmpty(resourceModel.pageEnd)) {
+            try {
+                int pageStart = Integer.parseInt(resourceModel.pageStart, 10);
+                int pageEnd   = Integer.parseInt(resourceModel.pageEnd, 10);
+
+                if (pageStart > 0) {
+                    if (pageEnd > pageStart) {
+                        work.addLiteral(model.createProperty(BIBO_PAGE_COUNT), pageEnd - pageStart);
+                    } else if (pageEnd == pageStart) {
+                        work.addLiteral(model.createProperty(BIBO_PAGE_COUNT), 1);
+                    }
+                }
+            } catch (NumberFormatException nfe) {
+            }
+        }
+
+        // Add the publication date
+        addDateToResource(vreq, work, resourceModel.publicationDate);
+
+        if (!StringUtils.isEmpty(resourceModel.abstractText)) {
+            work.addProperty(model.createProperty(BIBO_ABSTRACT), resourceModel.abstractText);
+        }
+
+        // Add the authors
+        // Note - we start by creating VCARDs for all of the authors
+        // If the user has chosen an author position, this will be replaced later
+        if (resourceModel.author != null) {
+            int rank = 1;
+            for (ResourceModel.NameField author : resourceModel.author) {
+                if (author != null) {
+                    Resource vcard = model.createResource(getVCardURI(vreq, author.family, author.given));
+                    vcard.addProperty(RDF.type, model.getResource(VCARD_INDIVIDUAL));
+
+                    Resource name = model.createResource(getUnusedUri(vreq));
+                    vcard.addProperty(model.createProperty(VCARD_HAS_NAME), name);
+                    name.addProperty(RDF.type, model.getResource(VCARD_NAME));
+                    if (!StringUtils.isEmpty(author.given)) {
+                        name.addProperty(model.createProperty(VCARD_GIVENNAME), author.given);
+                    }
+                    if (!StringUtils.isEmpty(author.family)) {
+                        name.addProperty(model.createProperty(VCARD_FAMILYNAME), author.family);
+                    }
+
+                    Resource authorship = model.createResource(getUnusedUri(vreq));
+                    authorship.addProperty(RDF.type, model.getResource(VIVO_AUTHORSHIP));
+
+                    authorship.addProperty(model.createProperty(VIVO_RELATES), model.getResource(vivoUri));
+                    authorship.addProperty(model.createProperty(VIVO_RELATES), model.getResource(vcard.getURI()));
+
+                    model.getResource(vivoUri).addProperty(model.createProperty(VIVO_RELATEDBY), authorship);
+                    vcard.addProperty(model.createProperty(VIVO_RELATEDBY), authorship);
+                    authorship.addLiteral(model.createProperty(VIVO_RANK), rank);
+                }
+                rank++;
+            }
+        }
+
+        // Add a URL
+        if (!StringUtils.isEmpty(resourceModel.URL)) {
+            try {
+                URL url = new URL(resourceModel.URL);
+                Resource urlModel = model.createResource(getUnusedUri(vreq));
+                urlModel.addProperty(RDF.type, model.getResource(VCARD_URL_CLASS));
+                urlModel.addLiteral(model.createProperty(VCARD_URL_PROPERTY), url);
+
+                Resource kindModel = model.createResource(getUnusedUri(vreq));
+                kindModel.addProperty(RDF.type, model.getResource(VCARD_KIND));
+                kindModel.addProperty(model.createProperty(VCARD_HAS_URL), urlModel);
+                kindModel.addProperty(model.createProperty(OBO_CONTACT_INFO_FOR), work);
+
+                work.addProperty(model.createProperty(OBO_HAS_CONTACT_INFO), kindModel);
+            } catch (MalformedURLException e) {
+            }
+        }
+
+        // editor
+        // translator
+        // subject
+        // status
+        // presented at
+        // keyword
+
+        // http://purl.org/ontology/bibo/status
+        // http://vivoweb.org/ontology/core#hasSubjectArea
+        // http://purl.org/ontology/bibo/presentedAt
+        // http://vivoweb.org/ontology/core#freetextKeyword
+        // http://purl.org/ontology/bibo/translator (Direct to user)
+
+        // http://vivoweb.org/ontology/core#Editorship
+
+        return vivoUri;
+    }
+
+    /**
+     * Get a URI for the publisher object
+     *
+     * @param vreq
+     * @param publisher
+     * @return
+     */
+    protected String getPublisherURI(VitroRequest vreq, String publisher) {
+        return getUnusedUri(vreq);
+    }
+
+    /**
+     * Get a URI for a VCARD object
+     *
+     * @param vreq
+     * @param familyName
+     * @param givenName
+     * @return
+     */
+    protected String getVCardURI(VitroRequest vreq, String familyName, String givenName) {
+        return getUnusedUri(vreq);
+    }
+
+    /**
+     * Add a date object to the resource
+     *
+     * @param vreq
+     * @param work
+     * @param date
+     * @return
+     */
+    protected boolean addDateToResource(VitroRequest vreq, Resource work, ResourceModel.DateField date) {
+        Model model = work.getModel();
+
+        if (date == null || date.year == null) {
+            return false;
+        }
+
+        String formattedDate = null;
+        String precision = null;
+
+        if (date.month != null) {
+            if (date.day != null) {
+                formattedDate = String.format("%04d-%02d-%02dT00:00:00", date.year, date.month, date.day);
+                precision = "http://vivoweb.org/ontology/core#dayPrecision";
+            } else {
+                formattedDate = String.format("%04d-%02d-01T00:00:00", date.year, date.month);
+                precision = "http://vivoweb.org/ontology/core#monthPrecision";
+            }
+        } else {
+            formattedDate = String.format("%04d-01-01T00:00:00", date.year);
+            precision = "http://vivoweb.org/ontology/core#yearPrecision";
+        }
+
+        Resource dateResource = model.createResource(getUnusedUri(vreq)).addProperty(RDF.type, model.getResource("http://vivoweb.org/ontology/core#DateTimeValue"));
+        dateResource.addProperty(model.createProperty(VIVO_DATETIME), formattedDate);
+        dateResource.addProperty(model.createProperty(VIVO_DATETIMEPRECISION), precision);
+
+        work.addProperty(model.createProperty(VIVO_DATETIMEVALUE), dateResource);
+        return true;
+    }
+
+    /**
+     * Get an unused standard Uri from VIVO
+     *
+     * @param vreq
+     * @return
+     */
+    private String getUnusedUri(VitroRequest vreq) {
+        NewURIMakerVitro uriMaker = new NewURIMakerVitro(vreq.getWebappDaoFactory());
+        try {
+            return uriMaker.getUnusedNewURI(null);
+        } catch (InsertException e) {
+        }
+
+        return null;
+    }
+
+    /**
+     * Find a Uri for an ISSN
+     *
+     * @param rdfService
+     * @param issns
+     * @return
+     */
+    private String findVIVOUriForISSNs(RDFService rdfService, String[] issns) {
+        // First look to see if any journals already define the ISSN
+        if (issns != null && issns.length > 0) {
+            for (String issn : issns) {
+                final List<String> journals = new ArrayList<>();
+                String query = "SELECT ?journal\n" +
+                        "WHERE\n" +
+                        "{\n" +
+                        "  {\n" +
+                        "  \t?journal <http://purl.org/ontology/bibo/issn> \"" + issn + "\" .\n" +
+                        "  }\n" +
+                        "}\n";
+
+                try {
+                    rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+                        @Override
+                        protected void processQuerySolution(QuerySolution qs) {
+                            Resource journal = qs.getResource("journal");
+                            if (journal != null) {
+                                journals.add(journal.getURI());
+                            }
+                        }
+                    });
+                } catch (RDFServiceException e) {
+                }
+
+                // We've found a journal that matches, so use that
+                if (journals.size() > 0) {
+                    return journals.get(0);
+                }
+            }
+        }
+
+        // No journal found, so return null
+        return null;
+    }
+
+    /**
+     * Find a Uri for an ISBN
+     *
+     * @param rdfService
+     * @param isbns
+     * @return
+     */
+    private String findVIVOUriForISBNs(RDFService rdfService, String[] isbns) {
+        // First look to see if any journals already define the ISSN
+        if (isbns != null && isbns.length > 0) {
+            for (String isbn : isbns) {
+                final List<String> books = new ArrayList<>();
+                String query = "SELECT ?book\n" +
+                        "WHERE\n" +
+                        "{\n" +
+                        "  {\n" +
+                        (getDigitCount(isbn) == 10 ?
+                        "  \t?book <http://purl.org/ontology/bibo/isbn10> \"" + isbn + "\" .\n" :
+                        "  \t?book <http://purl.org/ontology/bibo/isbn13> \"" + isbn + "\" .\n" ) +
+                        "  \t?book a <http://purl.org/ontology/bibo/Book> .\n" +
+                        "  }\n" +
+                        "}\n";
+
+                try {
+                    rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+                        @Override
+                        protected void processQuerySolution(QuerySolution qs) {
+                            Resource book = qs.getResource("book");
+                            if (book != null) {
+                                books.add(book.getURI());
+                            }
+                        }
+                    });
+                } catch (RDFServiceException e) {
+                }
+
+                // We've found a book that matches, so use that
+                if (books.size() > 0) {
+                    for (String url : books) {
+                        if (url.contains("doi")) {
+                            return url;
+                        }
+                    }
+
+                    return books.get(0);
+                }
+            }
+        }
+
+        // No books found, so return null
+        return null;
+    }
+
+    /**
+     * Find a Uri for an Publisher
+     *
+     * @param rdfService
+     * @param publisher The name of the publisher
+     * @return
+     */
+    private String findVIVOUriForPublisher(RDFService rdfService, String publisher) {
+        // First look to see if any publishers already have that label
+        final List<String> publisherUris = new ArrayList<>();
+        String query = "SELECT ?publisher\n" +
+                "WHERE\n" +
+                "{\n" +
+                "  {\n" +
+                "  \t?publisher a <" + VIVO_PUBLISHER_CLASS + "> .\n" +
+                "  \t?publisher <" + RDFS.label + "> \"" + publisher + "\" .\n" +
+                "  }\n" +
+                "}\n";
+
+        try {
+            rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+                @Override
+                protected void processQuerySolution(QuerySolution qs) {
+                    Resource publisherUri = qs.getResource("publisher");
+                    if (publisherUri != null) {
+                        publisherUris.add(publisherUri.getURI());
+                    }
+                }
+            });
+        } catch (RDFServiceException e) {
+        }
+
+        // We've found a publisher that matches, so use that
+        if (publisherUris.size() > 0) {
+            return publisherUris.get(0);
+        }
+
+        return null;
+    }
+
+    /**
+     * Find a Uri for a DOI
+     *
+     * @param rdfService
+     * @param doi
+     * @return
+     */
+    private String findVIVOUriForDOI(RDFService rdfService, String doi) {
+        // First, find a resource that already defines the DOI
+        if (!StringUtils.isEmpty(doi)) {
+            final List<String> works = new ArrayList<>();
+            String query = "SELECT ?work\n" +
+                    "WHERE\n" +
+                    "{\n" +
+                    "  {\n" +
+                    "  \t?work <http://purl.org/ontology/bibo/doi> \"" + doi + "\" .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "  \t?work <http://purl.org/ontology/bibo/doi> \"http://doi.org/" + doi + "\" .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "  \t?work <http://purl.org/ontology/bibo/doi> \"https://doi.org/" + doi + "\" .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "  \t?work <http://purl.org/ontology/bibo/doi> \"http://dx.doi.org/" + doi + "\" .\n" +
+                    "  }\n" +
+                    "  UNION\n" +
+                    "  {\n" +
+                    "  \t?work <http://purl.org/ontology/bibo/doi> \"https://dx.doi.org/" + doi + "\" .\n" +
+                    "  }\n" +
+                    "}\n";
+
+            try {
+                rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+                    @Override
+                    protected void processQuerySolution(QuerySolution qs) {
+                        Resource work = qs.getResource("work");
+                        if (work != null) {
+                            works.add(work.getURI());
+                        }
+                    }
+                });
+            } catch (RDFServiceException e) {
+            }
+
+            // We've found a resource, so return it's Uri
+            if (works.size() > 0) {
+                return works.get(0);
+            }
+        }
+
+        // No resource found with the DOI, so return null
+        return null;
+    }
+
+    /**
+     * Count the number of digits in a string
+     *
+     * @param id
+     * @return
+     */
+    private int getDigitCount(String id) {
+        int digits = 0;
+
+        if (id != null) {
+            for (char ch : id.toCharArray()) {
+                if (Character.isDigit(ch)) {
+                    digits++;
+                }
+            }
+        }
+
+        return digits;
+    }
+
+    /**
+     * Find a Uri for a resource that defines a PubMed ID
+     * @param rdfService
+     * @param pmid
+     * @return
+     */
+    private String findVIVOUriForPubMedID(RDFService rdfService, String pmid) {
+        // Look for a resource that defines the PubMed ID
+        if (!StringUtils.isEmpty(pmid)) {
+            final List<String> works = new ArrayList<>();
+            String query = "SELECT ?work\n" +
+                    "WHERE\n" +
+                    "{\n" +
+                    "  {\n" +
+                    "  \t?work <http://purl.org/ontology/bibo/pmid> \"" + pmid + "\" .\n" +
+                    "  }\n" +
+                    "}\n";
+
+            try {
+                rdfService.sparqlSelectQuery(query, new ResultSetConsumer() {
+                    @Override
+                    protected void processQuerySolution(QuerySolution qs) {
+                        Resource work = qs.getResource("work");
+                        if (work != null) {
+                            works.add(work.getURI());
+                        }
+                    }
+                });
+            } catch (RDFServiceException e) {
+            }
+
+            // If we have a resource, return the Uri
+            if (works.size() == 1) {
+                return works.get(0);
+            }
+        }
+
+        // No resource found, so return null
+        return null;
+    }
+
+    /**
+     * Try to find a resource in VIVO that defines one of the external identifiers
+     * @param vreq
+     * @param ids
+     * @param profileUri
+     * @param citation
+     * @return
+     */
+    protected String findInVIVO(VitroRequest vreq, ExternalIdentifiers ids, String profileUri, Citation citation) {
+        // First, look for a resource that defines the DOI
+        String vivoUri = findVIVOUriForDOI(vreq.getRDFService(), ids.DOI);
+
+        // No DOI, so look for a resource that defines the PubMed ID
+        if (StringUtils.isEmpty(vivoUri)) {
+            vivoUri = findVIVOUriForPubMedID(vreq.getRDFService(), ids.PubMedID);
+        }
+
+        // If we have been passed a citation object, and have found a resource, populate the citation object
+        if (citation != null && !StringUtils.isEmpty(vivoUri)) {
+            // Get a moel for the resource
+            Model model = getExistingResource(vreq, vivoUri);
+
+            // Get the resource from the model
+            Resource work = model.getResource(vivoUri);
+            String pageStart = null;
+            String pageEnd = null;
+            Citation.Name[] rankedAuthors = null;
+            ArrayList<Citation.Name> unrankedAuthors = new ArrayList<>();
+
+            // Loop through all the statements on the resource
+            StmtIterator stmtIterator = work.listProperties();
+            try {
+                while (stmtIterator.hasNext()) {
+                    Statement stmt = stmtIterator.next();
+
+                    switch (stmt.getPredicate().getURI()) {
+                        case RDFS_LABEL:
+                            citation.title = stmt.getString();
+                            break;
+
+                        case BIBO_VOLUME:
+                            citation.volume = stmt.getString();
+                            break;
+
+                        case BIBO_ISSUE:
+                            citation.issue = stmt.getString();
+                            break;
+
+                        case BIBO_PAGE_START:
+                            pageStart = stmt.getString();
+                            break;
+
+                        case BIBO_PAGE_END:
+                            pageEnd = stmt.getString();
+                            break;
+
+                        // Publication date
+                        case VIVO_DATETIMEVALUE:
+                            Resource dateTime = stmt.getResource();
+                            if (dateTime != null) {
+                                Statement stmtDate = dateTime.getProperty(model.getProperty(VIVO_DATETIME));
+                                if (stmtDate != null) {
+                                    String dateTimeValue = stmtDate.getString();
+                                    if (dateTimeValue != null && dateTimeValue.length() > 3) {
+                                        citation.publicationYear = Integer.parseInt(dateTimeValue.substring(0, 4), 10);
+                                    }
+                                }
+                            }
+                            break;
+
+                        // Journal
+                        case VIVO_HASPUBLICATIONVENUE:
+                            Resource journal = stmt.getResource();
+                            if (journal != null) {
+                                Statement stmtJournalName = journal.getProperty(RDFS.label);
+                                if (stmtJournalName != null) {
+                                    citation.journal = stmtJournalName.getString();
+                                }
+                            }
+                            break;
+
+                        // Relationships - we are really interested in authors and editors
+                        case VIVO_RELATEDBY:
+                            // Get the relationship context
+                            Resource relationship = stmt.getResource();
+                            if (relationship != null) {
+                                Integer rank = null;
+
+                                // If it isn't an authorship or editorship, skip it
+                                if (!isResourceOfType(relationship, VIVO_AUTHORSHIP) &&
+                                    !isResourceOfType(relationship, VIVO_EDITORSHIP)) {
+                                    break;
+                                }
+
+                                // Now loop over the properties of the author/editorship context
+                                Resource personResource = null;
+                                StmtIterator relationshipIter = relationship.listProperties();
+                                try {
+                                    while (relationshipIter.hasNext()) {
+                                        Statement relationshipStmt = relationshipIter.next();
+                                        switch (relationshipStmt.getPredicate().getURI()) {
+                                            // If it is a relates property
+                                            case VIVO_RELATES:
+                                                // If it isn't pointing to the resource, it must be pointing to a person
+                                                if (!vivoUri.equals(relationshipStmt.getResource().getURI())) {
+                                                    personResource = relationshipStmt.getResource();
+                                                }
+                                                break;
+
+                                            // Author position
+                                            case VIVO_RANK:
+                                                rank = relationshipStmt.getInt();
+                                                break;
+                                        }
+                                    }
+                                } finally {
+                                    relationshipIter.close();
+                                }
+
+                                Citation.Name newAuthor = null;
+
+                                // If we've got an author
+                                if (personResource != null) {
+                                    // If the author is the user, then they have already claimed this publication
+                                    if (profileUri.equals(personResource.getURI())) {
+                                        citation.alreadyClaimed = true;
+                                    }
+
+                                    if (isResourceOfType(relationship, VIVO_AUTHORSHIP)) {
+                                        boolean linked = false;
+
+                                        // Now get the name of the author, from either the VCARD or the foaf:Person
+                                        Statement familyName = null;
+                                        Statement givenName = null;
+                                        if (isResourceOfType(personResource, VCARD_INDIVIDUAL)) {
+                                            if (personResource.hasProperty(model.getProperty(VCARD_HAS_NAME))) {
+                                                Resource vcardName = personResource.getPropertyResourceValue(model.getProperty(VCARD_HAS_NAME));
+                                                if (vcardName != null) {
+                                                    if (vcardName.hasProperty(model.getProperty(VCARD_GIVENNAME))) {
+                                                        givenName = vcardName.getProperty(model.getProperty(VCARD_GIVENNAME));
+                                                    }
+                                                    if (vcardName.hasProperty(model.getProperty(VCARD_FAMILYNAME))) {
+                                                        familyName = vcardName.getProperty(model.getProperty(VCARD_FAMILYNAME));
+                                                    }
+                                                }
+                                            }
+                                        } else if (personResource.hasProperty(model.getProperty(OBO_HAS_CONTACT_INFO))) {
+                                            Resource vCard = personResource.getPropertyResourceValue(model.getProperty(OBO_HAS_CONTACT_INFO));
+                                            if (vCard.hasProperty(model.getProperty(VCARD_HAS_NAME))) {
+                                                Resource vcardName = vCard.getPropertyResourceValue(model.getProperty(VCARD_HAS_NAME));
+                                                if (vcardName != null) {
+                                                    if (vcardName.hasProperty(model.getProperty(VCARD_GIVENNAME))) {
+                                                        givenName = vcardName.getProperty(model.getProperty(VCARD_GIVENNAME));
+                                                    }
+                                                    if (vcardName.hasProperty(model.getProperty(VCARD_FAMILYNAME))) {
+                                                        familyName = vcardName.getProperty(model.getProperty(VCARD_FAMILYNAME));
+                                                    }
+                                                }
+                                                linked = true;
+                                            }
+                                        }
+
+                                        if (givenName == null) {
+                                            // It's a foaf person, which means it is already linked to a full profile in VIVO
+                                            if (personResource.hasProperty(model.getProperty(FOAF_FIRSTNAME))) {
+                                                givenName = personResource.getProperty(model.getProperty(FOAF_FIRSTNAME));
+                                            }
+                                            if (personResource.hasProperty(model.getProperty(FOAF_LASTNAME))) {
+                                                familyName = personResource.getProperty(model.getProperty(FOAF_LASTNAME));
+                                            }
+                                            linked = true;
+                                        }
+
+                                        // If we have an author name, format it
+                                        if (familyName != null) {
+                                            newAuthor = new Citation.Name();
+                                            if (givenName != null) {
+                                                newAuthor.name = CreateAndLinkUtils.formatAuthorString(familyName.getString(), givenName.getString());
+                                            } else {
+                                                newAuthor.name = CreateAndLinkUtils.formatAuthorString(familyName.getString(), null);
+                                            }
+
+                                            // Record whether the author is a full profile, or just a VCARD
+                                            newAuthor.linked = linked;
+                                        } else {
+                                            Statement label = personResource.getProperty(RDFS.label);
+                                            if (label != null) {
+                                                String name = label.getString();
+                                                if (name.contains(",")) {
+                                                    String[] parts = name.split("\\s*,\\s*");
+                                                    if (parts.length > 1) {
+                                                        name = CreateAndLinkUtils.formatAuthorString(parts[0], parts[parts.length - 1]);
+                                                    }
+                                                } else {
+                                                    String[] parts = name.split("\\s*");
+                                                    if (parts.length > 1) {
+                                                        name = CreateAndLinkUtils.formatAuthorString(parts[parts.length - 1], parts[0]);
+                                                    }
+                                                }
+
+                                                newAuthor = new Citation.Name();
+                                                newAuthor.name = name;
+                                                newAuthor.linked = linked;
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    if (isResourceOfType(relationship, VIVO_AUTHORSHIP)) {
+                                        newAuthor = new Citation.Name();
+                                        newAuthor.name = "Deleted Author";
+                                    }
+                                }
+
+                                // If we have an author
+                                if (newAuthor != null) {
+                                    // If we have an author position, insert it in the correct place of the ranked authors
+                                    if (rank != null) {
+                                        if (rankedAuthors == null) {
+                                            rankedAuthors = new Citation.Name[rank];
+                                        } else if (rankedAuthors.length < rank) {
+                                            Citation.Name[] newAuthors = new Citation.Name[rank];
+                                            for (int i = 0; i < rankedAuthors.length; i++) {
+                                                newAuthors[i] = rankedAuthors[i];
+                                            }
+                                            rankedAuthors = newAuthors;
+                                        }
+                                        rankedAuthors[rank - 1] = newAuthor;
+                                    } else {
+                                        // Unranked author, so just keep hold of it to add at the end
+                                        unrankedAuthors.add(newAuthor);
+                                    }
+                                }
+                            }
+                            break;
+                    }
+                }
+            } finally {
+                stmtIterator.close();
+            }
+
+            // Create the pagination field
+            if (!StringUtils.isEmpty(pageStart)) {
+                if (!StringUtils.isEmpty(pageEnd)) {
+                    citation.pagination = pageStart + "-" + pageEnd;
+                } else {
+                    citation.pagination = pageStart;
+                }
+            }
+
+            // If we have unranked authors, add them to the end of the ranked authors
+            if (unrankedAuthors.size() > 0) {
+                if (rankedAuthors == null) {
+                    citation.authors = unrankedAuthors.toArray(new Citation.Name[unrankedAuthors.size()]);
+                } else {
+                    Citation.Name[] newAuthors = new Citation.Name[rankedAuthors.length + unrankedAuthors.size()];
+                    int i = 0;
+                    while (i < rankedAuthors.length) {
+                        newAuthors[i] = rankedAuthors[i];
+                        i++;
+                    }
+                    while (i < newAuthors.length && unrankedAuthors.size() > 0) {
+                        newAuthors[i] = unrankedAuthors.remove(0);
+                        i++;
+                    }
+                    citation.authors = newAuthors;
+                }
+            } else {
+                citation.authors = rankedAuthors;
+            }
+        }
+
+        // Return the uri of the resource (or null)
+        return vivoUri;
+    }
+
+    /**
+     * Check that the resource is declared to be of a particular type
+     *
+     * @param resource
+     * @param typeUri
+     * @return
+     */
+    protected boolean isResourceOfType(Resource resource, String typeUri) {
+        if (resource == null) {
+            return false;
+        }
+
+        StmtIterator iter = resource.listProperties(RDF.type);
+        try {
+            while (iter.hasNext()) {
+                Statement stmt = iter.next();
+                if (typeUri.equals(stmt.getResource().getURI())) {
+                    return true;
+                }
+            }
+        } finally {
+            iter.close();
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine the difference between the "existing" and "updated" models, and write the changes to VIVO
+     *
+     * @param rdfService
+     * @param existingModel
+     * @param updatedModel
+     */
+    protected void writeChanges(RDFService rdfService, Model existingModel, Model updatedModel) {
+        Model removeModel = existingModel.difference(updatedModel);
+        Model addModel = updatedModel.difference(existingModel);
+
+        if (!addModel.isEmpty() || !removeModel.isEmpty()) {
+            InputStream addStream = null;
+            InputStream removeStream = null;
+
+            InputStream is = makeN3InputStream(updatedModel);
+            ChangeSet changeSet = rdfService.manufactureChangeSet();
+
+            if (!addModel.isEmpty()) {
+                addStream = makeN3InputStream(addModel);
+                changeSet.addAddition(addStream, RDFService.ModelSerializationFormat.N3, ModelNames.ABOX_ASSERTIONS);
+            }
+
+            if (!removeModel.isEmpty()) {
+                removeStream = makeN3InputStream(removeModel);
+                changeSet.addRemoval(removeStream, RDFService.ModelSerializationFormat.N3, ModelNames.ABOX_ASSERTIONS);
+            }
+
+            try {
+                rdfService.changeSetUpdate(changeSet);
+            } catch (RDFServiceException e) {
+            } finally {
+                if (addStream != null) {
+                    try { addStream.close(); } catch (IOException e) { }
+                }
+
+                if (removeStream != null) {
+                    try { removeStream.close(); } catch (IOException e) { }
+                }
+            }
+        }
+    }
+
+    /**
+     * Convert the model into an N3 stream
+     *
+     * @param m
+     * @return
+     */
+    private InputStream makeN3InputStream(Model m) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        m.write(out, "N3");
+        return new ByteArrayInputStream(out.toByteArray());
+    }
+
+    /**
+     * Get a list of publication types - classes that are a bibo:Document - from the triple store
+     * @param vreq
+     * @return
+     */
+    private List<PublicationType> getPublicationTypes(VitroRequest vreq) {
+        // List of publication types to return (final so it can be used in the ResultSetConsumer
+        final List<PublicationType> types = new ArrayList<>();
+
+        try {
+            // Find all classes that are a subclass of Document, and their labels
+            String query = "PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>\n" +
+                    "\n" +
+                    "SELECT ?uri ?label\n" +
+                    "WHERE {\n" +
+                    "\t?uri rdfs:label ?label .\n" +
+                    "\t?uri rdfs:subClassOf  <http://purl.org/ontology/bibo/Document> .\n" +
+                    "}\n";
+
+            vreq.getRDFService().sparqlSelectQuery(query, new ResultSetConsumer() {
+                @Override
+                protected void processQuerySolution(QuerySolution qs) {
+                    // Add a publication type to the list
+                    types.add(new PublicationType(
+                        qs.getLiteral("label").getString(),
+                        qs.getResource("uri").getURI()
+                    ));
+                }
+            });
+        } catch (RDFServiceException e) {
+        }
+
+        // Sort the publication type list
+        types.sort(new Comparator<PublicationType>() {
+            @Override
+            public int compare(PublicationType o1, PublicationType o2) {
+                return o1.getLabel().compareTo(o2.getLabel());
+            }
+        });
+
+        return types;
+    }
+
+    public class PublicationType {
+        private String label;
+        private String uri;
+
+        public PublicationType(String label, String uri) {
+            this.label = label;
+            this.uri = uri;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public String getUri() {
+            return uri;
+        }
+    }
+}
+
+
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/Citation.java b/api/src/main/java/org/vivoweb/webapp/createandlink/Citation.java
new file mode 100644
index 0000000000..4c6825905e
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/Citation.java
@@ -0,0 +1,79 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink;
+
+public class Citation {
+    public String externalId;
+    public String externalProvider;
+    public String externalResource;
+
+    public String vivoUri;
+
+    public String type;
+    public String typeUri;
+    public String title;
+    public Name[] authors;
+    public String journal;
+    public String volume;
+    public String issue;
+    public String pagination;
+    public Integer publicationYear;
+    public String DOI;
+
+    public boolean alreadyClaimed = false;
+    public boolean showError = false;
+
+    public String getExternalId() { return externalId; }
+    public String getExternalProvider() { return externalProvider; }
+    public String getExternalResource() { return externalResource; }
+
+    public String getVivoUri() { return vivoUri; }
+
+    public String getType() { return type; }
+    public String getTypeUri() { return typeUri; }
+    public String getTitle() { return title; }
+    public Name[] getAuthors() {
+        return authors;
+    }
+    public String getJournal() {
+        return journal;
+    }
+    public String getVolume() {
+        return volume;
+    }
+    public String getIssue() {
+        return issue;
+    }
+    public String getPagination() {
+        return pagination;
+    }
+    public Integer getPublicationYear() {
+        return publicationYear;
+    }
+
+    public String getDOI() {
+        return DOI;
+    }
+
+    public boolean getAlreadyClaimed() { return alreadyClaimed; }
+
+    public boolean getShowError() { return showError; }
+
+    public static class Name {
+        public String name;
+
+        public boolean linked = false;
+        public boolean proposed = false;
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean getLinked() {
+            return linked;
+        }
+        public boolean getProposed() {
+            return proposed;
+        }
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/CiteprocJSONModel.java b/api/src/main/java/org/vivoweb/webapp/createandlink/CiteprocJSONModel.java
new file mode 100644
index 0000000000..410996a3a2
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/CiteprocJSONModel.java
@@ -0,0 +1,139 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties
+public class CiteprocJSONModel {
+    public String type;
+    public String id; // Number?
+    public String[] categories;
+    public String language;
+    public String journalAbbreviation;
+    public String shortTitle;
+    public NameField[] author;
+    @JsonProperty("collection-editor")
+    public NameField[] collectionEditor;
+    public NameField[] composer;
+    @JsonProperty("container-author")
+    public NameField[] containerAuthor;
+    public NameField[] director;
+    public NameField[] editor;
+    @JsonProperty("editorial-director")
+    public NameField[] editorialDirector;
+    public NameField[] interviewer;
+    public NameField[] illustrator;
+    @JsonProperty("original-author")
+    public NameField[] originalAuthor;
+    public NameField[] recipient;
+    @JsonProperty("reviewed-author")
+    public NameField[] reviewedAuthor;
+    public NameField[] translator;
+    public DateField accessed;
+    public DateField container;
+    @JsonProperty("event-date")
+    public DateField eventDate;
+    public DateField issued;
+    @JsonProperty("original-date")
+    public DateField originalDate;
+    public DateField submitted;
+    @JsonProperty("abstract")
+    public String abstractText;
+    public String annote;
+    public String archive;
+    public String archive_location;
+    public String authority;
+    @JsonProperty("call-number")
+    public String callNumber;
+    @JsonProperty("chapter-number")
+    public String chapterNumber;
+    @JsonProperty("citation-number")
+    public String citationNumber;
+    @JsonProperty("citation-label")
+    public String citationLabel;
+    @JsonProperty("collection-number")
+    public String collectionNumber;
+    @JsonProperty("container-title")
+    public String containerTitle;
+    @JsonProperty("container-title-short")
+    public String containerTitleShort;
+    public String dimensions;
+    public String DOI;
+    public String edition; // Integer?
+    public String event;
+    @JsonProperty("event-place")
+    public String eventPlace;
+    @JsonProperty("first-reference-note-number")
+    public String firstReferenceNoteNumber;
+    public String genre;
+    public String ISBN;
+    public String ISSN;
+    public String issue; // Integer?
+    public String jurisdiction;
+    public String keyword;
+    public String locator;
+    public String medium;
+    public String note;
+    public String number; // Integer?
+    @JsonProperty("number-of-pages")
+    public String numberOfPages;
+    @JsonProperty("number-of-volumes")
+    public String numberOfVolumes; // Integer?
+    @JsonProperty("original-publisher")
+    public String originalPublisher;
+    @JsonProperty("original-publisher-place")
+    public String originalPublisherPlace;
+    @JsonProperty("original-title")
+    public String originalTitle;
+    public String page;
+    @JsonProperty("page-first")
+    public String pageFirst;
+    public String PMCID;
+    public String PMID;
+    public String publisher;
+    @JsonProperty("publisher-place")
+    public String publisherPlace;
+    public String references;
+    @JsonProperty("reviewed-title")
+    public String reviewedTitle;
+    public String scale;
+    public String section;
+    public String source;
+    public String status;
+    public String title;
+    @JsonProperty("title-short")
+    public String titleShort;
+    public String URL;
+    public String version;
+    public String volume; // Integer?
+    @JsonProperty("year-suffix")
+    public String yearSuffix;
+
+    public static class NameField {
+        public String family;
+        public String given;
+        @JsonProperty("dropping-particle")
+        public String droppingParticle;
+        @JsonProperty("non-dropping-particle")
+        public String nonDroppingParticle;
+        public String suffix;
+        @JsonProperty("comma-suffix")
+        public String commaSuffix; // Number? Boolean?
+        @JsonProperty("staticOrdering")
+        public String staticOrdering; // Number? Boolean?
+        public String literal;
+        @JsonProperty("parse-names")
+        public String parseNames; // Number? Boolean?
+    }
+
+    public static class DateField {
+        @JsonProperty("date-parts")
+        public String[][] dateParts; // Number?
+        public String season; // Number?
+        public String circa; // Number? Boolean?
+        public String literal;
+        public String raw;
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/ContributorRole.java b/api/src/main/java/org/vivoweb/webapp/createandlink/ContributorRole.java
new file mode 100644
index 0000000000..320a79b74b
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/ContributorRole.java
@@ -0,0 +1,19 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink;
+
+public class ContributorRole {
+    private String key;
+    private String label;
+    private String uri;
+
+    public ContributorRole(String key, String label, String uri) {
+        this.key = key;
+        this.label = label;
+        this.uri = uri;
+    }
+
+    public String getKey() { return key; }
+    public String getLabel() { return label; }
+    public String getUri() { return uri; }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkResourceProvider.java b/api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkResourceProvider.java
new file mode 100644
index 0000000000..044bc992c0
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkResourceProvider.java
@@ -0,0 +1,15 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink;
+
+public interface CreateAndLinkResourceProvider {
+    String normalize(String id);
+
+    String getLabel();
+
+    ExternalIdentifiers allExternalIDsForFind(String externalId);
+
+    String findInExternal(String id, Citation citation);
+
+    ResourceModel makeResourceModel(String externalId, String externalResource);
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkUtils.java b/api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkUtils.java
new file mode 100644
index 0000000000..5286458561
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/CreateAndLinkUtils.java
@@ -0,0 +1,34 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class CreateAndLinkUtils {
+    public static String formatAuthorString(String familyName, String givenName) {
+        if (StringUtils.isEmpty(familyName)) {
+            return null;
+        }
+
+        StringBuilder authorBuilder = new StringBuilder(familyName);
+
+        if (!StringUtils.isEmpty(givenName)) {
+            authorBuilder.append(", ");
+            boolean addToAuthor = true;
+            for (char ch : givenName.toCharArray()) {
+                if (addToAuthor) {
+                    if (Character.isAlphabetic(ch)) {
+                        authorBuilder.append(Character.toUpperCase(ch));
+                        addToAuthor = false;
+                    }
+                } else {
+                    if (!Character.isAlphabetic(ch)) {
+                        addToAuthor = true;
+                    }
+                }
+            }
+        }
+
+        return authorBuilder.toString();
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/ExternalIdentifiers.java b/api/src/main/java/org/vivoweb/webapp/createandlink/ExternalIdentifiers.java
new file mode 100644
index 0000000000..8d5595b222
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/ExternalIdentifiers.java
@@ -0,0 +1,9 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink;
+
+public class ExternalIdentifiers {
+    public String DOI;
+    public String PubMedID;        // http://www.ncbi.nlm.nih.gov/pmc/utils/idconv/v1.0/?ids=23193287&format=json
+    public String PubMedCentralID; // http://www.ncbi.nlm.nih.gov/pmc/utils/idconv/v1.0/?ids=PMC3531190&format=json
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/ResourceModel.java b/api/src/main/java/org/vivoweb/webapp/createandlink/ResourceModel.java
new file mode 100644
index 0000000000..e72c0cd372
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/ResourceModel.java
@@ -0,0 +1,46 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink;
+
+public class ResourceModel {
+    public String DOI;
+    public String PubMedID;
+    public String PubMedCentralID;
+    public String[] ISSN;
+    public String[] ISBN;
+    public String URL;
+
+    public NameField[] author;
+    public NameField[] editor;
+    public NameField[] translator;
+
+    public String containerTitle;
+    public String issue;
+    public String pageStart;
+    public String pageEnd;
+
+    public DateField publicationDate;
+
+    public String publisher;
+
+    public String[] subject;
+    public String title;
+    public String type;
+    public String volume;
+
+    public String status;
+    public String presentedAt;
+    public String[] keyword;
+    public String abstractText;
+
+    public static class NameField {
+        public String family;
+        public String given;
+    }
+
+    public static class DateField {
+        public Integer year;
+        public Integer month;
+        public Integer day;
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCiteprocJSONModel.java b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCiteprocJSONModel.java
new file mode 100644
index 0000000000..76338c8393
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCiteprocJSONModel.java
@@ -0,0 +1,191 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink.crossref;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.vivoweb.webapp.createandlink.utils.StringArrayDeserializer;
+
+import java.util.Date;
+
+/**
+ * Note that ISSN and ISBN are arrays in Crossref, whereas Citeproc defines them to be a single value.
+ *
+ */
+@JsonIgnoreProperties
+public class CrossrefCiteprocJSONModel {
+    // Crossref Specific Fields
+
+    @JsonDeserialize(using = StringArrayDeserializer.class)
+    public String[] ISSN;
+    @JsonDeserialize(using = StringArrayDeserializer.class)
+    public String[] ISBN;
+
+    public DateField created;
+//    public DateField deposited;
+//    public DateField indexed;
+
+//    public String member;
+    public String prefix;
+
+    @JsonProperty("article-number")
+    public String articleNumber;
+
+    @JsonProperty("published-online")
+    public DateField publishedOnline;
+
+    @JsonProperty("published-print")
+    public DateField publishedPrint;
+
+//    @JsonProperty("reference-count")
+//    public Integer referenceCount;
+    public Double score;
+    @JsonDeserialize(using = StringArrayDeserializer.class)
+    public String[] subject;
+//    public String[] subtitle;
+
+    // Standard Citeproc fields
+
+    public String type;
+    public String id; // Number?
+//    public String[] categories;
+    public String language;
+//    public String journalAbbreviation;
+//    public String shortTitle;
+    public NameField[] author;
+//    @JsonProperty("collection-editor")
+//    public NameField[] collectionEditor;
+//    public NameField[] composer;
+//    @JsonProperty("container-author")
+//    public NameField[] containerAuthor;
+//    public NameField[] director;
+    public NameField[] editor;
+    @JsonProperty("editorial-director")
+//    public NameField[] editorialDirector;
+//    public NameField[] interviewer;
+//    public NameField[] illustrator;
+//    @JsonProperty("original-author")
+//    public NameField[] originalAuthor;
+//    public NameField[] recipient;
+//    @JsonProperty("reviewed-author")
+//    public NameField[] reviewedAuthor;
+    public NameField[] translator;
+//    public DateField accessed;
+    public DateField container;
+//    @JsonProperty("event-date")
+//    public DateField eventDate;
+    public DateField issued;
+//    @JsonProperty("original-date")
+//    public DateField originalDate;
+    public DateField submitted;
+    @JsonProperty("abstract")
+    public String abstractText;
+//    public String annote;
+//    public String archive;
+//    public String archive_location;
+//    public String authority;
+//    @JsonProperty("call-number")
+//    public String callNumber;
+//    @JsonProperty("chapter-number")
+//    public String chapterNumber;
+//    @JsonProperty("citation-number")
+//    public String citationNumber;
+//    @JsonProperty("citation-label")
+//    public String citationLabel;
+//    @JsonProperty("collection-number")
+//    public String collectionNumber;
+    @JsonProperty("container-title")
+    public String containerTitle;
+//    @JsonProperty("container-title-short")
+//    public String containerTitleShort;
+//    public String dimensions;
+    public String DOI;
+//    public String edition; // Integer?
+    public String event;
+//    @JsonProperty("event-place")
+//    public String eventPlace;
+//    @JsonProperty("first-reference-note-number")
+//    public String firstReferenceNoteNumber;
+//    public String genre;
+    public String issue; // Integer?
+//    public String jurisdiction;
+//    public String keyword;
+//    public String locator;
+//    public String medium;
+    public String note;
+    public String number; // Integer?
+//    @JsonProperty("number-of-pages")
+//    public String numberOfPages;
+//    @JsonProperty("number-of-volumes")
+//    public String numberOfVolumes; // Integer?
+//    @JsonProperty("original-publisher")
+//    public String originalPublisher;
+//    @JsonProperty("original-publisher-place")
+//    public String originalPublisherPlace;
+//    @JsonProperty("original-title")
+//    public String originalTitle;
+    public String page;
+//    @JsonProperty("page-first")
+//    public String pageFirst;
+    public String PMCID;
+    public String PMID;
+    public String publisher;
+//    @JsonProperty("publisher-place")
+//    public String publisherPlace;
+//    public String references;
+//    @JsonProperty("reviewed-title")
+//    public String reviewedTitle;
+    public String scale;
+    public String section;
+    public String source;
+    public String status;
+    public String title;
+//    @JsonProperty("title-short")
+//    public String titleShort;
+    public String URL;
+    public String version;
+    public String volume; // Integer?
+//    @JsonProperty("year-suffix")
+//    public String yearSuffix;
+
+    public static class NameField {
+        // Crossref specific fields
+
+//        public String[] affiliation;
+
+        // Standard Citeproc fields
+
+        public String family;
+        public String given;
+//        @JsonProperty("dropping-particle")
+//        public String droppingParticle;
+//        @JsonProperty("non-dropping-particle")
+//        public String nonDroppingParticle;
+        public String suffix;
+//        @JsonProperty("comma-suffix")
+//        public String commaSuffix; // Number? Boolean?
+//        @JsonProperty("staticOrdering")
+//        public String staticOrdering; // Number? Boolean?
+        public String literal;
+//        @JsonProperty("parse-names")
+//        public String parseNames; // Number? Boolean?
+    }
+
+    public static class DateField {
+        // Crossref specific fields
+
+        @JsonProperty("date-time")
+        public Date dateTime;
+//        public Long timestamp;
+
+        // Standard Citeproc fields
+
+        @JsonProperty("date-parts")
+        public String[][] dateParts; // Number?
+//        public String season; // Number?
+//        public String circa; // Number? Boolean?
+        public String literal;
+//        public String raw;
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCreateAndLinkResourceProvider.java b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCreateAndLinkResourceProvider.java
new file mode 100644
index 0000000000..d7402a1c7d
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefCreateAndLinkResourceProvider.java
@@ -0,0 +1,115 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink.crossref;
+
+import org.vivoweb.webapp.createandlink.Citation;
+import org.vivoweb.webapp.createandlink.CreateAndLinkResourceProvider;
+import org.vivoweb.webapp.createandlink.ExternalIdentifiers;
+import org.vivoweb.webapp.createandlink.ResourceModel;
+
+/**
+ * Provider for looking up DOIs in CrossRef
+ */
+public class CrossrefCreateAndLinkResourceProvider implements CreateAndLinkResourceProvider {
+    /**
+     * Make a normalized version of the ID
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public String normalize(String id) {
+        if (id != null) {
+            // Trim and lower case
+            String doiTrimmed = id.trim().toLowerCase();
+
+            // If we have been passed the resolver URI, strip it down to the bare DOI
+            if (doiTrimmed.startsWith("https://dx.doi.org/")) {
+                return doiTrimmed.substring(19);
+            } else if (doiTrimmed.startsWith("http://dx.doi.org/")) {
+                return doiTrimmed.substring(18);
+            } else if (doiTrimmed.startsWith("https://doi.org/")) {
+                return doiTrimmed.substring(16);
+            } else if (doiTrimmed.startsWith("http://doi.org/")) {
+                return doiTrimmed.substring(15);
+            }
+
+            return doiTrimmed;
+        }
+
+        return null;
+    }
+
+    /**
+     * Label for the UI
+     *
+     * @return
+     */
+    @Override
+    public String getLabel() {
+        return "DOI";
+    }
+
+    /**
+     * Resolve the DOI into other external identifiers
+     *
+     * @param externalId
+     * @return
+     */
+    @Override
+    public ExternalIdentifiers allExternalIDsForFind(String externalId) {
+        // For now, just return the DOI
+        ExternalIdentifiers ids = new ExternalIdentifiers();
+        ids.DOI = externalId;
+        return ids;
+    }
+
+    /**
+     * Look up the DOI in CrossRef, and populate a citation object
+     *
+     * @param id
+     * @param citation
+     * @return
+     */
+    @Override
+    public String findInExternal(String id, Citation citation) {
+        // Use content negotiation on the resolver API (wider variety of sources)
+        CrossrefResolverAPI resolverAPI = new CrossrefResolverAPI();
+        String json = resolverAPI.findInExternal(id, citation);
+
+        // If the content negotiation failed, use the CrossRef Native API
+        if (json == null) {
+            CrossrefNativeAPI nativeAPI = new CrossrefNativeAPI();
+            json = nativeAPI.findInExternal(id, citation);
+        }
+
+        // Return the JSON fragment
+        return json;
+    }
+
+    /**
+     * Create an internmediate model of the external resource (JSON string)
+     *
+     * @param externalId
+     * @param externalResource
+     * @return
+     */
+    @Override
+    public ResourceModel makeResourceModel(String externalId, String externalResource) {
+        // Note that the external resource may be slightly different, depending on whether it came from
+        // the resolver or native api
+
+        // First, try the resolver API format to create the model
+        CrossrefResolverAPI resolverAPI = new CrossrefResolverAPI();
+        ResourceModel resourceModel = resolverAPI.makeResourceModel(externalResource);
+
+        // Otherwise, try the native API format to create the model
+        if (resourceModel == null) {
+            CrossrefNativeAPI nativeAPI = new CrossrefNativeAPI();
+            resourceModel =  nativeAPI.makeResourceModel(externalResource);
+        }
+
+        // Return the created resource model
+        return resourceModel;
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefNativeAPI.java b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefNativeAPI.java
new file mode 100644
index 0000000000..ec5cd11f30
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefNativeAPI.java
@@ -0,0 +1,368 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink.crossref;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import edu.cornell.mannlib.vitro.webapp.utils.http.HttpClientFactory;
+import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.vivoweb.webapp.createandlink.Citation;
+import org.vivoweb.webapp.createandlink.CreateAndLinkUtils;
+import org.vivoweb.webapp.createandlink.ResourceModel;
+import org.vivoweb.webapp.createandlink.utils.HttpReader;
+import org.vivoweb.webapp.createandlink.utils.StringArrayDeserializer;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Interface to CrossRef's native API
+ */
+@JsonIgnoreProperties
+public class CrossrefNativeAPI {
+    private static final Log log = LogFactory.getLog(CrossrefNativeAPI.class);
+
+    // API endpoint address
+    private static final String CROSSREF_API      = "http://api.crossref.org/works/";
+
+    /**
+     * Find the DOI in CrossRef, filling the citation object
+     *
+     * @param id
+     * @param citation
+     * @return
+     */
+    public String findInExternal(String id, Citation citation) {
+        // Get JSON from the CrossRef API
+        String json = readUrl(CROSSREF_API + URLEncoder.encode(id));
+
+        if (StringUtils.isEmpty(json)) {
+            return null;
+        }
+
+        CrossrefResponse response = null;
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            response = objectMapper.readValue(json, CrossrefResponse.class);
+        } catch (IOException e) {
+            log.error("Unable to read JSON value", e);
+        }
+        if (response == null || response.message == null) {
+            return null;
+        }
+
+        // The CrossRef API sometimes gives a false record when the DOI deosn't exist
+        // So ensure that the response we got contains the DOI we asked for
+        if (!id.equalsIgnoreCase(response.message.DOI)) {
+            return null;
+        }
+
+        // Map the fields from the CrossRef response to the Citation object
+
+        citation.DOI = id;
+        citation.type = normalizeType(response.message.type);
+
+        if (!ArrayUtils.isEmpty(response.message.title)) {
+            citation.title = response.message.title[0];
+        }
+
+        if (!ArrayUtils.isEmpty(response.message.containerTitle)) {
+            for (String journal : response.message.containerTitle) {
+                if (citation.journal == null || citation.journal.length() < journal.length()) {
+                    citation.journal = journal;
+                }
+            }
+        }
+
+        if (response.message.author != null) {
+            List<Citation.Name> authors = new ArrayList<>();
+            for (CrossrefResponse.ResponseModel.Author author : response.message.author) {
+                Citation.Name citationAuthor = new Citation.Name();
+                citationAuthor.name = CreateAndLinkUtils.formatAuthorString(author.family, author.given);
+                authors.add(citationAuthor);
+            }
+            citation.authors = authors.toArray(new Citation.Name[authors.size()]);
+        }
+
+        citation.volume = response.message.volume;
+        citation.issue = response.message.issue;
+        citation.pagination = response.message.page;
+        if (citation.pagination == null) {
+            citation.pagination = response.message.articleNumber;
+        }
+
+        citation.publicationYear = extractYearFromDateField(response.message.publishedPrint);
+        if (citation.publicationYear == null) {
+            citation.publicationYear = extractYearFromDateField(response.message.publishedOnline);
+        }
+
+        return json;
+    }
+
+    /**
+     * Retrieve the year from a compound date field
+     *
+     * @param date
+     * @return
+     */
+    private Integer extractYearFromDateField(CrossrefResponse.ResponseModel.DateField date) {
+        if (date == null) {
+            return null;
+        }
+
+        if (ArrayUtils.isEmpty(date.dateParts)) {
+            return null;
+        }
+
+        return date.dateParts[0][0];
+    }
+
+    /**
+     * Create a full resource model from the external resource (JSON)
+     * @param externalResource
+     * @return
+     */
+    public ResourceModel makeResourceModel(String externalResource) {
+        if (StringUtils.isEmpty(externalResource)) {
+            return null;
+        }
+
+        CrossrefResponse response = null;
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            response = objectMapper.readValue(externalResource, CrossrefResponse.class);
+        } catch (IOException e) {
+            log.error("Unable to read JSON", e);
+        }
+        if (response == null || response.message == null) {
+            return null;
+        }
+
+        if (StringUtils.isEmpty(response.message.DOI)) {
+            return null;
+        }
+
+        // Map the fields from the CrossRef response to the resource model
+
+        ResourceModel model = new ResourceModel();
+
+        model.DOI = response.message.DOI;
+        model.ISSN = response.message.ISSN;
+        model.URL = response.message.URL;
+
+        if (response.message.author != null && response.message.author.length > 0) {
+            model.author = new ResourceModel.NameField[response.message.author.length];
+            for (int authIdx = 0; authIdx < response.message.author.length; authIdx++) {
+                if (response.message.author[authIdx] != null) {
+                    model.author[authIdx] = new ResourceModel.NameField();
+                    model.author[authIdx].family = response.message.author[authIdx].family;
+                    model.author[authIdx].given = response.message.author[authIdx].given;
+                }
+            }
+        }
+
+
+        if (response.message.containerTitle != null && response.message.containerTitle.length > 0) {
+            String journalName = null;
+            for (String container : response.message.containerTitle) {
+                if (journalName == null || container.length() > journalName.length()) {
+                    journalName = container;
+                }
+            }
+            model.containerTitle = journalName;
+        }
+
+        model.issue = response.message.issue;
+
+        if (!StringUtils.isEmpty(response.message.page)) {
+            if (response.message.page.contains("-")) {
+                int hyphen = response.message.page.indexOf('-');
+                model.pageStart = response.message.page.substring(0, hyphen);
+                model.pageEnd = response.message.page.substring(hyphen + 1);
+            } else {
+                model.pageStart = response.message.page;
+            }
+        } else if (!StringUtils.isEmpty(response.message.articleNumber)) {
+            model.pageStart = response.message.articleNumber;
+        }
+
+        model.publicationDate = convertDateField(response.message.publishedPrint);
+        if (model.publicationDate == null) {
+            model.publicationDate = convertDateField(response.message.publishedOnline);
+        }
+
+        model.publisher = response.message.publisher;
+        model.subject = response.message.subject;
+        if (response.message.title != null && response.message.title.length > 0) {
+            model.title = response.message.title[0];
+        }
+
+        model.type = normalizeType(response.message.type);
+        model.volume = response.message.volume;
+
+        return model;
+    }
+
+    /**
+     * Map non-standard publication types into the CiteProc types
+     *
+     * @param type
+     * @return
+     */
+    private String normalizeType(String type) {
+        if (type != null) {
+            switch (type.toLowerCase()) {
+                case "journal-article":
+                    return "article-journal";
+
+                case "book-chapter":
+                    return "chapter";
+
+                case "proceedings-article":
+                    return "paper-conference";
+            }
+        }
+
+        return type;
+    }
+
+    /**
+     * Convert a date field from the CrossRef response to the internal resource model format
+     *
+     * @param dateField
+     * @return
+     */
+    private ResourceModel.DateField convertDateField(CrossrefResponse.ResponseModel.DateField dateField) {
+        if (dateField != null) {
+            ResourceModel.DateField resourceDate = new ResourceModel.DateField();
+            if (dateField.dateParts != null && dateField.dateParts.length > 0 && dateField.dateParts[0].length > 0) {
+                if (dateField.dateParts.length == 1) {
+                    resourceDate.year = dateField.dateParts[0][0];
+                } else if (dateField.dateParts.length == 2) {
+                    resourceDate.year = dateField.dateParts[0][0];
+                    resourceDate.month = dateField.dateParts[0][1];
+                } else {
+                    resourceDate.year = dateField.dateParts[0][0];
+                    resourceDate.month = dateField.dateParts[0][1];
+                    resourceDate.day = dateField.dateParts[0][2];
+                }
+            }
+            return resourceDate;
+        }
+
+        return null;
+    }
+
+    /**
+     * Read JSON from the given URL
+     *
+     * @param url
+     * @return
+     */
+    private String readUrl(String url) {
+        try {
+            HttpClient client = HttpClientFactory.getHttpClient();
+            HttpGet request = new HttpGet(url);
+            HttpResponse response = client.execute(request);
+            return HttpReader.fromResponse(response);
+        } catch (IOException e) {
+        }
+
+        return null;
+    }
+
+    /**
+     * Java object representation of the JSON returned by CrossRef
+     */
+    private static class CrossrefResponse {
+        public ResponseModel message;
+
+        @JsonProperty("message-type")
+        public String messageType;
+
+        @JsonProperty("message-version")
+        public String messageVersion;
+
+        public String status;
+
+        public static class ResponseModel {
+            public String DOI;
+            @JsonDeserialize(using = StringArrayDeserializer.class)
+            public String[] ISSN;
+            public String URL;
+
+            @JsonProperty("alternative-id")
+            @JsonDeserialize(using = StringArrayDeserializer.class)
+            public String[] alternativeId;
+
+            public Author[] author;
+
+            @JsonProperty("container-title")
+            @JsonDeserialize(using = StringArrayDeserializer.class)
+            public String[] containerTitle;
+            public DateField created;
+            public DateField deposited;
+            public DateField indexed;
+            public String issue;
+            public DateField issued;
+            public String member;
+            public String page;
+            public String prefix;
+
+            @JsonProperty("article-number")
+            public String articleNumber;
+
+            @JsonProperty("published-online")
+            public DateField publishedOnline;
+
+            @JsonProperty("published-print")
+            public DateField publishedPrint;
+
+            public String publisher;
+
+            @JsonProperty("reference-count")
+            public Integer referenceCount;
+            public Double score;
+            @JsonDeserialize(using = StringArrayDeserializer.class)
+            public String[] subject;
+            @JsonDeserialize(using = StringArrayDeserializer.class)
+            public String[] subtitle;
+            @JsonDeserialize(using = StringArrayDeserializer.class)
+            public String[] title;
+            public String type;
+            public String volume;
+
+
+            public static class Author {
+                @JsonDeserialize(using = StringArrayDeserializer.class)
+                public String[] affiliation;
+                public String family;
+                public String given;
+            }
+
+            public static class DateField {
+                @JsonProperty("date-parts")
+                public Integer[][] dateParts;
+
+                @JsonProperty("date-time")
+                public Date dateTime;
+
+                public Long timestamp;
+            }
+        }
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefResolverAPI.java b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefResolverAPI.java
new file mode 100644
index 0000000000..7fb949ab25
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/crossref/CrossrefResolverAPI.java
@@ -0,0 +1,392 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink.crossref;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.cornell.mannlib.vitro.webapp.utils.http.HttpClientFactory;
+import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.vivoweb.webapp.createandlink.Citation;
+import org.vivoweb.webapp.createandlink.CreateAndLinkUtils;
+import org.vivoweb.webapp.createandlink.ResourceModel;
+import org.vivoweb.webapp.createandlink.utils.HttpReader;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Interface to the CrossRef resolver
+ */
+public class CrossrefResolverAPI {
+    protected final Log logger = LogFactory.getLog(getClass());
+
+    // Base URL for the resolver
+    private static final String CROSSREF_RESOLVER = "https://doi.org/";
+
+    /**
+     * Find the DOI in CrossRef, filling the citation object
+     *
+     * @param id
+     * @param citation
+     * @return
+     */
+    public String findInExternal(String id, Citation citation) {
+        try {
+            // Read JSON from the resolver
+            String json = readJSON(CROSSREF_RESOLVER + URLEncoder.encode(id));
+
+            if (StringUtils.isEmpty(json)) {
+                return null;
+            }
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            CrossrefCiteprocJSONModel jsonModel = objectMapper.readValue(json, CrossrefCiteprocJSONModel.class);
+            if (jsonModel == null) {
+                return null;
+            }
+
+            // Ensure that we have the correct resource
+            if (!id.equalsIgnoreCase(jsonModel.DOI)) {
+                return null;
+            }
+
+            // Map the fields of the resolver response to the citation object
+
+            citation.DOI = id;
+            citation.type = normalizeType(jsonModel.type);
+            citation.title = jsonModel.title;
+            citation.journal = jsonModel.containerTitle;
+
+            if (jsonModel.author != null) {
+                List<Citation.Name> authors = new ArrayList<>();
+                for (CrossrefCiteprocJSONModel.NameField author : jsonModel.author) {
+                    splitNameLiteral(author);
+                    Citation.Name citationAuthor = new Citation.Name();
+                    citationAuthor.name = CreateAndLinkUtils.formatAuthorString(author.family, author.given);
+                    authors.add(citationAuthor);
+                }
+                citation.authors = authors.toArray(new Citation.Name[authors.size()]);
+            }
+
+            citation.volume = jsonModel.volume;
+            citation.issue = jsonModel.issue;
+            citation.pagination = jsonModel.page;
+            if (citation.pagination == null) {
+                citation.pagination = jsonModel.articleNumber;
+            }
+
+            citation.publicationYear = extractYearFromDateField(jsonModel.publishedPrint);
+            if (citation.publicationYear == null) {
+                citation.publicationYear = extractYearFromDateField(jsonModel.publishedOnline);
+            }
+
+            return json;
+        } catch (Exception e) {
+            logger.error("[CREF] Error resolving DOI " + id + ", cause "+ e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Extract the year from the crossref JSON model
+     *
+     * @param date
+     * @return
+     */
+    private Integer extractYearFromDateField(CrossrefCiteprocJSONModel.DateField date) {
+        if (date == null) {
+            return null;
+        }
+
+        if (ArrayUtils.isEmpty(date.dateParts)) {
+            return null;
+        }
+
+        return Integer.parseInt(date.dateParts[0][0]);
+    }
+
+    /**
+     *
+     * @param externalResource
+     * @return
+     */
+    public ResourceModel makeResourceModel(String externalResource) {
+        if (StringUtils.isEmpty(externalResource)) {
+            return null;
+        }
+
+        CrossrefCiteprocJSONModel jsonModel = null;
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            jsonModel = objectMapper.readValue(externalResource, CrossrefCiteprocJSONModel.class);
+        } catch (IOException e) {
+            logger.error("Unable to read JSON", e);
+        }
+        if (jsonModel == null) {
+            return null;
+        }
+
+        if (StringUtils.isEmpty(jsonModel.DOI)) {
+            return null;
+        }
+
+        // Map the fields of the Java object to the resource model
+
+        ResourceModel model = new ResourceModel();
+
+        model.DOI = jsonModel.DOI;
+        model.PubMedID = jsonModel.PMID;
+        model.PubMedCentralID = jsonModel.PMCID;
+        model.ISSN = jsonModel.ISSN;
+        model.ISBN = jsonModel.ISBN;
+        model.URL = jsonModel.URL;
+
+        if (jsonModel.ISBN != null) {
+            int isbnIdx = 0;
+            model.ISBN = new String[jsonModel.ISBN.length];
+            for (String isbn : jsonModel.ISBN) {
+                if (isbn.lastIndexOf('/') > -1) {
+                    isbn = isbn.substring(isbn.lastIndexOf('/') + 1);
+                }
+
+                model.ISBN[isbnIdx] = isbn;
+                isbnIdx++;
+            }
+        }
+
+        model.author = convertNameFields(jsonModel.author);
+        model.editor = convertNameFields(jsonModel.editor);
+        model.translator = convertNameFields(jsonModel.translator);
+
+        model.containerTitle = jsonModel.containerTitle;
+
+        model.issue = jsonModel.issue;
+
+        if (!StringUtils.isEmpty(jsonModel.page)) {
+            if (jsonModel.page.contains("-")) {
+                int hyphen = jsonModel.page.indexOf('-');
+                model.pageStart = jsonModel.page.substring(0, hyphen);
+                model.pageEnd = jsonModel.page.substring(hyphen + 1);
+            } else {
+                model.pageStart = jsonModel.page;
+            }
+        } else if (!StringUtils.isEmpty(jsonModel.articleNumber)) {
+            model.pageStart = jsonModel.articleNumber;
+        }
+
+        model.publicationDate = convertDateField(jsonModel.publishedPrint);
+        if (model.publicationDate == null) {
+            model.publicationDate = convertDateField(jsonModel.publishedOnline);
+        }
+
+        model.publisher = jsonModel.publisher;
+        model.subject = jsonModel.subject;
+        model.title = jsonModel.title;
+        model.type = normalizeType(jsonModel.type);
+        model.volume = jsonModel.volume;
+
+        model.status = jsonModel.status;
+        model.presentedAt = jsonModel.event;
+        model.abstractText = jsonModel.abstractText;
+
+        return model;
+    }
+
+    /**
+     * Convert CiteProc name fields into resource model name fields
+     *
+     * @param nameFields
+     * @return
+     */
+    private ResourceModel.NameField[] convertNameFields(CrossrefCiteprocJSONModel.NameField[] nameFields) {
+        if (nameFields == null) {
+            return null;
+        }
+
+        ResourceModel.NameField[] destNameFields = new ResourceModel.NameField[nameFields.length];
+
+        for (int nameIdx = 0; nameIdx < nameFields.length; nameIdx++) {
+            if (nameFields[nameIdx] != null) {
+                splitNameLiteral(nameFields[nameIdx]);
+                destNameFields[nameIdx] = new ResourceModel.NameField();
+                destNameFields[nameIdx].family = nameFields[nameIdx].family;
+                destNameFields[nameIdx].given = nameFields[nameIdx].given;
+            }
+        }
+
+        return destNameFields;
+    }
+
+    /**
+     * Map non-standard publication types into the CiteProc types
+     *
+     * @param type
+     * @return
+     */
+    private String normalizeType(String type) {
+        if (type != null) {
+            switch (type.toLowerCase()) {
+                case "journal-article":
+                    return "article-journal";
+
+                case "book-chapter":
+                    return "chapter";
+
+                case "proceedings-article":
+                    return "paper-conference";
+            }
+         }
+
+        return type;
+    }
+
+    /**
+     * Split a name literal into first and last names
+     *
+     * @param author
+     */
+    private void splitNameLiteral(CrossrefCiteprocJSONModel.NameField author) {
+        if (StringUtils.isEmpty(author.family)) {
+            String given = null;
+            if (!StringUtils.isEmpty(author.literal)) {
+                if (author.literal.contains(",")) {
+                    author.family = author.literal.substring(0, author.literal.indexOf(','));
+                    given = author.literal.substring(author.literal.indexOf(',') + 1);
+                } else if (author.literal.lastIndexOf(' ') > -1) {
+                    author.family = author.literal.substring(author.literal.lastIndexOf(' ') + 1);
+                    given = author.literal.substring(0, author.literal.lastIndexOf(' '));
+                } else {
+                    author.family = author.literal;
+                }
+            }
+
+            if (StringUtils.isEmpty(author.given)) {
+                author.given = given;
+            }
+        }
+    }
+
+    /**
+     * Convert a CiteProc date field to resource model date field
+     *
+     * @param dateField
+     * @return
+     */
+    private ResourceModel.DateField convertDateField(CrossrefCiteprocJSONModel.DateField dateField) {
+        if (dateField != null) {
+            ResourceModel.DateField resourceDate = new ResourceModel.DateField();
+            if (dateField.dateParts != null && dateField.dateParts.length > 0 && dateField.dateParts[0].length > 0) {
+                try {
+                    resourceDate.year = Integer.parseInt(dateField.dateParts[0][0], 10);
+                } catch (NumberFormatException nfe) {
+                }
+                if (dateField.dateParts.length > 1) {
+                    try {
+                        resourceDate.month = Integer.parseInt(dateField.dateParts[0][1], 10);
+                    } catch (NumberFormatException nfe) {
+                        switch (dateField.dateParts[0][1].toLowerCase()) {
+                            case "jan":
+                            case "january":
+                                resourceDate.month = 1;
+                                break;
+
+                            case "feb":
+                            case "february":
+                                resourceDate.month = 2;
+                                break;
+
+                            case "mar":
+                            case "march":
+                                resourceDate.month = 3;
+                                break;
+
+                            case "apr":
+                            case "april":
+                                resourceDate.month = 4;
+                                break;
+
+                            case "may":
+                                resourceDate.month = 5;
+                                break;
+
+                            case "jun":
+                            case "june":
+                                resourceDate.month = 6;
+                                break;
+
+                            case "jul":
+                            case "july":
+                                resourceDate.month = 7;
+                                break;
+
+                            case "aug":
+                            case "august":
+                                resourceDate.month = 8;
+                                break;
+
+                            case "sep":
+                            case "september":
+                                resourceDate.month = 9;
+                                break;
+
+                            case "oct":
+                            case "october":
+                                resourceDate.month = 10;
+                                break;
+
+                            case "nov":
+                            case "november":
+                                resourceDate.month = 11;
+                                break;
+
+                            case "dec":
+                            case "december":
+                                resourceDate.month = 12;
+                                break;
+                        }
+                    }
+                }
+                if (dateField.dateParts.length > 2) {
+                    try {
+                        resourceDate.day = Integer.parseInt(dateField.dateParts[0][2], 10);
+                    } catch (NumberFormatException nfe) {
+                    }
+                }
+            }
+            return resourceDate;
+        }
+
+        return null;
+    }
+
+    /**
+     * Read JSON from the URL
+     * @param url
+     * @return
+     */
+    private String readJSON(String url) {
+        try {
+            HttpClient client = HttpClientFactory.getHttpClient();
+            HttpGet request = new HttpGet(url);
+
+            // Content negotiate for csl / citeproc JSON
+            request.setHeader("Accept", "application/vnd.citationstyles.csl+json;q=1.0");
+
+            HttpResponse response = client.execute(request);
+            return HttpReader.fromResponse(response);
+        } catch (IOException e) {
+        }
+
+        return null;
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/pubmed/PubMedCreateAndLinkResourceProvider.java b/api/src/main/java/org/vivoweb/webapp/createandlink/pubmed/PubMedCreateAndLinkResourceProvider.java
new file mode 100644
index 0000000000..4e164c1238
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/pubmed/PubMedCreateAndLinkResourceProvider.java
@@ -0,0 +1,377 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink.pubmed;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import edu.cornell.mannlib.vitro.webapp.utils.http.HttpClientFactory;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.vivoweb.webapp.createandlink.Citation;
+import org.vivoweb.webapp.createandlink.CreateAndLinkResourceProvider;
+import org.vivoweb.webapp.createandlink.ExternalIdentifiers;
+import org.vivoweb.webapp.createandlink.ResourceModel;
+import org.vivoweb.webapp.createandlink.utils.HttpReader;
+import org.vivoweb.webapp.createandlink.utils.StringArrayDeserializer;
+
+import java.io.IOException;
+
+public class PubMedCreateAndLinkResourceProvider implements CreateAndLinkResourceProvider {
+    protected final Log logger = LogFactory.getLog(getClass());
+
+    public final static String PUBMED_ID_API = "http://www.ncbi.nlm.nih.gov/pmc/utils/idconv/v1.0/?format=json&ids=";
+    public final static String PUBMED_SUMMARY_API = "http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=pubmed&retmode=json&tool=my_tool&email=my_email@example.com&id=";
+
+    @Override
+    public String normalize(String id) {
+        return id.trim();
+    }
+
+    @Override
+    public String getLabel() {
+        return "PubMed ID";
+    }
+
+    @Override
+    public ExternalIdentifiers allExternalIDsForFind(String externalId) {
+        ExternalIdentifiers ids = new ExternalIdentifiers();
+        ids.PubMedID = externalId;
+
+        String json = readUrl(PUBMED_ID_API + externalId);
+        if (!StringUtils.isEmpty(json)) {
+            PubMedIDResponse response = null;
+            try {
+                ObjectMapper objectMapper = new ObjectMapper();
+                objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                response = objectMapper.readValue(json, PubMedIDResponse.class);
+            } catch (IOException e) {
+                logger.error("Unable to read JSON", e);
+            }
+            if (response != null && !ArrayUtils.isEmpty(response.records)) {
+                ids.DOI = response.records[0].doi;
+                ids.PubMedCentralID = response.records[0].pmcid;
+            }
+        }
+
+        return ids;
+    }
+
+    @Override
+    public String findInExternal(String id, Citation citation) {
+        try {
+            String json = readUrl(PUBMED_SUMMARY_API + id);
+            if (StringUtils.isEmpty(json)) {
+                return null;
+            }
+
+            JsonFactory factory = new JsonFactory();
+            JsonParser parser  = factory.createParser(json);
+            if (parser != null) {
+                while (!parser.isClosed() && !id.equals(parser.getCurrentName())) {
+                    JsonToken token = parser.nextToken();
+                }
+
+                if (!parser.isClosed()) {
+                    // We have reached the field for our ID, but we need to be on the next token for the mapper to work
+                    JsonToken token = parser.nextToken();
+                    ObjectMapper objectMapper = new ObjectMapper();
+                    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                    PubMedSummaryResponse response = objectMapper.readValue(parser, PubMedSummaryResponse.class);
+                    if (response != null) {
+                        citation.title = response.title;
+                        citation.authors = new Citation.Name[response.authors.length];
+                        for (int idx = 0; idx < response.authors.length; idx++) {
+                            citation.authors[idx] = new Citation.Name();
+                            citation.authors[idx].name = normalizeAuthorName(response.authors[idx].name);
+                        }
+                        citation.journal = response.fulljournalname;
+                        citation.volume = response.volume;
+                        citation.issue = response.issue;
+                        citation.pagination = response.pages;
+                        if (!StringUtils.isEmpty(response.pubdate) && response.pubdate.length() >= 4) {
+                            citation.publicationYear = Integer.parseInt(response.pubdate.substring(0, 4), 10);
+                        }
+
+                        citation.type = getCiteprocTypeForPubType(response.pubtype);
+
+                        return json;
+                    }
+                }
+            }
+
+            return null;
+        } catch (Exception e) {
+            logger.error("[PMID] Error resolving PMID " + id + ", cause "+ e.getMessage());
+            return null;
+        }
+    }
+
+    @Override
+    public ResourceModel makeResourceModel(String externalId, String externalResource) {
+        try {
+            JsonFactory factory = new JsonFactory();
+            JsonParser parser = factory.createParser(externalResource);
+            if (parser != null) {
+                while (!parser.isClosed() && !externalId.equals(parser.getCurrentName())) {
+                    JsonToken token = parser.nextToken();
+                }
+
+                if (!parser.isClosed()) {
+                    // We have reached the field for our ID, but we need to be on the next token for the mapper to work
+                    JsonToken token = parser.nextToken();
+                    ObjectMapper objectMapper = new ObjectMapper();
+                    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                    PubMedSummaryResponse response = objectMapper.readValue(parser, PubMedSummaryResponse.class);
+                    if (response != null) {
+                        ResourceModel resourceModel = new ResourceModel();
+                        resourceModel.PubMedID = externalId;
+                        resourceModel.title = response.title;
+                        resourceModel.author = new ResourceModel.NameField[response.authors.length];
+                        for (int idx = 0; idx < response.authors.length; idx++) {
+                            resourceModel.author[idx] = new ResourceModel.NameField();
+                            if (response.authors[idx].name.lastIndexOf(' ') > 0) {
+                                resourceModel.author[idx].family = response.authors[idx].name.substring(0, response.authors[idx].name.lastIndexOf(' '));
+                                resourceModel.author[idx].given = response.authors[idx].name.substring(response.authors[idx].name.lastIndexOf(' ') + 1);
+                            } else {
+                                resourceModel.author[idx].family = response.authors[idx].name;
+                            }
+                        }
+
+                        resourceModel.containerTitle = response.fulljournalname;
+                        if (!StringUtils.isEmpty(response.issn)) {
+                            resourceModel.ISSN = new String[1];
+                            resourceModel.ISSN[0] = response.issn;
+                        } else if (!StringUtils.isEmpty(response.eissn)) {
+                            resourceModel.ISSN = new String[1];
+                            resourceModel.ISSN[0] = response.eissn;
+                        }
+
+                        resourceModel.volume = response.volume;
+                        resourceModel.issue = response.issue;
+                        if (response.pages.contains("-")) {
+                            int hyphen = response.pages.indexOf('-');
+                            resourceModel.pageStart = response.pages.substring(0, hyphen);
+                            resourceModel.pageEnd = response.pages.substring(hyphen + 1);
+                        } else {
+                            resourceModel.pageStart = response.pages;
+                        }
+
+                        if (!StringUtils.isEmpty(response.pubdate) && response.pubdate.length() >= 4) {
+                            resourceModel.publicationDate = new ResourceModel.DateField();
+                            resourceModel.publicationDate.year = Integer.parseInt(response.pubdate.substring(0, 4), 10);
+                        }
+
+                        if (response.articleids != null) {
+                            for (PubMedSummaryResponse.ArticleID articleID : response.articleids) {
+                                if (!StringUtils.isEmpty(articleID.value)) {
+                                    if ("doi".equalsIgnoreCase(articleID.idtype)) {
+                                        resourceModel.DOI = articleID.value.trim();
+                                    } else if ("pmc".equalsIgnoreCase(articleID.idtype)) {
+                                        resourceModel.PubMedCentralID = articleID.value.trim();
+                                    } else if ("pmcid".equalsIgnoreCase(articleID.idtype)) {
+                                        if (StringUtils.isEmpty(resourceModel.PubMedCentralID)) {
+                                            String id = articleID.value.replaceAll(".*(PMC[0-9]+).*", "$1");
+                                            if (!StringUtils.isEmpty(id)) {
+                                                resourceModel.PubMedCentralID = id;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        resourceModel.type = getCiteprocTypeForPubType(response.pubtype);
+                        resourceModel.publisher = response.publishername;
+                        resourceModel.status = response.pubstatus;
+
+        /*
+            public DateField created;
+            public String[] subject;
+            public String presentedAt;
+            public String[] keyword;
+            public String abstractText;
+         */
+                        return resourceModel;
+                    }
+                }
+            }
+        } catch (IOException e) {
+            logger.error("Unable to read JSON", e);
+        }
+
+        return null;
+    }
+
+    private String normalizeAuthorName(String name) {
+        if (name.indexOf(',') < 0 && name.indexOf(' ') > -1) {
+            int lastSpace = name.lastIndexOf(' ');
+            int insertPoint = lastSpace;
+            while (insertPoint > 0) {
+                if (name.charAt(insertPoint - 1) == ' ') {
+                    insertPoint--;
+                } else {
+                    break;
+                }
+            }
+
+            return name.substring(0, insertPoint) + "," + name.substring(lastSpace);
+        }
+        return name;
+    }
+
+    private String getCiteprocTypeForPubType(String[] pubTypes) {
+        if (pubTypes != null && pubTypes.length > 0) {
+            for (String pubType : pubTypes) {
+                switch (pubType) {
+                    case "Journal Article":
+                        return "article-journal";
+
+                    case "Incunabula":
+                    case "Monograph":
+                    case "Textbooks":
+                        return "book";
+
+                    case "Dataset":
+                        return "dataset";
+
+                    case "Legal Cases":
+                        return "legal_case";
+
+                    case "Legislation":
+                        return "legislation";
+
+                    case "Manuscripts":
+                        return "manuscript";
+
+                    case "Maps":
+                        return "map";
+
+                    case "Meeting Abstracts":
+                        return "paper-conference";
+
+                    case "Patents":
+                        return "patent";
+
+                    case "Letter":
+                        return "personal_communication";
+
+                    case "Blogs":
+                        return "post-weblog";
+
+                    case "Review":
+                        return "review";
+
+                    case "Academic Dissertations":
+                        return "thesis";
+                }
+            }
+        }
+
+        return "article-journal";
+    }
+
+    private String readUrl(String url) {
+        try {
+            HttpClient client = HttpClientFactory.getHttpClient();
+            HttpGet request = new HttpGet(url);
+            HttpResponse response = client.execute(request);
+            return HttpReader.fromResponse(response);
+        } catch (IOException e) {
+        }
+
+        return null;
+    }
+
+    private static class PubMedIDResponse {
+        public String status;
+        public String responseDate;
+        public String request;
+        public String warning;
+
+        public PubMedIDRecord[] records;
+
+        public static class PubMedIDRecord {
+            String pmcid;
+            String pmid;
+            String doi;
+
+            // Don't need versions
+        }
+    }
+
+    private static class PubMedSummaryResponse {
+        public String uid;
+        public String pubdate;
+        //public String epubdate;
+        public String source;
+        public NameField[] authors;
+        //public String lastauthor;
+        public String title;
+        //public String sorttitle;
+        public String volume;
+        public String issue;
+        public String pages;
+        @JsonDeserialize(using = StringArrayDeserializer.class)
+        public String[] lang;
+        //public String nlmuniqueid;
+        public String issn;
+        public String eissn;
+        @JsonDeserialize(using = StringArrayDeserializer.class)
+        public String[] pubtype;
+        //public String recordstatus;
+        public String pubstatus;
+        public ArticleID[] articleids;
+        public History[] history;
+        //public String[] references;
+        @JsonDeserialize(using = StringArrayDeserializer.class)
+        public String[] attributes;
+        //public Integer pmcrefcount;
+        public String fulljournalname;
+        //public String elocationid;
+        //public Integer viewcount;
+        //public String doctype;
+        //public String[] srccontriblist;
+        //public String booktitle;
+        //public String medium;
+        //public String edition;
+        //public String publisherlocation;
+        public String publishername;
+        //public String srcdate;
+        //public String reportnumber;
+        //public String availablefromurl;
+        //public String locationlabel;
+        //public String[] doccontriblist;
+        //public String docdate;
+        //public String bookname;
+        public String chapter;
+        //public String sortpubdate;
+        //public String sortfirstauthor;
+        //public String vernaculartitle;
+
+        public static class NameField {
+            public String name;
+            //public String authtype;
+            //public String clusterid;
+        }
+
+        public static class ArticleID {
+            public String idtype;
+            //public Integer idtypen;
+            public String value;
+        }
+
+        public static class History {
+            public String pubstatus;
+            public String date;
+        }
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/utils/HttpReader.java b/api/src/main/java/org/vivoweb/webapp/createandlink/utils/HttpReader.java
new file mode 100644
index 0000000000..2a274f0cce
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/utils/HttpReader.java
@@ -0,0 +1,35 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink.utils;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+
+public class HttpReader {
+    public static String fromResponse(HttpResponse response) throws IOException {
+        HttpEntity entity = response != null ? response.getEntity() : null;
+        try {
+            if (entity != null) {
+                if (response.getStatusLine().getStatusCode() == 200) {
+                    try (InputStream in = entity.getContent()) {
+                        StringWriter writer = new StringWriter();
+                        IOUtils.copy(in, writer, "UTF-8");
+                        return writer.toString();
+                    }
+                }
+            }
+        } finally {
+            if (entity != null) {
+                EntityUtils.consume(entity);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/createandlink/utils/StringArrayDeserializer.java b/api/src/main/java/org/vivoweb/webapp/createandlink/utils/StringArrayDeserializer.java
new file mode 100644
index 0000000000..5354d03a68
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/createandlink/utils/StringArrayDeserializer.java
@@ -0,0 +1,35 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package org.vivoweb.webapp.createandlink.utils;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class StringArrayDeserializer extends JsonDeserializer<String[]> {
+    @Override
+    public String[] deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException, JsonProcessingException {
+        if (JsonToken.VALUE_NULL.equals(jsonParser.getCurrentToken())) {
+            jsonParser.nextToken();
+            return null;
+        }
+
+        if (JsonToken.START_ARRAY.equals(jsonParser.getCurrentToken())) {
+            List<String> list = new ArrayList<>();
+            while (!JsonToken.END_ARRAY.equals(jsonParser.nextToken())) {
+                list.add(jsonParser.getValueAsString());
+            }
+            return list.toArray(new String[list.size()]);
+        } else if (JsonToken.VALUE_STRING.equals(jsonParser.getCurrentToken())) {
+            return new String[] { jsonParser.getText() };
+        }
+
+        return null;
+    }
+}
diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties
index af7459a3e4..87fc96218e 100644
--- a/home/src/main/resources/config/example.runtime.properties
+++ b/home/src/main/resources/config/example.runtime.properties
@@ -375,8 +375,14 @@ Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Ro
     http://xmlns.com/foaf/0.1/Person, foaf:Person; \
     http://purl.obolibrary.org/obo/IAO_0000030, obo:IAO_0000030
 
+  # Configure the support for claiming by DOI or PMID
+  # This is a list of all the providers that are active for claiming articles from
+  # Options: doi, pmid
+  # which search Crossref and PubMed, respectively
+  # If you do not wish to use the claiming interface, set this property to nothing (empty)
+createAndLink.providers = doi, pmid
 
-# Triple pattern fragments is a very fast, very simple means for querying a triple store.
-# The triple pattern fragments API in VIVO puts little load on the server, providing a simple means for getting data from the triple store. The API has a web interface for manual use, can be used from the command line via curl, and can be used by programs.
-
-# tpf.activeFlag = true
+  # Triple pattern fragments is a very fast, very simple means for querying a triple store.
+  # The triple pattern fragments API in VIVO puts little load on the server, providing a simple means for getting data from the triple store. The API has a web interface for manual use, can be used from the command line via curl, and can be used by programs.
+  #
+# tpf.activeFlag = true
\ No newline at end of file
diff --git a/webapp/src/main/webapp/i18n/vivo_all.properties b/webapp/src/main/webapp/i18n/vivo_all.properties
index d54ceaf051..08a116634d 100644
--- a/webapp/src/main/webapp/i18n/vivo_all.properties
+++ b/webapp/src/main/webapp/i18n/vivo_all.properties
@@ -810,3 +810,55 @@ role_in_presentation_capitalized=Role in Presentation
 advisee_capitalized_first_name=First Name
 advisee_capitalized_lastname=Last Name
 
+# Messages for creating and linking resources (publications)
+create_and_link_enter=Enter {0}:
+create_and_link_claim_for=Claiming works for<br />{0}
+create_and_link_confirm_works=Confirm your work(s)
+create_and_link_confirm_works_intro=Please check that these are the work(s) that you wish to claim, and indicate your relationship with them.
+create_and_link_authors=Authors
+create_and_link_authors_desc=If you are an author of a work, please select your name in the author list.<br />Retrieved metadata may be incomplete. If you can not see your name listed, select "Unlisted Author".
+create_and_link_editors=Editors
+create_and_link_editors_desc=If you edited the work, please select "Editor".
+create_and_link_not_mine_desc=If you do not wish to claim a work, select "This is not my work".
+create_and_link_already_claimed=You have already claimed this work.
+create_and_link_unlisted_author=Unlisted Author
+create_and_link_editor=Editor
+create_and_link_not_mine=This is not my work
+create_and_link_remaining=There are {0} ids remaining
+create_and_link_thank_you=Thank you
+create_and_link_finished=There are no more works left to claim.<br />You may enter more IDs below, or view your profile.
+create_and_link_go_profile=Go to profile
+create_and_link_enter_dois_intro=You may enter one or more DOIs to match, and can be entered either as an ID or URL:<br /><br />e.g.
+create_and_link_enter_dois_supported=Currently, DOIs issued by Crossref, DataCite and mEDRA are supported.<br />Each DOI should be separated by a comma or new line.
+create_and_link_enter_pmid_intro=You may enter one or more PubMed IDs to match. Each ID should be separated by a comma or new line.
+create_and_link_enter_pmid_supported=Note that metadata will be retrieved from Crossref, if the PubMed ID can be resolved to a DOI.
+create_and_link_unknown_profile=Unknown Profile
+create_and_link_unknown_resource=Unknown Resource Type
+create_and_link_unauthorized_for_profile=You do not have permissions to claim for this user
+create_and_link_submit_ids=Submit IDs
+create_and_link_submit_confirm=Confirm
+create_and_link_error=Unable to retrieve citation details
+create_and_link_type_article=Article
+create_and_link_type_article_journal=Journal Article
+create_and_link_type_book=Book
+create_and_link_type_chapter=Chapter
+create_and_link_type_dataset=Dataset
+create_and_link_type_figure=Image
+create_and_link_type_graphic=Image
+create_and_link_type_legal_case=Legal Case
+create_and_link_type_legislation=Legislation
+create_and_link_type_manuscript=Manuscript
+create_and_link_type_map=Map
+create_and_link_type_musical_score=Musical Score
+create_and_link_type_paper_conference=Conference Paper
+create_and_link_type_patent=Patent
+create_and_link_type_personal_communication=Letter
+create_and_link_type_post_weblog=Blog
+create_and_link_type_report=Report
+create_and_link_type_review=Review
+create_and_link_type_speech=Speech
+create_and_link_type_thesis=Thesis
+create_and_link_type_webpage=Webpage
+claim_publications_by=Claim publications by
+claim_publications_by_doi=DOI
+claim_publications_by_pmid=PubMed ID
\ No newline at end of file
diff --git a/webapp/src/main/webapp/images/createAndLink/error.png b/webapp/src/main/webapp/images/createAndLink/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..79bc4d75a02e90a2506c1191035b1c8864f4cf57
GIT binary patch
literal 2997
zcmV;m3rh5fP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm000ie
z000ie0hKEb8vp<cXGugsRCt{2oqMQU)fL8nGe`&$f`k|(TtX=6MS`R%p@^ozicNzQ
zv9?;9wpObM6_FtRQA(>=8$u|dEmp+(M`&%3DmD!oqsCw#6l=9jABb8XF-A?}BbtgP
z@n-V%k9AHxjx%@WJoanue6UCenR~vwzHiPsd+)W^ZZV<|w1Ej=5wI9o2%HGa1Lgv=
zvH&;=d;q);901+{_5-hE@nXyVZRF4jO`r(~jsunfD}YaBe_sk5-{56l0iFT=4m=M0
z1$a621SZK}_Q%P<dBEp^Gq7*9Z@dWn4%h)a3>-)@p(#Mn7AzNR6g($TWN}2WQ*gCl
zLFjyq1Z1&DaD(9K2t+PphOL4N^x=EP7{em_wyzRw$&wjb&^oavGw?~F^BO$_#|bVG
z?216RrsG|~t%6U4&U19ggkPhyZu3>+P-cXMq4ORbvREnjQv||<xFg)GFr%075KIU*
z3px>q5i)iQE|yJPjXq?z`zr-+MUecM;y&4o<>*58t=|?wvSW?61y^a*?gp~>f?!_+
zNlqcQXjF!cg4u!}38o@QY)Y|LurjoMwIEm^cqoEorW%K2kA(CfnAFS|*Sn66V7+X`
zGY!ZVZN|_0X5$W}u&yAR*clJ;+{9gi*-h%z=<>DTY+ws;LX$stjE~^Az}H$<y;K{G
z89?^Nx|Ol`KG2v68Zm&ZB4-;`Z#RY?+zouQ1&8bWklF?ioC54*Tm=&XzXYymSy5{x
z)S7aXRo!l7EPg0lij~M!*0J&jWy_db7#BE%#x=lNRs3+JM}TZn;!fa_iq{>ZS$qI|
zsRj3!{b1=kK<2dT8H*niW&xW7OUiz*^c^4@>pw&avr;n;e*iw$vOB_1D0K%A%m+3x
z7C%<31g<OdfuZjJ*_-BO{NMTyV}?t$Na8RJPu~u4y|Y^Iw_*NsnWSC-TwIA#b-V<8
z2KWhZ%=5LIz}>)Uz>^-YIh&>zjs)`ruX<kicuLt2Q?^m$W~Eg?x+!0{$?~_;^Yzy@
zB|fq`cAw;T$tIbKJlcZqBw&J$;5K!w-wWmnwtM99mYUdmAY0q_xjpNz>QfIVi|Z9{
zd09trOSkw1{&Qs2zrOg~shZ-q<@eUrSNtv$TpOVYIvQeH*0Tww1k39fV3qvcatDgv
zWrC|CGC@bMZjktaOmLqnir*GI7Mu88Cb&}JcMq2mzrf#@2|9u^ONpNmJU3SHyLg5)
zK}WXryV4wmM-%K&Nn*&)v%i-31-_RCFhMQx3*3E}pd&cF45?G({@MSJCd4mr_GyAf
z#4m84BlknZUz8zqi(@iRt81L!P$GSppi%J)+~*1&b;$dWhM5=0+~~5bd#@@iTb4+q
zOA|N|zrcN-?6K%7_cshf;xdN>q^71Qr~e(k?!W|2#V>F_PwpPSFHFl{7CRgp;4M`d
zmXuFqlP2&b{t{Wk2$%WqpL@Z42j84tv0r80N~<Td2^07de?ortQr<QliEnuzkjJaC
zl5(f0X#!v3FBJUCQ{MNh-%_#sckkF6u?c*Mf0F#S#aq#f$nk>rJQI<uk>bfNlbrp2
zWlWHZ@0!yB!4m;;zP=Zka{>^_W4B<^alVH&fiLmr2NGYhq2|X3tqW)X$%ZJ-<_8MD
z=O7dK5PzQhEwuGB`AOZRLJ}&P!1+$2%mlrbl4pYWd0bc|HG9Cf!e=}y5B>6bn81hl
zCkTEYL5?NZP$YJG1cXAEU`=NH@69mrC3v(*&gb|)HWMtHf#OSWP|(iDxTiVJK^075
zE#?-xyhscF>GGHtS;v&E#Mkq0E-;ZB!1-iMMdT(}6q-mCL@a)e$=m>oL$VlvNo;{C
zDH9|hKEPyKR>R(SaYn;P$^@DC_Yt@F0H17QRU#>Lp-jRAg>U}H=iB4MM4QMH+J&f1
zkjQPnh<R<&>+3g(RV+tk0@+)2O5#H{3{3INnk7VJf=v8vq$NIJYu$4~lc<O#MDRE$
zh@ZkU|6@qm01)_{Aa(J<43NSIU^)bOCm03s!3;2TN2!S6^_^f;#0N7#ioJJwVF_@)
zr)#ai8e}JrR6B3=!i~Vsd|apn4*-`_qe*itXaoNZO`-wZ2>ih1s$Mr*@GHy&Nk2l{
zz?-2-)W9(Uh@T@f!4)KIf|Lz#47iCv;^#=*1jkY}KosKVNZ16gw}ID4Yb211|HBx>
z&ylDJUTS9t54{$e$&e_DADw9vG{K&H82Im?G=@Xe;^#=r1TO+0xIKa@)#<{^M$IN6
zH%%&<j)|P?wGogR8S!%{O!u;3;|&#vo)H0|krF>g#3tBLBpK7zFt6fk@PBFI8Znw+
zV>iiATa`nKKUdaK+xaS@;(I5!pqt=NBOv8l{6A*be0GMJU`pM`{L0#sg(lXKoebhr
z{5*V_;Iarz@Pv903)Lc~D1Pa#+Z6=pC4L^yc``xhF6SHi5%YPZNw@eL0*mk41Xn5C
zc?W0rBXxBk@oOD`JY>SlY|(c9I1vBOw{H{dQ@=V;S=TC`x2BHl<ufMneVf4d@i(^*
zBIL7IVBZ6l8ccGX<_x|}aGggJtQtgUjVB^^coKimGd~s+_&5^pRSh~&QtsQuOR#w$
zk@`t(vMq}b6ZkkBbKS6HHaaA+RgTZnZCL!G2^Kr%-IluvxheH%!PoEQ>sH*AJimg&
zwQ{-JqV1z+(J|l!M?d=!^7a2gkj1@@oY;{)?;3}rZ@#xXf#71f8-<-$mdu%Q_dJ>s
zT+^fpJc;kj1cLMBZYFk@$_}+<;c`egC7TUvB6%VD@HJ)v!D_*~4!K@9m_=`5%jI@_
zdPFuaUMG3;RDY;f#{{(+Txa4Rbja~BRUK~2!qvM#Z4)St#><tvoO=+zqq;ko1t-hS
zoQui?vT5tk;ulR&>d*@h;!E)BGC7@&?0OGL9NGj5chbgmv3pn(coP4hnrgi-TSna-
zg9&5@EV(>fu}<vKfVR7y#FyauM#L`=|FYcARp%z?IXcM1_kF-p+1M*s7FhgUYI>?&
zHcfe#rzB3vmPw1(UnF=c0)dB#eS+m(`8!{3hkAJ&k*k9_Wd|MY@o0kY%8WNDtJDcC
zY?*jNuu_({HS$+(w@yyf|Ih@h<!|k}BU?H2WxA&0ZP~K7uOgerRdS)N^bYIHT^oVx
z%6@hXr#Jwd)q-cre5leE`^;tA=~rAhhHo4NzS4r<l>K0(TD%q<2EIxf+sbDGzE1`5
zq2e7NhhQmo`qY9tKWB_u_&M<Hsy!2GcUh4&Ox#X-ZRbY;cLU#O)hMv3U5?#?KLZyr
z8vO=S!UMqNb;O4T?f^LitATrg<D2@KWAw$tz!$UrPPNe3hKv?G$oNj+0}lchH6cDU
zcn8QK+jwvfX`Vz9JMPDZdyR<i41yK1snF0faibKQ%g*uzh2T{ASwbH5=*YIvIo(L(
z1cC|K{B-CfrW!{CYn5=5tbD84Ci$r)7^T=RSf$VcHUZg^?q#yovCxT4A+{-!Bk>xA
zV2S+K@23<8WlbYeKgg>;1hZtjg2s1)kH(`aSy`MkWF=nrX#8%lSJpmmbieieAbU4h
zrT7ayUBr8`ZTRCwG{JGQa`3$o2;({q$-1*I4xRVtAnR3lt<tRl93=cES)YM1rh}|`
z^%~iTA@z5JeS(_=3q$8MImlwE;K#Cwk<ele8&k4wB5Rb={C&)jy(gR_xK(k!D@@5Y
ztFD#pU`hfp9lSL(WJ9LYfpdY+Vmo0%6r%hG>%FrbE7Eu~wS=a|w<ogO?5BZKfzz<P
zc}r>b_WL?k1^p!OI93Yxa?A%<4TF&|Krdu>i3w~@eR1~ZiNGAJSY<A@#CntuJEFah
r9i;gt@CNn`e;#<g1@CyI?+yP0M3D`3)Rt7D00000NkvXXu0mjf{)nJN

literal 0
HcmV?d00001

diff --git a/webapp/src/main/webapp/images/createAndLink/tick.png b/webapp/src/main/webapp/images/createAndLink/tick.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ceffa389c3de5385c1d3b1ecaaafa5fc01feb0f
GIT binary patch
literal 7443
zcmZ{p1yoeux5o#h8$sz(O6eAchC#Z!J0yk}7={v2DFvjvRir@#q@|@BhH&VP0fuw{
z-}w8#|6BjJ)_ZrYd-uKT?6b~Y=bW|o{(er3uJ&_MB6=bK06?mys;rN(;eT%mJj^q>
zsx2C0a9k9$6aawQ1mYVzT+BDCgQ~t301(89@p}UR{Qm2|0|5970swoq0Dx2m06^oN
z)2t_rX~47Bc&?1GnCn`p<t4@tdaIiGVXXN-xA)`kp_mtZh?*7%e+8SI0+;TVkaQIQ
zVCYp-Rxk`)IQ#{(G@L=>ACEPO@ao4#7rH*OIMT@G$ucWs<u@((>Uu=`N>RV*4Ut!B
zX>@F6DF-%3*n?7>#-(vX%@GbUGitF1PHF~;nN4HJ1lqllL;{hV%+=OERFO^j!8Um=
zqnW{Dk|Yrdj~`*vzN>9tK_ZbGA5{&86Z;#yv|M)S-}wggNi`&g9_;+oW+Sd0$(q>b
z?z9C0TeYW3Gb{O;S<~Xa)q^Oq);TmZLVA6DCYBh1PwvO-$QXqcNWeWTTZ3sH4-m$G
z`eYiTan<w@CrT)>{VDeke(`iGes0?q+nAB->zxRmvlrHR($RS?1_IV8QZ>3T2QPk$
za%N}ogE<=|<N9a!^Ix7ka(IuW+*)0HjHE>Z>VHk9_}P$I{Q4NfX>t<#ZE7UW-_D2j
zU@MYD6ZA(rmtu5bD*tftaXi`Anr464cICI0K)l{YumMi|%2}zwFgD9Ld{}cfed%L1
zKAEe>$V&$x86$y?YkTNzllxp?e`TdI)_7eeq_2Oje`$%cUYlie*1C<|#@Fd0FYjBF
zzTR{-i!dd2LK+`zd&8MMm|VzZ%pPE^9AHkb<*c=Hes)&$>awvMefW!^cfm^&VQM}I
z{9Jk;SN^&4q}Luu-RX6H*4srJ*gC0i#Jg#i9o;l63#rw^xaEn=xH6l3sCIEJ^Zu)%
zM-_dr_v&hetmdx>m%}U|$Fb)#6;>@prr?J3(wSBVdY~Sl%vEo0ng0E=iEpJ}+aIal
zy4kW`8xa3~_KX(fZD+v97`QEBCL=^6XVaoGdPOQwY4M!w>%HS%n$<=Nb`H+1jpKM1
z4`r+`AK|SzAAU3jU3}#DrqC`36Aqdp*&w40_XxBNXFnM=ac^Q}S{@L#h*VHj)%v7#
zfMsRz-CMu*ox8rS3LY{rQky!QsE7IIDDy>eI?da0YB$t-I@*|P?wzGfD1Tv6{8!eG
z%u;WlU)n;%pT5wC&SikJK9!*2om`c%xa-(u_C@||wguPe9T+U-0MkE@E8NUhG9WD@
z;-%%SLSV<N=tSqKk8V?(pXC~P-DVJNtqv!~?!-UV!Zkv%E#?<Bw)R?l@3``9$w7}~
z1u5*jLD=Q>bDw5uqbK0Ex0idA1nG<T_&Nxr)K&Ijx&SKPXzInt%d=DPE*gj<)^vN+
z;$4h8EFeX%v&y+QSKbfI|DiU2PuD}(I&%GB9@h=VW<vFlzk&}+r`ZnRRU2H8uF$zW
zGL04E73U{Ys?7jF4}JpEZ3`mnT&Z)Ov9Wwcx+-{ke=l*@(~rszTVv9&(X0Y^z~wjg
z%XKYLBN4tzj_gZj&xr4K9+Suu-05-$Zd1KiCizMsuiP)hK$su4;Mk%OsV)}!`vcp1
z4lZ}m*7e=k0qXDvNAm&QhX)7hb03PG$9|u~-zX3JK(})>1S!$;)PcxfJh)}j8^F7}
zLPTX>n8?=UGOWLhzgPgE(eJ!??H_a~CYjL+KRn;BWtlojYLmgtaLm()$DGTpF|yGg
z4prU@UM#*-xdglm2w1XdJS-}90%vuO9>Uq^+jSp%cvBMR!|>jEr!L$aci(T84-<7y
zyZFO_4AdEP#dhz%n0vk*VjtkXsh*`FTf-s}3FXIx%^X|sV;Nb*R}H=4DR3MemFViG
zwoQe8X<&a4<7)u`kI9{^*G(W#c@jBN#vghZNgAz4a2*6Y8Ra1OQ+9BTJ#=Wym(MH+
zan;pLHnIuvK{6vv9|*y*DQKX(NgW+=TDzt*;Gb7Vzy@sXoz<;AU^=Veph*VN;^XIr
z<)YOFK!NJ$bPH`&qGtbh(26KJODyhuCn%`73Q_0D(3T+0=(d=K`Oz;#4FIy8kS!96
z&(>UXhg1FIN6fUESf<yofVAp_dVe(rb5C*CWm(34+K>J_KQN>0^x$s2>h8EJlYDU(
zzt@{5vkaW}@b&ezV?&xQA+dS)f?$Q!;9Mz=_!RqDG#Ux&rqP`AONr<AT;SH%Kn*|i
z_|<ItOCULF@zz00Mf>|Xz&I>S)bHk*NL`Z4UOu`GrcP8<zz}vgmvD(o`G#JIYRL4I
zT#ovom37Fc>Ba21rPuUGELUWD8l<{oXN--<BsNlDTHOg+=dllLz4TbGcZbP5*Igg$
zlh_e&t@?Ai<H`sU)aTMF+g&G)P}q$d^*$P3{aLYgeb_wcYi@kdIo1EdD>s6^{MiDo
z#4%mf%2_;<y>C40jne$2^T)(twe?j>@t?4e$u=h7S*U3nIhK9HM#!qm%ooZ>1u7jq
z$`i-9t2QZ>d;>=VV>QQDfrk-dzhx^BL_ahiWvM0gu$#S}A|#~6XVC;NnJ#m&6R7a9
z940P)NwhEdUE~~UUvxnk7|Ns#2H!Y0uKH&$fIw`-)(88EkI(%X6$I5}D1U_cLRzye
zrESVeCU*8)uyQW}gC;9_-S-VX>r`i!a}a!vnf~ZJNGI~J#A*I2cl!2Gy%Y~%(<-&y
zqpl}SfM$P_ID#xC)P*xNQkxexl4Y7e%$8U6@L_XMaIV<+zPoQjmIN6oNO~mv5H;r4
zWEx>xhWChUzS4XG=2kG0^uz#i-Y~-t7z*_rm}~TLkWvnq_M7FcqEVyJv=Xd;JvCkW
zuG#r5Ze&Zd@#SHe6+ramiz99a2YU)!hL5HesCL;1+sR=caz9>PYGJ?W_gQis&0v#F
z{8xi42a@Dq#;cR(h&d3&i^t-ov5CyBr-RD)+fMs`8ejfNz6+fR1`zU+vW#Z;qp=AT
zJvk-P@CP!Dkc84c<OLy9!^O&z>B}$2Fl`Zl55;GXKb`HOJ|<Ae{cUZuRG=V<Dmmz(
zAI-V`_|kZnS>D51TXn@kCV0|WQnLZxm~eSbr1(j+lhWM6^1aUovxK4a34%p8YagM!
zUjGJUrb|t(ll<nvdnd?!*w$9-x^emvcCM@X<x%Rd$%;uCfVm>W25~YMN>)MP%4FG&
zu0o8SK0=i7&mPaN&ciO@ptBk-8aaR4?#Sd=t9w);Ku87z;cu0M=Bd_P*ld>Z3D}?I
zpfRjX%Zemb<D?UHj1CaeL6jI6>A%FOJC2SXY`?3O3IF6U2Br7f-e3>rLCh|V4c^ze
zB8+?!ipRk2<W##DD>O;Ol0Pn&qd%*2wV7Vlo*!Tr4>y*45(ZR>@9})`qibzV5Latr
zVlwISTGn{}n?0yjls+mqR|z|}^8TV_v*E-L%i;$o_f3wby9}YCRbsr}1is$Z?x;_F
zWy+fcRaWJT$Mv)hB&=Bwgp+p?dZFI*jbhX8es!_rMbY{#x>W~VJGfBVoP99DnZSJe
zJ>3Le;POwh=io1rh+`3py@U~B16H_+75562(y}SaVs{oL*z5dvno}aMLz%pi^7mK3
z4J^{pi3dg(6Y$zrosO>`=W1d@p2r0(LDq<f<-5a1i1H6tj^a&R`Qydhy3lWMu&%CM
z>bwTUXyMg1<2W>P8*wjh^bDTo86K=96{u_WVDkb3jy6I$n4=J{iGbN+Er_RcotpD4
zP*8Pw4ZwAlHE~)g@>rI#Fl{Pq%|h^ty3I?OXWwC{o}Qvd);=3UXObEj!1PO}Qr;{j
z0XE;A@z}6Gs#qCnE+HYI!z1(Z)GKclUI*rf>t>&zd#Y8Z98FTl<~vxT%m~DH!8?T_
zO=r?ut><YCR&qD{&xyjdUgXLSR<;GPQM?L|BSqdQ@;TV%Uy(Bizp34DjKf2Jkwi#`
z<v{cLpSt&xHkd)g_HTC(SqapDfpp8vwh}Jnk|JNR=arXf>FM#YV2aL7Yz=TY_OLlD
z7aBiUgda$UNNB)}12`-+q>hP`dXwcCXm#6PC^rzhU}knQs%LiKY5A%#s=r%K0Fx69
zMnfe%{F6C<DicVXH*7GO3i{w7W?oi+Xy2-gWTWEs+{9g@%?=kTy~i3Dyj)yLZhc@_
z9~PfV)TA)W1a4EmxVMh(nfvW7vWQ1|7jy=XPHQKA&2yjDpe=zTYv5%gsv`=(=S`Ih
z>Dc?i3J|>0xe+E>oJ0)@M3GC(l6tw4jjpG5bdcP%074=l4=0*Lkl_(ALSF?gpWfg1
zVPj|gW-Wu0#D#|J86se19`rJC4lf)1N<&Qa#duezs+f==5l@5=RqbgFp}K_|PZKQK
z%v=1(k(Nf{ByGo<=!*qZl6{516&ekcTz#^nd>eHBx5~(gft=Ude>$MKEu!I51f09D
zps$Wc4LqIRUG^<(IFgTf&1%|5rCuJxvc+5d2vtUvn}3_vZq3X6Zs9e5L(5+0XJ^-n
z+F3F-|11oiQnAP1xO59orb0?b2#MTPwHsHgb=?B$u2F7Sk_8%p&ydo;yNb-doPADC
ze&g@Kg@#WgLRmX$Z*S@{Gc)N{j=avSLOr`}da9DDj{*=vhG%S{S}c-MPxT^xpQXIM
zryHk*{eGbOK<mJubUYtX7>d5=e7HS7F;$}0<<zsWU59qnU@^C-lQ1Jg_YK5Y4m>!B
zljvEB7EXYiXG=)z>D+v+lI1HXckIf)N>FuXfD^~Zs|OJJaC^c(gx|G_?1BXMwS}NZ
z1-P?y!*7W<8Fy*w-f(DiWm2KD9?<+5vbiDulW|WH_0xv9STx$(b^2Rz0{No6i_eP-
zk63xio3akE<O#tEq4rYfIgetU8{bz3amU&*=hWZ*IkH;F$K=l!8aA0UUGlp8;g;W7
zd!H<Q>HhJmus_FCf4s?WCUmhrMFX7tX_HCEtkk^GmjgBl^I#B)xZK@K-`UH~p{b$I
z<I+)2iDj*D9S?^x=RR@2$`arsD?e=sm@(>}qwmdu&sBV67acLny}J0Bc*SCoFb;Yb
znBOp(xo{|b$Q9-ZzA_i66Ww!l=V4<wf_&9x!tA9=YU8V&&U={~ByrNN<H1o`TH4zD
zywh{5gER?C+rm7xiyH%+1_a6`9RWKa#DN13525q-F?(L#!0plo@)Zz+Nd*DRoc&-U
z&uCudZg)COL^a%tsQj*~G9-EtRv*cs&b`p3*d?6P1zKOG1Wn<#QG<rkQKLe;--o_`
z9G&`1r<EWNId|tGPN{kO@L^xa=*y=OtG-7|!BLhDvjU@oYfR6FR-*8V%57Ts9MUON
z+1YRoSO1DAom81IZQG%1RI7twkKjKZ`)<1ANVz~(g||}F7b{puX(JFNHDT&1)U1h|
zRN2Jlsw8m(r+-qPaJh!hW4A516=j$@9e*o7(dWld*B6E7M4JCA#iC9x6it82)xNX0
z9|=U`NJ5e7fv-P*$iDMR-(`@|5eCi|;UXDz)RAvj3M1u&ZkwD4HNeYTp$H=m`u2F3
zE-iwOHwDfsPVL<2buwz;bdNIXz_>Ck&?(^(z23AP*bmeHeI37o6l$N42odU=OORWU
z_mTjsbAwzOj<>Whi{dF|R_lpu9|Ecv8KHsLn6;zt6<nONrg8{b?Wox#kk7SfWQTM<
z2oe)WfEK&}hLewbb-no{u$8ntXj~cCUs}e+Odnm<u8VudCfl8;k<JdIkQw`I-TD)#
zTc5ekyk%<ob55+>bd1kpZH?dR^il$`+mgVCgGqHWKV<E|b&@m!>iYN(pMr-+Hknji
zWP98*ri$JUK5rvHO->qz<>hYfJ9v%&jg4gV36#5OAmPsA`Y;2GQkS|2DOnBB*7gks
zC2hs!Fd{l3qyNgCd=hMi5A1FlJMR`UinMb(IDx-9#(+9TF_B~Qns~hjTO*kPuod|A
zeB&+p0ZsPa-j4&S*|di&z|R4K`6XmN(78(wh1KPl>#H2Gf2tGdiT+-Jfg*)_YQW0W
zN8UIkI=O4PIyO5>Qr%rPA$p1CSuPE>`^F9|^t22omF=&t2zKGny_AMu={k7!53j=e
zoSjccOQ34hv2Iq)($Ojwo2M)<d6)OK#)*AcmVb~q?ZXecqw4=)V)7Y>#O~Isd#$J$
zYR?4uOcN=sCXaqHJpzaZ<eW5_5tK=N3<YA+2)zYr86Ll20QlB3F5jqZvMk@rN{pqP
z7MhVRe7d4=m@q^vAE<~r+#j=Q`J8Jr1_Z}ZDZPF{X%%|!QtYDWc)AoC@O`6ydwbjc
z<;~9sRu8%Ch@Nkv2pEh~={48m=HGp<q-<FxnLXz)c~CObX`+6?0`N_l?FwA9%0Tn=
zGfCQqyu0HumL~xJst4`561HQ^XDaL}G3bpVikp`hpG?+Snse~4r+p7B6;%4VJHkE!
zaI^xOrfA9y%R27rorsY)kwpzO*b~Qb)9MS6Yg*a=4H(G(G<Sg%o<tklb~P@aj)GlZ
zSg=u$E`L`mF@-kk`T(nH0Mtya_Mu|#bNufeWJNdkj1XM*u9|HW(UIT{ubPXWO}?M>
zShg8n^tT1`1ev|Xm0xr!z%h@)bDukvWl?f^@m5|mgi6Sy{kdGFwTvTy!@vN&7DyoY
zpdBD;JYntC93*D>As*?Nc?qL?>hQ8aRr-g+qxNoLQ+Lst#ILE6?z7TIn+be?)!~@X
zA%1JeAwdGd($dzku@$=cd!RKeW-7mI$w^?ggwE3dpExM&M%^YAK^IL{ix2T!RYYvN
z@REeOvNr$ztQKFyU2y8IZrlve#JFk^4gMUjQtd`7$Gt5i#RQRM<zBWdmBVG0qh0fq
z>D7|_r)U?QR*3@0J8{919aqG*JLK8lV6)s~R-31<W;mUEM_0agVy|8oa0PU9ta;$A
zNG>6P*akxu*b>_ZhYhQAmCNqok%d5usWi0P!>mlea>)S(0{TxqD;d}FD?1zsLp6U5
z@I1@7bR(8($k%#xiD*j}Z}!k+Jl!kT`Mqs~U^1mwwfKTO+ie|NcFm2HW0)^Z<}^rl
z*@A7T4yWY^+*B<6Dn~c`TaheKivy=2V-21~tJz<^?zT-5UnPSK+n9`-@C)iUJZ4$t
z{1veq9M~9Ekz?p)+O|d4*z6YQV*-H>I`&1PS_UR`7%*08w711kZP_M8?3t7-QD*4V
zPP4j?5pY3~eajvp>HJrONWIaO&S!mnHS>3Ou1eX*v6*zpDax}A>HUNR36BiwZD0Ng
zyPff}cCGsVpf{dI17A^1exIAaeCfPOZHozgn(DezZ|HXb>PKHbc&Q#nJKpTCT2N<X
zpRJKz_B+6c8Qay3=DuAV+%JQkZUFr|Lwe%aT`T}Mk5&+D?a$C|Tu&Tsyxu%2VOTqq
zzAnlTyV{?CYSWCcwIBA0Qq;-k54`MDo_Vh$H#4(n987Rr)9Yp?9>&$;pDda&vLr10
zfs~x&1H{-Br_lIG@VE3QY9lE!K{xeODMxwT6R_@S*=YI7#KEB9OoKWT4GK+SR3AP;
zu9(Igsf`9We;72%zi8R00<yz;2mnI&E`<prVxF`xOv6Wet;PKALPD8Tz__fjLJxZ#
zGt)E#^we!xgY5ak+5@y~`l)b|ZKDjln|+jIUBp$J87Ypx@3zi-x~zr4S+`HrF1?oI
zWf$!2<>jv-AO(s$WAR^k^{JeXxCCoLGQ(u1uG7O4>fZ2wU>V7JYnnEK?L1oXSM9Ue
z6Pd0S|NI%lR;6`+ae4{rB6fFpqx}6*3<y-a>+!g%(%NdOp9bf(Z$w+%+11rJ)arn0
zaX8mvDysSfyWm&qw-fqpawF2$5tyG74M1&Wjj|C~lJ>YB+})wO#9(wL#3~814ezqz
zI}h(#FNR1*?!RL^j}6DfDWWB2t42!-P4)R8`cG(NfWB)aX}N3DQC8P2M!=JaW#{CC
z{Au3=ZB;J(>X2&(JsY{&q(L;{D5S%&pB11oMY4#uZVmISt&s^k-vwp=99bPT1>y(7
z{|$f%-*P`!g*JdoE)%03doG@0xRH_m1wplA^<8Gz;iANJ%M2XccXJ0snwsO80KWYz
z_chk)NtP$Are(#Vj{9Eyt>*8)Q9p6e5JDc?y)`K<7akts`L{Mh)G|BQ;L7vNt}8~D
zl)uI0bLyC9=VZ6#S))MBT3~AAt`2oO_v1b2vfEMiVp#wQQyJ6RX}l3725*@&h*Mnu
zeo8$zw;`&pZCM*3y~}DL<i&^qZvX&qT)pzL|31;=>9oo7_jKLpp*HpHEv6MUN=mHv
zeCNZkWw50qdnsn~i8$K=6py16JAwJS8m=z8samrWi2iMVV0GF1DuA?ykW~R7=-g=c
z8G}~keX9R}d%ppn;HmjzK?aNr!XZ~Sb!QFWZKm?F@5^`<Ro)kj8n(d~HEw4qWug7?
z9%QKJ-JXk>nb6dnKaig9=hgfQyMsAk3P_dZdx3DdNP?l8Te++7=@ioaCcj<^g}_G(
zYVJT+q27^9hx`Mg^AGcN=Q6<R&zY83ff)gBAN4+4vX!ec=g8xsxHFg!4Q_aAtP!)`
zx9iSEret@DEAP&kdvbCvBmrLWkVJS)PnUAD5r+sm5q&OrB4uuVI?Cm(-!RBO3BS*q
zE7x(1N_tpUl^=5de}H;k`%D)0am`<fgH<>tt8p>uqn;r_9?X6J<kc$zj1V)eY~!z2
znRjG#tJ-Q;6!Ed&N#_$;NBQ|-ps3rLTu|n}nKwK1y1}_?sfnPEq@lq@2ebQ_o-8VA
zv?OcqK+@0NwBExH>|fKu5bhN4%;pndZKQ}xtPDk*=Db(af|dvu6O=Ap&~}a=QA-lX
z4M;U?UxNJuE(knc$;1Z+zjGRs<grjE=1YvV%9g0pebKolhaR5pXq|fSf8u-46dg&X
zAeI~(HUlFQ41@2{a7gPF8u=}&YQ;39^^u}M8NA8Y$&;zuB%K=|r7vqzXjJt&^D7km
zFO9CttrtOqPp(2^9x37J3EReC4vZXsKwYEASj?0yK0!L18ryL@8&-ybPx=R6WGvhU
zTK_%nNX=&%VU!ykt~mP=H<wE#6Z`^i94~EcwG+|zATT(PmB{ME5`EF?=ZnHN?nZ5>
zx!S6nPfncx&f%$NXI<^-TsEYLj%8EM8Co7az%z^0JWq+G(b1|iGifdXA3r7WrGeV#
z<eJ4LJ{5j0BuWC(Q|&TEwy&w(-4QUJO2YW@g*E$-H;@CMKT%wUNU)TM0YbwX;`=9T
zNOo9*4tBf(1X`Z1qfjW=KgTnI_lIV;mr#G|VSaIS(ppuE&0_DI3n#O+wNHT%x+mJ&
z6$JDlvlVpw#XxO|7jLYi`v@#7T8AgU6j$;EB}$;-gGBgdjJ@2c(Z#QME4+T4-ovRo
zqW0S+Yc>!hHYl%6|1_QweCeGcJuiTZ3x7vvYN8wN{46>^!s`Pmb@cZTGxN@@PN0Oz
zol*nHPMZwK^Gn}DE;!)tkw~kCH8XOb^QQ67y;>?jaKexd=0Fd?0Rfpp9PJ=ZQVzaO
z7y}R%6cXnX6y_5WGZYe+5)_jX7UK~Vk`fd=Ev#<&UmZNbj&9Dd|G&fQ8yb8}2cf?s
z_yxE~+1vR!@%j6@0i4}DoTLN<1R$Q?0-km*ZVv8z!Xkp=f@;dH8Y=FRih?jjFH@_!
R5=>`+8c18YO3^mrzW~excgFw#

literal 0
HcmV?d00001

diff --git a/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceConfirm.ftl b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceConfirm.ftl
new file mode 100644
index 0000000000..cb5e9e78fd
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceConfirm.ftl
@@ -0,0 +1,111 @@
+<#setting number_format="computer">
+<form id="createAndLink" method="post">
+    <#if personLabel??>
+        <div class="claim-for">
+            <h3>${i18n().create_and_link_claim_for(personLabel)}</h3>
+            <#if personThumbUrl??>
+                <img src="${urls.base}${personThumbUrl}" />
+            </#if>
+        </div>
+    </#if>
+    <h2>${i18n().create_and_link_confirm_works}</h2>
+    ${i18n().create_and_link_confirm_works_intro}<br /><br />
+    <h4>${i18n().create_and_link_authors}</h4>
+    <div class="description">${i18n().create_and_link_authors_desc}</div><br />
+    <h4>${i18n().create_and_link_editors}</h4>
+    <div class="description">${i18n().create_and_link_editors_desc}</div><br /><br />
+    ${i18n().create_and_link_not_mine_desc}<br /><br />
+    <#list citations as citation>
+        <div class="entryId">
+            <#if citation.externalProvider??>
+                ${citation.externalProvider?upper_case}: ${citation.externalId?html}
+            <#else>
+                ID: ${citation.externalId?html}
+            </#if>
+        </div>
+        <#if citation.type?has_content>
+            <select name="type${citation.externalId}">
+                <#list publicationTypes as publicationType>
+                    <option value="${publicationType.uri}" <#if publicationType.uri == citation.typeUri>selected</#if>>${publicationType.label}</option>
+                </#list>
+            </select><br/>
+        </#if>
+        <div class="entry">
+            <#if citation.showError>
+                <div class="citation_error">
+                    ${i18n().create_and_link_error}
+                </div>
+            <#else>
+                <!-- Output Citation -->
+                <#if citation.alreadyClaimed>
+                    <div class="citation_claimed">
+                </#if>
+                <input type="hidden" name="externalId" value="${citation.externalId!}" />
+                <div class="citation">
+                    <#assign proposedAuthor=false />
+                    <#if citation.title??><span class="citation_title">${citation.title?html}</span><br /></#if>
+                    <#assign formatted_citation>
+                        <#if citation.journal??><span class="citation_journal">${citation.journal?html}</span></#if>
+                        <#if citation.publicationYear??><span class="citation_year">${citation.publicationYear!?html};</span></#if>
+                        <#if citation.volume??><span class="citation_volume">${citation.volume!?html}</#if>
+                        <#if citation.issue??><span class="citation_issue">(${citation.issue!?html})</#if>
+                        <#if citation.pagination??><span class="citation_pages">:${citation.pagination!?html}</#if>
+                    </#assign>
+                    <#if formatted_citation??>
+                        ${formatted_citation}<br />
+                    </#if>
+                    <#if citation.authors??>
+                        <#list citation.authors as author>
+                            <#if author??>
+                                <span class="citation_author">
+                                    <#if citation.alreadyClaimed>
+                                        <span>${author.name!?html}</span>
+                                    <#else>
+                                        <#if author.name??>
+                                            <#if !author.linked>
+                                                <input type="radio" id="author${citation.externalId}-${author?counter}" name="contributor${citation.externalId}" value="author${author?counter}" <#if author.proposed>checked</#if> class="radioWithLabel" />
+                                                <label for="author${citation.externalId}-${author?counter}" class="labelForRadio">${author.name!?html}</label>
+                                                <#if author.proposed><#assign proposedAuthor=true /></#if>
+                                            <#else>
+                                                <span class="linked">${author.name!?html}</span>
+                                            </#if>
+                                        </#if>
+                                    </#if>
+                                </span>
+                            </#if>
+                            <#sep>; </#sep>
+                        </#list><br />
+                    </#if>
+                </div>
+
+                <#if citation.alreadyClaimed>
+                    <span class="claimed">${i18n().create_and_link_already_claimed}</span>
+                <#else>
+                    <input type="radio" id="author${citation.externalId}" name="contributor${citation.externalId}" value="author" <#if !proposedAuthor>checked</#if> class="radioWithLabel" /><label for="author${citation.externalId}" class="labelForRadio"> ${i18n().create_and_link_unlisted_author}</label><br />
+                    <input type="radio" id="editor${citation.externalId}" name="contributor${citation.externalId}" value="editor" class="radioWithLabel" /><label for="editor${citation.externalId}" class="labelForRadio"> ${i18n().create_and_link_editor}</label><br />
+                    <input type="radio" id="notmine${citation.externalId}" name="contributor${citation.externalId}" value="notmine" class="radioWithLabel" /><label for="notmine${citation.externalId}" class="labelForRadio"> ${i18n().create_and_link_not_mine}</label><br />
+                </#if>
+                <input type="hidden" name="externalResource${citation.externalId}" value="${citation.externalResource!?html}" />
+                <input type="hidden" name="externalProvider${citation.externalId}" value="${citation.externalProvider!?html}" />
+                <input type="hidden" name="vivoUri${citation.externalId}" value="${citation.vivoUri!?html}" />
+                <input type="hidden" name="profileUri" value="${profileUri!}" />
+                <#if citation.alreadyClaimed>
+                    </div>
+                </#if>
+            </#if>
+            <div style="clear: both;"></div>
+        </div>
+        <br/>
+        <!-- End Citation -->
+    </#list>
+    <#if remainderIds??>
+        <input type="hidden" name="remainderIds" value="${remainderIds}" />
+    </#if>
+    <div class="buttons">
+        <input type="hidden" name="action" value="confirmID" />
+        <input type="submit" value="${i18n().create_and_link_submit_confirm}" class="submit" />
+        <#if remainderCount??>
+            <span class="remainder">${i18n().create_and_link_remaining(remainderCount)}</span>
+        </#if>
+    </div>
+</form>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceEnterID.ftl b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceEnterID.ftl
new file mode 100644
index 0000000000..eca21dd8eb
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/createAndLinkResourceEnterID.ftl
@@ -0,0 +1,35 @@
+<form id="createAndLink" method="post">
+    <#if personLabel??>
+        <div class="claim-for">
+            <h3>${i18n().create_and_link_claim_for(personLabel)}</h3>
+            <#if personThumbUrl??>
+                <img src="${urls.base}${personThumbUrl}" />
+            </#if>
+        </div>
+    </#if>
+    <#if showConfirmation??>
+        <h2>${i18n().create_and_link_thank_you}</h2>
+        ${i18n().create_and_link_finished}<br /><br />
+        <#if profileUri??>
+            <a href="${profileUrl(profileUri)}">${i18n().create_and_link_go_profile}</a><br /><br />
+        </#if>
+    </#if>
+    <h2>${i18n().create_and_link_enter(label)}</h2>
+    <#switch provider>
+        <#case "doi">
+            ${i18n().create_and_link_enter_dois_intro}<br />
+            <i>ID</i>:  10.1038/nature01234<br />
+            <i>URL</i>: https://doi.org/10.1038/nature01234<br />
+            <br />
+            ${i18n().create_and_link_enter_dois_supported}<br /><br />
+        <#break>
+        <#case "pmid">
+            ${i18n().create_and_link_enter_pmid_intro}<br /><br />
+            ${i18n().create_and_link_enter_pmid_supported}<br /><br />
+        <#break>
+    </#switch>
+    <textarea name="externalIds" rows="15" cols="50"></textarea><br />
+    <input type="submit" value="${i18n().create_and_link_submit_ids}" class="submit" /><br />
+    <input type="hidden" name="action" value="findID" />
+    <input type="hidden" name="profileUri" value="${profileUri!}" />
+</form>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unauthorizedForProfile.ftl b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unauthorizedForProfile.ftl
new file mode 100644
index 0000000000..93bf5608a8
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unauthorizedForProfile.ftl
@@ -0,0 +1 @@
+<h2>${i18n().create_and_link_unauthorized_for_profile}</h2>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownProfile.ftl b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownProfile.ftl
new file mode 100644
index 0000000000..107231d0d0
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownProfile.ftl
@@ -0,0 +1,2 @@
+<h2>${i18n().create_and_link_unknown_profile}</h2>
+
diff --git a/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownResourceType.ftl b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownResourceType.ftl
new file mode 100644
index 0000000000..417a51954f
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/createAndLinkResource/unknownResourceType.ftl
@@ -0,0 +1,2 @@
+<h2>${i18n().create_and_link_unknown_resource}</h2>
+
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-createAndLink.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-createAndLink.css
new file mode 100644
index 0000000000..f71cee1c13
--- /dev/null
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-createAndLink.css
@@ -0,0 +1,82 @@
+#createAndLink select {
+    height: 2.5em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+    padding-top: 0px;
+}
+
+#createAndLink .citation_error:before {
+    content: url('../../../images/createAndLink/error.png');
+    transform: scale(0.5);
+    margin-top: 10px;
+    margin-right: 10px;
+    float: left;
+}
+#createAndLink .citation_error {
+    height: 70px;
+}
+#createAndLink .citation_claimed:before {
+    content: url('../../../images/createAndLink/tick.png');
+    transform: scale(0.75);
+    margin-top: -17px;
+    margin-left: 535px;
+    float: left;
+    position: absolute;
+}
+#createAndLink .citation_claimed:hover:before {
+    opacity: 0.2;
+}
+#createAndLink .citation_claimed .citation {
+    opacity: 0.2;
+}
+#createAndLink .citation_claimed:hover .citation {
+    opacity: 1.0;
+}
+#createAndLink .citation_type {
+    font-style: italic;
+    padding: 5px;
+}
+#createAndLink .citation_title {
+    font-weight: bold;
+}
+#createAndLink .citation_journal {
+    font-style: italic;
+}
+#createAndLink .claimed {
+    font-weight: bold;
+}
+#createAndLink .linked {
+    font-style: italic;
+}
+#createAndLink .entryId {
+    background-color: #3e8baa; /* #E0E0E0; */
+    color: #ffffff;
+    padding: 5px;
+    font-weight: bold;
+    display: inline-block;
+}
+#createAndLink .entry {
+    border: 2px solid #3e8baa; /* #E0E0E0; */
+    padding: 5px;
+}
+#createAndLink label {
+    display: inline;
+}
+#createAndLink .radioWithLabel:checked + .labelForRadio {
+    font-weight: bold;
+}
+#createAndLink .description {
+    padding-left: 22px;
+}
+#createAndLink .remainder {
+    font-style: italic;
+}
+#createAndLink .claim-for {
+    float: right;
+    border: 2px solid #3e8baa; /* #E0E0E0; */
+    padding: 5px;
+}
+#createAndLink .claim-for h3 {
+    text-align: center;
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/screen.css b/webapp/src/main/webapp/themes/tenderfoot/css/screen.css
index 0825d7c6a8..0cdad6eca9 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/screen.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/screen.css
@@ -30,5 +30,6 @@ VIVO tenderfoot theme: screen styles
 @import url("page-individual.css");
 @import url("page-login.css");
 @import url("page-menu.css");
+@import url("page-createAndLink.css");
 @import url("https://fonts.googleapis.com/css?family=Noto+Sans");
 @import url("../../../local/css/local.css");
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
index 8bc5262a66..a31182c261 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
@@ -104,11 +104,23 @@
 
 <section itemscope itemtype="http://schema.org/Person" id="individual-intro" class="vcard person" role="region">
     <section id="individual-info" ${infoClass!} role="region">
-        <!-- Overview -->
-        <!-- #include "individual-overview.ftl" -->
-
-        <!-- Geographic Focus -->
-        <!-- #include "individual-geographicFocus.ftl" -->
+		<#if editable>
+			<#if claimSources?size &gt; 0>
+				${i18n().claim_publications_by}
+				<#if claimSources?seq_contains("doi")>
+					<form action="${urls.base}/createAndLink/doi" method="get" style="display: inline-block;">
+						<input type="hidden" name="profileUri" value="${individual.uri}" />
+						<input type="submit" class="submit" value="${i18n().claim_publications_by_doi}" />
+					</form>
+				</#if>
+				<#if claimSources?seq_contains("pmid")>
+					<form action="${urls.base}/createAndLink/pmid" method="get" style="display: inline-block;">
+						<input type="hidden" name="profileUri" value="${individual.uri}" />
+						<input type="submit" class="submit" value="${i18n().claim_publications_by_pmid}" />
+					</form>
+				</#if>
+			</#if>
+		</#if>
     </section>
 </section>
 
diff --git a/webapp/src/main/webapp/themes/wilma/css/page-createAndLink.css b/webapp/src/main/webapp/themes/wilma/css/page-createAndLink.css
new file mode 100644
index 0000000000..f71cee1c13
--- /dev/null
+++ b/webapp/src/main/webapp/themes/wilma/css/page-createAndLink.css
@@ -0,0 +1,82 @@
+#createAndLink select {
+    height: 2.5em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+    padding-top: 0px;
+}
+
+#createAndLink .citation_error:before {
+    content: url('../../../images/createAndLink/error.png');
+    transform: scale(0.5);
+    margin-top: 10px;
+    margin-right: 10px;
+    float: left;
+}
+#createAndLink .citation_error {
+    height: 70px;
+}
+#createAndLink .citation_claimed:before {
+    content: url('../../../images/createAndLink/tick.png');
+    transform: scale(0.75);
+    margin-top: -17px;
+    margin-left: 535px;
+    float: left;
+    position: absolute;
+}
+#createAndLink .citation_claimed:hover:before {
+    opacity: 0.2;
+}
+#createAndLink .citation_claimed .citation {
+    opacity: 0.2;
+}
+#createAndLink .citation_claimed:hover .citation {
+    opacity: 1.0;
+}
+#createAndLink .citation_type {
+    font-style: italic;
+    padding: 5px;
+}
+#createAndLink .citation_title {
+    font-weight: bold;
+}
+#createAndLink .citation_journal {
+    font-style: italic;
+}
+#createAndLink .claimed {
+    font-weight: bold;
+}
+#createAndLink .linked {
+    font-style: italic;
+}
+#createAndLink .entryId {
+    background-color: #3e8baa; /* #E0E0E0; */
+    color: #ffffff;
+    padding: 5px;
+    font-weight: bold;
+    display: inline-block;
+}
+#createAndLink .entry {
+    border: 2px solid #3e8baa; /* #E0E0E0; */
+    padding: 5px;
+}
+#createAndLink label {
+    display: inline;
+}
+#createAndLink .radioWithLabel:checked + .labelForRadio {
+    font-weight: bold;
+}
+#createAndLink .description {
+    padding-left: 22px;
+}
+#createAndLink .remainder {
+    font-style: italic;
+}
+#createAndLink .claim-for {
+    float: right;
+    border: 2px solid #3e8baa; /* #E0E0E0; */
+    padding: 5px;
+}
+#createAndLink .claim-for h3 {
+    text-align: center;
+}
diff --git a/webapp/src/main/webapp/themes/wilma/css/screen.css b/webapp/src/main/webapp/themes/wilma/css/screen.css
index 7749656aff..7e6c67f8f4 100644
--- a/webapp/src/main/webapp/themes/wilma/css/screen.css
+++ b/webapp/src/main/webapp/themes/wilma/css/screen.css
@@ -24,4 +24,5 @@ VIVO wilma theme: screen styles
 
 @import url("reset.css");
 @import url("wilma.css");
+@import url("page-createAndLink.css");
 @import url("../../../local/css/local.css");
diff --git a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
index fb9e2424b5..b115ab5565 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
@@ -62,6 +62,23 @@
     <section id="individual-info" ${infoClass!} role="region">
     <section id="right-hand-column" role="region">
         <#include "individual-visualizationFoafPerson.ftl">
+        <#if editable>
+            <#if claimSources?size &gt; 0>
+                <br />${i18n().claim_publications_by}<br />
+                <#if claimSources?seq_contains("doi")>
+                    <form action="${urls.base}/createAndLink/doi" method="get" style="float: left;">
+                        <input type="hidden" name="profileUri" value="${individual.uri}" />
+                        <input type="submit" class="submit" value="${i18n().claim_publications_by_doi}" />
+                    </form>
+                </#if>
+                <#if claimSources?seq_contains("pmid")>
+                    <form action="${urls.base}/createAndLink/pmid" method="get" style="float: right;">
+                        <input type="hidden" name="profileUri" value="${individual.uri}" />
+                        <input type="submit" class="submit" value="${i18n().claim_publications_by_pmid}" />
+                    </form>
+                </#if>
+            </#if>
+        </#if>
         </section>
         <#include "individual-adminPanel.ftl">